diff -b -B -r ./contributing.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/contributing.html
94c94
< <h2><a href="#non-programmers" id="non-programmers">Non-Programmers</a></h2> 
---
> <h2><a href="#non-programmers" name="non-programmers">Non-Programmers</a></h2>
96c96
< <h2><a href="#programmers" id="programmers">Programmers</a></h2> 
---
> <h2><a href="#programmers" name="programmers">Programmers</a></h2>
diff -b -B -r ./documentation/apidocs.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/apidocs.html
93c93
<             </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#sling-api-documentation" id="sling-api-documentation">Sling API Documentation</a></h2> 
---
>             </h1><div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#sling-api-documentation" name="sling-api-documentation">Sling API Documentation</a></h2>
diff -b -B -r ./documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
98c98
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
106c106
< <h2><a href="#resource-types" id="resource-types">Resource Types</a></h2> 
---
> <h2><a href="#resource-types" name="resource-types">Resource Types</a></h2>
113c113
< <h2><a href="#adapters" id="adapters">Adapters</a></h2> 
---
> <h2><a href="#adapters" name="adapters">Adapters</a></h2>
120c120
< <h2><a href="#configuration" id="configuration">Configuration</a></h2> 
---
> <h2><a href="#configuration" name="configuration">Configuration</a></h2>
132,134c132,134
<    <th> Parameter </th>
<    <th> Name </th>
<    <th> Description </th>
---
>       <th>Parameter </th>
>       <th>Name </th>
>       <th>Description </th>
139,141c139,141
<    <td> File System Root </td>
<    <td> <code>provider.file</code> </td>
<    <td> File system directory mapped to the virtual resource tree. This property must not be an empty string. If the path is relative it is resolved against sling.home or the current working directory. The path may be a file or folder. If the path does not address an existing file or folder, an empty folder is created. </td>
---
>       <td>File System Root </td>
>       <td><code>provider.file</code> </td>
>       <td>File system directory mapped to the virtual resource tree. This property must not be an empty string. If the path is relative it is resolved against sling.home or the current working directory. The path may be a file or folder. If the path does not address an existing file or folder, an empty folder is created. </td>
144,146c144,146
<    <td> Provider Root </td>
<    <td> <code>provider.root</code> (2.x), <code>provider.roots</code> (1.x) </td>
<    <td> Location in the virtual resource tree where the file system resources are mapped in. This property must not be an empty string. Only one path is supported. </td>
---
>       <td>Provider Root </td>
>       <td><code>provider.root</code> (2.x), <code>provider.roots</code> (1.x) </td>
>       <td>Location in the virtual resource tree where the file system resources are mapped in. This property must not be an empty string. Only one path is supported. </td>
149,151c149,151
<    <td> File system layout </td>
<    <td> <code>provider.fs.mode</code> </td>
<    <td> File system layout mode for files, folders and content. </td>
---
>       <td>File system layout </td>
>       <td><code>provider.fs.mode</code> </td>
>       <td>File system layout mode for files, folders and content. </td>
154,156c154,156
<    <td> Init. Content Options </td>
<    <td> <code>provider.initial.content.import.options</code> </td>
<    <td> Import options for Sling-Initial-Content file system layout. Supported options: overwrite, ignoreImportProviders. </td>
---
>       <td>Init. Content Options </td>
>       <td><code>provider.initial.content.import.options</code> </td>
>       <td>Import options for Sling-Initial-Content file system layout. Supported options: overwrite, ignoreImportProviders. </td>
159,161c159,161
<    <td> FileVault Filter </td>
<    <td> <code>provider.filevault.filterxml.path</code> </td>
<    <td> Path to META-INF/vault/filter.xml when using FileVault XML file system layout. </td>
---
>       <td>FileVault Filter </td>
>       <td><code>provider.filevault.filterxml.path</code> </td>
>       <td>Path to META-INF/vault/filter.xml when using FileVault XML file system layout. </td>
164,166c164,166
<    <td> Check Interval </td>
<    <td> <code>provider.checkinterval</code> </td>
<    <td> If the interval has a value higher than 100, the provider will check the file system for changes periodically. This interval defines the period in milliseconds (the default is 1000). If a change is detected, resource events are sent through the event admin. </td>
---
>       <td>Check Interval </td>
>       <td><code>provider.checkinterval</code> </td>
>       <td>If the interval has a value higher than 100, the provider will check the file system for changes periodically. This interval defines the period in milliseconds (the default is 1000). If a change is detected, resource events are sent through the event admin. </td>
169,171c169,171
<    <td> Cache Size </td>
<    <td> <code>provider.cache.size</code> </td>
<    <td> Max. number of content files cached in memory. </td>
---
>       <td>Cache Size </td>
>       <td><code>provider.cache.size</code> </td>
>       <td>Max. number of content files cached in memory. </td>
175c175
< <h3><a href="#files-folders-file-system-layout" id="files-folders-file-system-layout">FILES_FOLDERS file system layout</a></h3> 
---
> <h3>FILES_FOLDERS file system layout</h3>
182c182
< <h3><a href="#initial-content-file-system-layout" id="initial-content-file-system-layout">INITIAL_CONTENT file system layout</a></h3> 
---
> <h3>INITIAL_CONTENT file system layout</h3>
200c200
< <h3><a href="#filevault-xml-file-system-layout" id="filevault-xml-file-system-layout">FILEVAULT_XML file system layout</a></h3> 
---
> <h3>FILEVAULT_XML file system layout</h3>
diff -b -B -r ./documentation/bundles/apache-sling-eventing-and-job-handling.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/apache-sling-eventing-and-job-handling.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#overview" id="overview">Overview</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#overview" name="overview">Overview</a></h2>
109c109
< <h2><a href="#jobs-guarantee-of-processing" id="jobs-guarantee-of-processing">Jobs (Guarantee of Processing)</a></h2> 
---
> <h2><a href="#jobs-guarantee-of-processing-" name="jobs-guarantee-of-processing-">Jobs (Guarantee of Processing)</a></h2>
130,131c130,131
<             props.put("item1", "/something");
<             props.put("count", 5);
---
>             props.put(&quot;item1&quot;, &quot;/something&quot;);
>             props.put(&quot;count&quot;, 5);
133c133
<             jobManager.addJob("my/special/jobtopic", props);
---
>             jobManager.addJob(&quot;my/special/jobtopic&quot;, props);
139,141c139,141
< <h3><a href="#jobbuilder" id="jobbuilder">JobBuilder</a></h3> 
< <p>Instead of creating the jobs by calling <code>JobManager.addJob("my/special/jobtopic", props);</code> the <code>JobBuilder</code> can be used, which is retrieved via <code>JobManager.createJob("my/special/jobtopic")</code>. The last method being called on the <code>JobBuilder</code> must be <code>add(...)</code>, which finally adds the job to the queue.</p> 
< <h3><a href="#scheduled-jobs" id="scheduled-jobs">Scheduled Jobs</a></h3> 
---
> <h3><a href="#jobbuilder" name="jobbuilder">JobBuilder</a></h3>
> <p>Instead of creating the jobs by calling <code>JobManager.addJob(&quot;my/special/jobtopic&quot;, props);</code> the <code>JobBuilder</code> can be used, which is retrieved via <code>JobManager.createJob(&quot;my/special/jobtopic&quot;)</code>. The last method being called on the <code>JobBuilder</code> must be <code>add(...)</code>, which finally adds the job to the queue.</p>
> <h3><a href="#scheduled-jobs" name="scheduled-jobs">Scheduled Jobs</a></h3>
156c156
<         ScheduleBuilder scheduleBuilder = jobManager.startJob("my/special/jobtopic").schedule();
---
>         ScheduleBuilder scheduleBuilder = jobManager.startJob(&quot;my/special/jobtopic&quot;).schedule();
165c165
< <h3><a href="#job-consumers" id="job-consumers">Job Consumers</a></h3> 
---
> <h3><a href="#job-consumers" name="job-consumers">Job Consumers</a></h3>
174c174
<     @Property(name=JobConsumer.PROPERTY_TOPICS, value="my/special/jobtopic",)
---
>     @Property(name=JobConsumer.PROPERTY_TOPICS, value=&quot;my/special/jobtopic&quot;,)
184,185c184,185
< <h3><a href="#job-executors" id="job-executors">Job Executors</a></h3> 
< <p>If the job consumer needs more features like providing progress information or adding more information of the processing,<em>JobExecutor</em> should be implemented.<br> A job executor is a service processing a job. It registers itself as an OSGi service together with a property defining which topics this consumer can process:</p> 
---
> <h3><a href="#job-executors" name="job-executors">Job Executors</a></h3>
> <p>If the job consumer needs more features like providing progress information or adding more information of the processing,*JobExecutor* should be implemented.<br/>A job executor is a service processing a job. It registers itself as an OSGi service together with a property defining which topics this consumer can process:</p>
194c194
<     @Property(name=JobExecutor.PROPERTY_TOPICS, value="my/special/jobtopic",)
---
>     @Property(name=JobExecutor.PROPERTY_TOPICS, value=&quot;my/special/jobtopic&quot;,)
202c202
<             context.getJobContext().log("Job initialized");
---
>             context.getJobContext().log(&quot;Job initialized&quot;);
206c206
<             context.getJobContext().log("2 steps completed.");
---
>             context.getJobContext().log(&quot;2 steps completed.&quot;);
210c210
<                 context.getJobContext().log("Job Stopped after 4 steps.");
---
>                 context.getJobContext().log(&quot;Job Stopped after 4 steps.&quot;);
215c215
<             context.getJobContext().log("Job finished.");
---
>             context.getJobContext().log(&quot;Job finished.&quot;);
221,222c221,222
< <p><em>JobExecutionContext</em> can be used by executor to update job execution progress, add job logs, build a JobExecutionResult and to check if job is still active by jobExecutionContext.isStopped(). The executor can return job result "succeeded" by calling JobExecutionContext.result(successMsg).succeeded(), job result "failed" by calling JobExecutionContext.result(errorMessage).failed() and job result "cancelled" by calling JobExecutionContext.result(message).cancelled(). The <em>Job</em> interface allows to query the topic, the result message, progress, logs, the payload and additional information about the current job.</p> 
< <h3><a href="#job-handling" id="job-handling">Job Handling</a></h3> 
---
> <p><em>JobExecutionContext</em> can be used by executor to update job execution progress, add job logs, build a JobExecutionResult and to check if job is still active by jobExecutionContext.isStopped(). The executor can return job result "succeeded" by calling JobExecutionContext.result(successMsg).succeeded(), job result "failed" by calling JobExecutionContext.result(errorMessage).failed() and job result "cancelled" by calling JobExecutionContext.result(message).cancelled(). The <em>Job</em> interface allows to query the topic, the result message, progress, logs, the payload and additional information about the current job. </p>
> <h3><a href="#job-handling" name="job-handling">Job Handling</a></h3>
225c225
< <h4><a href="#queue-configurations" id="queue-configurations">Queue Configurations</a></h4> 
---
> <h4><a href="#queue-configurations" name="queue-configurations">Queue Configurations</a></h4>
230,231c230,231
<    <th> Property Name </th>
<    <th> Description </th>
---
>       <th>Property Name </th>
>       <th>Description </th>
236,237c236,237
<    <td> <code>queue.name</code> </td>
<    <td> The name of the queue. If matching is used for topics, the value {0} can be used for replacing the matched part. </td>
---
>       <td><code>queue.name</code> </td>
>       <td>The name of the queue. If matching is used for topics, the value {0} can be used for replacing the matched part. </td>
240,241c240,241
<    <td> <code>queue.type</code> </td>
<    <td> The type of the queue: ORDERED, UNORDERED, TOPIC_ROUND_ROBIN </td>
---
>       <td><code>queue.type</code> </td>
>       <td>The type of the queue: ORDERED, UNORDERED, TOPIC_ROUND_ROBIN </td>
244,245c244,245
<    <td> <code>queue.topics</code> </td>
<    <td> A list of topics processed by this queue. Either the concrete topic is specified or the topic string ends with /* or /. If a star is at the end all topics and sub topics match, with a dot only direct sub topics match. </td>
---
>       <td><code>queue.topics</code> </td>
>       <td>A list of topics processed by this queue. Either the concrete topic is specified or the topic string ends with /* or /. If a star is at the end all topics and sub topics match, with a dot only direct sub topics match. </td>
248,249c248,249
<    <td> <code>queue.maxparallel</code> </td>
<    <td> How many jobs can be processed in parallel? -1 for number of processors.</td>
---
>       <td><code>queue.maxparallel</code> </td>
>       <td>How many jobs can be processed in parallel? -1 for number of processors.</td>
252,253c252,253
<    <td> <code>queue.retries</code> </td>
<    <td> How often the job should be retried in case of failure (i.e. Job did not finish with succeeded or cancelled result). -1 for endless retries. In case of exceptions there is no retry. </td>
---
>       <td><code>queue.retries</code> </td>
>       <td>How often the job should be retried in case of failure (i.e. Job did not finish with succeeded or cancelled result). -1 for endless retries. In case of exceptions there is no retry. </td>
256,257c256,257
<    <td> <code>queue.retrydelay</code> </td>
<    <td> The waiting time in milliseconds between job retries. </td>
---
>       <td><code>queue.retrydelay</code> </td>
>       <td>The waiting time in milliseconds between job retries. </td>
260,261c260,261
<    <td> <code>queue.priority</code> </td>
<    <td> The thread priority: NORM, MIN, or MAX </td>
---
>       <td><code>queue.priority</code> </td>
>       <td>The thread priority: NORM, MIN, or MAX </td>
264,265c264,265
<    <td> <code>service.ranking</code> </td>
<    <td> A ranking for this configuration.</td>
---
>       <td><code>service.ranking</code> </td>
>       <td>A ranking for this configuration.</td>
270c270
< <h4><a href="#ordered-queues" id="ordered-queues">Ordered Queues</a></h4> 
---
> <h4><a href="#ordered-queues" name="ordered-queues">Ordered Queues</a></h4>
272c272
< <h4><a href="#unordered-queues-or-parallel-queues" id="unordered-queues-or-parallel-queues">Unordered Queues (or Parallel queues)</a></h4> 
---
> <h4><a href="#unordered-queues-or-parallel-queues-" name="unordered-queues-or-parallel-queues-">Unordered Queues (or Parallel queues)</a></h4>
274c274
< <h4><a href="#topic-round-robin-queues" id="topic-round-robin-queues">Topic-Round-Robin Queues</a></h4> 
---
> <h4><a href="#topic-round-robin-queues" name="topic-round-robin-queues">Topic-Round-Robin Queues</a></h4>
276c276
< <h3><a href="#job-distributing" id="job-distributing">Job Distributing</a></h3> 
---
> <h3><a href="#job-distributing" name="job-distributing">Job Distributing</a></h3>
280c280
< <h3><a href="#job-creation-patterns" id="job-creation-patterns">Job Creation Patterns</a></h3> 
---
> <h3><a href="#job-creation-patterns" name="job-creation-patterns">Job Creation Patterns</a></h3>
282c282
< <h4><a href="#jobs-based-on-user-action" id="jobs-based-on-user-action">Jobs based on user action</a></h4> 
---
> <h4><a href="#jobs-based-on-user-action" name="jobs-based-on-user-action">Jobs based on user action</a></h4>
284c284
< <h4><a href="#jobs-based-on-observation-events" id="jobs-based-on-observation-events">Jobs based on observation / events</a></h4> 
---
> <h4><a href="#jobs-based-on-observation-events" name="jobs-based-on-observation-events">Jobs based on observation / events</a></h4>
286c286
< <h2><a href="#distributed-events" id="distributed-events">Distributed Events</a></h2> 
---
> <h2><a href="#distributed-events" name="distributed-events">Distributed Events</a></h2>
288c288
< <h3><a href="#basic-principles" id="basic-principles">Basic Principles</a></h3> 
---
> <h3><a href="#basic-principles" name="basic-principles">Basic Principles</a></h3>
297c297
< <h3><a href="#event-distribution-across-application-nodes-cluster" id="event-distribution-across-application-nodes-cluster">Event Distribution Across Application Nodes (Cluster)</a></h3> 
---
> <h3><a href="#event-distribution-across-application-nodes-cluster-" name="event-distribution-across-application-nodes-cluster-">Event Distribution Across Application Nodes (Cluster)</a></h3>
300c300
< <h2><a href="#sending-scheduled-events" id="sending-scheduled-events">Sending Scheduled Events</a></h2> 
---
> <h2><a href="#sending-scheduled-events" name="sending-scheduled-events">Sending Scheduled Events</a></h2>
diff -b -B -r ./documentation/bundles/bundle-resources-extensions-bundleresource.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/bundle-resources-extensions-bundleresource.html
98,101c98,101
< <h1><a href="#introduction" id="introduction">Introduction</a></h1> 
< <p>The Bundle Resource Provider provides access to files/directories included in an OSGi bundle through the Sling <code>ResourceResolver</code>.</p> 
< <h1><a href="#configuration" id="configuration">Configuration</a></h1> 
< <p>If a bundle wants to provide resources, it must specify the Bundle manifest header <code>Sling-Bundle-Resources</code> containing a list of absolute paths. The paths are separated by comma. Without any additional information such a path is mapped 1:1 meaning that the specified path is used as the root resource path and the corresponding resource is at the same path in the bundle.</p> 
---
> <h1><a href="#introduction" name="introduction">Introduction</a></h1>
> <p>The Bundle Resource Provider provides access to files/directories included in an OSGi bundle through the Sling <code>ResourceResolver</code>. </p>
> <h1><a href="#configuration" name="configuration">Configuration</a></h1>
> <p>If a bundle wants to provide resources, it must specify the Bundle manifest header <code>Sling-Bundle-Resources</code> containing a list of absolute paths. The paths are separated by comma. Without any additional information such a path is mapped 1:1 meaning that the specified path is used as the root resource path and the corresponding resource is at the same path in the bundle. </p>
114c114
< <h1><a href="#resource-types" id="resource-types">Resource Types</a></h1> 
---
> <h1><a href="#resource-types" name="resource-types">Resource Types</a></h1>
120c120
< <h1><a href="#defining-resources-through-json" id="defining-resources-through-json">Defining Resources Through JSON</a></h1> 
---
> <h1><a href="#defining-resources-through-json" name="defining-resources-through-json">Defining Resources Through JSON</a></h1>
129,133c129,133
<     "sling:resourceType" : "products",
<     "sling" : {
<         "sling:resourceType" : "product",
<         "name" : "sling",
<         "title : "Apache Sling"
---
>     &quot;sling:resourceType&quot; : &quot;products&quot;,
>     &quot;sling&quot; : {
>         &quot;sling:resourceType&quot; : &quot;product&quot;,
>         &quot;name&quot; : &quot;sling&quot;,
>         &quot;title : &quot;Apache Sling&quot;
139c139
< <h1><a href="#adapters" id="adapters">Adapters</a></h1> 
---
> <h1><a href="#adapters" name="adapters">Adapters</a></h1>
145c145
< <h1><a href="#capability" id="capability">Capability</a></h1> 
---
> <h1><a href="#capability" name="capability">Capability</a></h1>
148c148
<    osgi.extender;osgi.extender="org.apache.sling.bundleresource";version:Version="1.1"
---
>    osgi.extender;osgi.extender=&quot;org.apache.sling.bundleresource&quot;;version:Version=&quot;1.1&quot;
153c153
<     osgi.extender;filter:="(&amp;(osgi.extender=org.apache.sling.bundleresource)(version&lt;=1.1.0)(!(version&gt;=2.0.0)))"
---
>     osgi.extender;filter:=&quot;(&amp;(osgi.extender=org.apache.sling.bundleresource)(version&lt;=1.1.0)(!(version&gt;=2.0.0)))&quot;
157c157
< <h1><a href="#webconsole-plugin" id="webconsole-plugin">WebConsole Plugin</a></h1> 
---
> <h1><a href="#webconsole-plugin" name="webconsole-plugin">WebConsole Plugin</a></h1>
diff -b -B -r ./documentation/bundles/caching-services.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/caching-services.html
94c94
< <div class="row"><div class="small-12 columns"><section class="wrap"><p>Caching services are available under multiple repositories at <a href="https://github.com/apache/?utf8=✓&amp;q=sling-cache">https://github.com/apache/?utf8=✓&amp;q=sling-cache</a></p> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><p>Caching services are available under multiple repositories at <a href="https://github.com/apache/?utf8=✓&q=sling-cache">https://github.com/apache/?utf8=✓&amp;q=sling-cache</a></p>
96c96,97
< <!-- GIT-TODO portal stuff must be moved to the Git whiteboard --> A portal cache provider API implementation is provided, that depends on the whiteboard portal modules found under [https://svn.apache.org/repos/asf/sling/whiteboard/portal](https://svn.apache.org/repos/asf/sling/whiteboard/portal)</section></div></div>            
---
> <!-- GIT-TODO portal stuff must be moved to the Git whiteboard -->
> <p>A portal cache provider API implementation is provided, that depends on the whiteboard portal modules found under <a href="https://svn.apache.org/repos/asf/sling/whiteboard/portal">https://svn.apache.org/repos/asf/sling/whiteboard/portal</a></p></section></div></div>            
diff -b -B -r ./documentation/bundles/configuration-installer-factory.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/configuration-installer-factory.html
95c95
< <h2><a href="#configurations" id="configurations">Configurations</a></h2> 
---
> <h2><a href="#configurations" name="configurations">Configurations</a></h2>
97c97
< <pre><code>filename ::= &lt;pid&gt; ( '-' &lt;subname&gt; )? ('.cfg'|'.config')
---
> <pre><code>filename ::= &lt;pid&gt; ( &#39;-&#39; &lt;subname&gt; )? (&#39;.cfg&#39;|&#39;.config&#39;)
99c99
< <p>If the form is <code>&lt;pid&gt;('.cfg'|'.config')</code>, the file contains the properties for a Managed Service. The <code>&lt;pid&gt;</code> is then the PID of the Managed Service. See the Configuration Admin service for details.</p> 
---
> <p>If the form is <code>&lt;pid&gt;(&#39;.cfg&#39;|&#39;.config&#39;)</code>, the file contains the properties for a Managed Service. The <code>&lt;pid&gt;</code> is then the PID of the Managed Service. See the Configuration Admin service for details.</p>
108c108
< <h3><a href="#property-files-cfg" id="property-files-cfg">Property Files (.cfg)</a></h3> 
---
> <h3><a href="#property-files-cfg-" name="property-files-cfg-">Property Files (.cfg)</a></h3>
111,112c111,112
< header ::= &lt;header&gt; ( ':' | '=' ) &lt;value&gt; ( '\&lt;nl&gt; &lt;value&gt; ) *
< comment ::= '#' &lt;any&gt;
---
> header ::= &lt;header&gt; ( &#39;:&#39; | &#39;=&#39; ) &lt;value&gt; ( &#39;\&lt;nl&gt; &lt;value&gt; ) *
> comment ::= &#39;#&#39; &lt;any&gt;
118,119c118,119
< <p>In addition the XML format defined by <a href="https://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#loadFromXML(java.io.InputStream)">java.util.Property</a> is supported if the file starts with the character <code>&lt;</code>.</p> 
< <h3><a href="#configuration-files-config" id="configuration-files-config">Configuration Files (.config)</a></h3> 
---
> <p>In addition the XML format defined by [java.util.Property](https://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#loadFromXML(java.io.InputStream)) is supported if the file starts with the character <code>&lt;</code>.</p>
> <h3><a href="#configuration-files-config-" name="configuration-files-config-">Configuration Files (.config)</a></h3>
124,125c124,125
< comment ::= '#' &lt;any&gt;
< header ::= prop '=' value
---
> comment ::= &#39;#&#39; &lt;any&gt;
> header ::= prop &#39;=&#39; value
127,131c127,131
< symbolic-name ::= token { '.' token } 
< token ::= { [ 0..9 ] | [ a..z ] | [ A..Z ] | '_' | '-' }
< value ::= [ type ] ( '[' values ']' | '(' values ')' | simple ) 
< values ::= simple { ',' simple } 
< simple ::= '"' stringsimple '"'
---
> symbolic-name ::= token { &#39;.&#39; token } 
> token ::= { [ 0..9 ] | [ a..z ] | [ A..Z ] | &#39;_&#39; | &#39;-&#39; }
> value ::= [ type ] ( &#39;[&#39; values &#39;]&#39; | &#39;(&#39; values &#39;)&#39; | simple ) 
> values ::= simple { &#39;,&#39; simple } 
> simple ::= &#39;&quot;&#39; stringsimple &#39;&quot;&#39;
133c133
< stringsimple ::= &lt;quoted string representation of the value where both '"' and '=' need to be escaped&gt;
---
> stringsimple ::= &lt;quoted string representation of the value where both &#39;&quot;&#39; and &#39;=&#39; need to be escaped&gt;
150c150
< <h1><a href="#project-info" id="project-info">Project Info</a></h1> 
---
> <h1><a href="#project-info" name="project-info">Project Info</a></h1>
diff -b -B -r ./documentation/bundles/content-distribution.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/content-distribution.html
96c96
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
98c98
< <h2><a href="#distribution-usecases" id="distribution-usecases">Distribution usecases</a></h2> 
---
> <h2><a href="#distribution-usecases" name="distribution-usecases">Distribution usecases</a></h2>
100c100
< <h3><a href="#forward-distribution" id="forward-distribution">Forward distribution</a></h3> 
---
> <h3><a href="#forward-distribution" name="forward-distribution">Forward distribution</a></h3>
102c102
< <h4><a href="#setup-overview" id="setup-overview">Setup overview</a></h4> 
---
> <h4><a href="#setup-overview" name="setup-overview">Setup overview</a></h4>
107c107,108
<   </ul> </li> 
---
>     </ul>
>   </li>
111c112,113
<   </ul> </li> 
---
>     </ul>
>   </li>
113c115
< <h4><a href="#sample-configuration" id="sample-configuration">Sample configuration</a></h4> 
---
> <h4><a href="#sample-configuration" name="sample-configuration">Sample configuration</a></h4>
115,121c117,129
<  <li> <p>on source instance: one forward agent</p> <pre><code>org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json            
<     name="publish"
<     packageImporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/importers/default"]
< </code></pre> </li> 
<  <li> <p>on target instance: one local importer</p> <pre><code>org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default
<     name="default"
< </code></pre> </li> 
---
>   <li>
>     <p>on source instance: one forward agent</p>
>     <pre><code>org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json            
>     name=&quot;publish&quot;
>     packageImporter.endpoints=[&quot;http://localhost:4503/libs/sling/distribution/services/importers/default&quot;]
> </code></pre>
>   </li>
>   <li>
>     <p>on target instance: one local importer</p>
>     <pre><code>org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default
>     name=&quot;default&quot;
> </code></pre>
>   </li>
123c131
< <h4><a href="#trigger-forward-distribution" id="trigger-forward-distribution">Trigger forward distribution</a></h4> 
---
> <h4><a href="#trigger-forward-distribution" name="trigger-forward-distribution">Trigger forward distribution</a></h4>
126c134
< <pre><code>$ curl -v -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish -d 'action=ADD' -d 'path=/content/sample1'
---
> <pre><code>$ curl -v -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish -d &#39;action=ADD&#39; -d &#39;path=/content/sample1&#39;
128c136
< <h3><a href="#reverse-distribution" id="reverse-distribution">Reverse distribution</a></h3> 
---
> <h3><a href="#reverse-distribution" name="reverse-distribution">Reverse distribution</a></h3>
130c138
< <h4><a href="#setup-overview" id="setup-overview">Setup overview</a></h4> 
---
> <h4><a href="#setup-overview" name="setup-overview">Setup overview</a></h4>
135c143,144
<   </ul> </li> 
---
>     </ul>
>   </li>
140c149,150
<   </ul> </li> 
---
>     </ul>
>   </li>
142c152
< <h4><a href="#sample-configuration" id="sample-configuration">Sample configuration</a></h4> 
---
> <h4><a href="#sample-configuration" name="sample-configuration">Sample configuration</a></h4>
144,149c154,164
<  <li> <p>on target instance: one reverse agent</p> <pre><code>org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-reverse.json            
<     name="reverse"
<     packageExporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/exporters/reverse"]
< </code></pre> </li> 
<  <li> <p>on source instance: one queue agent and one exporter for that agent</p> <pre><code>org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json            
<     name="reverse"
---
>   <li>
>     <p>on target instance: one reverse agent</p>
>     <pre><code>org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-reverse.json            
>     name=&quot;reverse&quot;
>     packageExporter.endpoints=[&quot;http://localhost:4503/libs/sling/distribution/services/exporters/reverse&quot;]
> </code></pre>
>   </li>
>   <li>
>     <p>on source instance: one queue agent and one exporter for that agent</p>
>     <pre><code>org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json            
>     name=&quot;reverse&quot;
152,154c167,170
<     name="reverse"
<     agent.target="(name=reverse)"
< </code></pre> </li> 
---
>     name=&quot;reverse&quot;
>     agent.target=&quot;(name=reverse)&quot;
> </code></pre>
>   </li>
156c172
< <h4><a href="#trigger-reverse-distribution" id="trigger-reverse-distribution">Trigger reverse distribution</a></h4> 
---
> <h4><a href="#trigger-reverse-distribution" name="trigger-reverse-distribution">Trigger reverse distribution</a></h4>
159c175
< <pre><code>$ curl -v -u admin:admin http://localhost:8081/libs/sling/distribution/services/agents/publish -d 'action=PULL' -d 'path=/content/sample1'
---
> <pre><code>$ curl -v -u admin:admin http://localhost:8081/libs/sling/distribution/services/agents/publish -d &#39;action=PULL&#39; -d &#39;path=/content/sample1&#39;
161c177
< <h3><a href="#sync-distribution" id="sync-distribution">Sync distribution</a></h3> 
---
> <h3><a href="#sync-distribution" name="sync-distribution">Sync distribution</a></h3>
163c179
< <h4><a href="#setup-overview" id="setup-overview">Setup overview:</a></h4> 
---
> <h4><a href="#setup-overview-" name="setup-overview-">Setup overview:</a></h4>
168c184,185
<   </ul> </li> 
---
>     </ul>
>   </li>
174c191,192
<   </ul> </li> 
---
>     </ul>
>   </li>
176c194
< <h4><a href="#sample-configuration" id="sample-configuration">Sample configuration</a></h4> 
---
> <h4><a href="#sample-configuration" name="sample-configuration">Sample configuration</a></h4>
178,184c196,207
<  <li> <p>on coordinator instance: one sync agent</p> <pre><code>org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-sync.json            
<     name="sync"
<     packageExporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/exporters/reverse", "http://localhost:4504/libs/sling/distribution/services/exporters/reverse"]
<     packageImporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/importers/default", "http://localhost:4504/libs/sling/distribution/services/importers/default"]
< </code></pre> </li> 
<  <li> <p>on each farm instance: one local exporter and one local importer</p> <pre><code>org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json            
<     name="reverse"
---
>   <li>
>     <p>on coordinator instance: one sync agent</p>
>     <pre><code>org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-sync.json            
>     name=&quot;sync&quot;
>     packageExporter.endpoints=[&quot;http://localhost:4503/libs/sling/distribution/services/exporters/reverse&quot;, &quot;http://localhost:4504/libs/sling/distribution/services/exporters/reverse&quot;]
>     packageImporter.endpoints=[&quot;http://localhost:4503/libs/sling/distribution/services/importers/default&quot;, &quot;http://localhost:4504/libs/sling/distribution/services/importers/default&quot;]
> </code></pre>
>   </li>
>   <li>
>     <p>on each farm instance: one local exporter and one local importer</p>
>     <pre><code>org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json            
>     name=&quot;reverse&quot;
187,188c210,211
<     name="reverse"
<     agent.target="(name=reverse)"
---
>     name=&quot;reverse&quot;
>     agent.target=&quot;(name=reverse)&quot;
191,193c214,217
<     name="reverse"
<     agent.target="(name=reverse)"
< </code></pre> </li> 
---
>     name=&quot;reverse&quot;
>     agent.target=&quot;(name=reverse)&quot;
> </code></pre>
>   </li>
195c219
< <h3><a href="#multidatacenter-sync-distribution" id="multidatacenter-sync-distribution">Multidatacenter sync distribution</a></h3> 
---
> <h3><a href="#multidatacenter-sync-distribution" name="multidatacenter-sync-distribution">Multidatacenter sync distribution</a></h3>
197c221
< <h4><a href="#setup-overview" id="setup-overview">Setup overview</a></h4> 
---
> <h4><a href="#setup-overview" name="setup-overview">Setup overview</a></h4>
204c228,229
<   </ul> </li> 
---
>     </ul>
>   </li>
210c235,236
<   </ul> </li> 
---
>     </ul>
>   </li>
212c238
< <h4><a href="#sample-configuration" id="sample-configuration">Sample configuration</a></h4> 
---
> <h4><a href="#sample-configuration" name="sample-configuration">Sample configuration</a></h4>
214,218c240,246
<  <li> <p>on coordinator instance: one intradcsync agent with two exporters for the other dcs, and one interdcsync agent that connects to remote exporters.</p> <pre><code>org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-intradcsync          
<     name="intradcsync"
<     packageExporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/exporters/reverse", "http://localhost:4504/libs/sling/distribution/services/exporters/reverse"]
<     packageImporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/importers/default", "http://localhost:4504/libs/sling/distribution/services/importers/default"]
<     passiveQueues=["dc2queue", "dc3queue"]
---
>   <li>
>     <p>on coordinator instance: one intradcsync agent with two exporters for the other dcs, and one interdcsync agent that connects to remote exporters.</p>
>     <pre><code>org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-intradcsync          
>     name=&quot;intradcsync&quot;
>     packageExporter.endpoints=[&quot;http://localhost:4503/libs/sling/distribution/services/exporters/reverse&quot;, &quot;http://localhost:4504/libs/sling/distribution/services/exporters/reverse&quot;]
>     packageImporter.endpoints=[&quot;http://localhost:4503/libs/sling/distribution/services/importers/default&quot;, &quot;http://localhost:4504/libs/sling/distribution/services/importers/default&quot;]
>     passiveQueues=[&quot;dc2queue&quot;, &quot;dc3queue&quot;]
221,223c249,251
<     name="dc2queue"
<     agent.target="(name=intradcsync)"
<     queue="dc2queue"
---
>     name=&quot;dc2queue&quot;
>     agent.target=&quot;(name=intradcsync)&quot;
>     queue=&quot;dc2queue&quot;
226,228c254,256
<     name="dc3queue"
<     agent.target="(name=intradcsync)"
<     queue="dc3queue"
---
>     name=&quot;dc3queue&quot;
>     agent.target=&quot;(name=intradcsync)&quot;
>     queue=&quot;dc3queue&quot;
231,236c259,267
<     name="interdcsync"
<     packageExporter.endpoints=["http://localhost:5502/libs/sling/distribution/services/exporters/dc1queue", "http://localhost:6502/libs/sling/distribution/services/exporters/dc1queue"]
<     packageImporter.endpoints=["http://localhost:4503/libs/sling/distribution/services/importers/default", "http://localhost:4504/libs/sling/distribution/services/importers/default"]
< </code></pre> </li> 
<  <li> <p>on each farm instance: one local exporter and one local importer</p> <pre><code>org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json            
<     name="reverse"
---
>     name=&quot;interdcsync&quot;
>     packageExporter.endpoints=[&quot;http://localhost:5502/libs/sling/distribution/services/exporters/dc1queue&quot;, &quot;http://localhost:6502/libs/sling/distribution/services/exporters/dc1queue&quot;]
>     packageImporter.endpoints=[&quot;http://localhost:4503/libs/sling/distribution/services/importers/default&quot;, &quot;http://localhost:4504/libs/sling/distribution/services/importers/default&quot;]
> </code></pre>
>   </li>
>   <li>
>     <p>on each farm instance: one local exporter and one local importer</p>
>     <pre><code>org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json            
>     name=&quot;reverse&quot;
239,240c270,271
<     name="reverse"
<     agent.target="(name=reverse)"
---
>     name=&quot;reverse&quot;
>     agent.target=&quot;(name=reverse)&quot;
243,244c274,276
<     name="default"
< </code></pre> </li> 
---
>     name=&quot;default&quot;
> </code></pre>
>   </li>
246,247c278,279
< <h2><a href="#additional-options" id="additional-options">Additional options</a></h2> 
< <h3><a href="#how-to-configure-binary-less-distribution" id="how-to-configure-binary-less-distribution">How to configure binary-less distribution?</a></h3> 
---
> <h2><a href="#additional-options" name="additional-options">Additional options</a></h2>
> <h3><a href="#how-to-configure-binary-less-distribution-" name="how-to-configure-binary-less-distribution-">How to configure binary-less distribution?</a></h3>
253c285
< <h3><a href="#how-to-configure-priority-queue" id="how-to-configure-priority-queue">How to configure priority queue?</a></h3> 
---
> <h3><a href="#how-to-configure-priority-queue-" name="how-to-configure-priority-queue-">How to configure priority queue?</a></h3>
257c289
< <h3><a href="#how-to-configure-retry-strategy" id="how-to-configure-retry-strategy">How to configure retry strategy?</a></h3> 
---
> <h3><a href="#how-to-configure-retry-strategy-" name="how-to-configure-retry-strategy-">How to configure retry strategy?</a></h3>
diff -b -B -r ./documentation/bundles/content-loading-jcr-contentloader.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/content-loading-jcr-contentloader.html
97c97
< <h2><a href="#initial-content-loading" id="initial-content-loading">Initial Content Loading</a></h2> 
---
> <h2><a href="#initial-content-loading" name="initial-content-loading">Initial Content Loading</a></h2>
103,104c103,104
<    <th> Source Entry Paths in Bundle </th>
<    <th> Target Repository Path </th>
---
>       <th>Source Entry Paths in Bundle </th>
>       <th>Target Repository Path </th>
109,110c109,110
<    <td> <code>SLING-INF/content/home</code> </td>
<    <td> <code>/home</code> </td>
---
>       <td><code>SLING-INF/content/home</code> </td>
>       <td><code>/home</code> </td>
113,114c113,114
<    <td> <code>SLING-INF/content/content/playground/en/home</code> </td>
<    <td> <code>/content/playground/en/home</code> </td>
---
>       <td><code>SLING-INF/content/content/playground/en/home</code> </td>
>       <td><code>/content/playground/en/home</code> </td>
117,118c117,118
<    <td> <code>SLING-INF/someothercontent/playground/en/home</code> </td>
<    <td> not installed at all, because not below the <code>Sling-Initial-Content</code> header entry </td>
---
>       <td><code>SLING-INF/someothercontent/playground/en/home</code> </td>
>       <td>not installed at all, because not below the <code>Sling-Initial-Content</code> header entry </td>
126,127c126,127
<    <th> Entry Type </th>
<    <th> Installation method </th>
---
>       <th>Entry Type </th>
>       <th>Installation method </th>
132,133c132,133
<    <td> Directory </td>
<    <td> Created as a node of type <code>sling:Folder</code> unless a content definition file of the same name exists in the same directory as the directory to be installed. Example: A directory <code>SLING-INF/content/dir</code> is installed as node <code>/dir</code> of type <code>nt:folder</code> unless a <code>SLING-INF/content/dir.xml</code> or <code>SLING-INF/content/dir.json</code> file exists which defines the content for the <code>/dir</code> node. </td>
---
>       <td>Directory </td>
>       <td>Created as a node of type <code>sling:Folder</code> unless a content definition file of the same name exists in the same directory as the directory to be installed. Example: A directory <code>SLING-INF/content/dir</code> is installed as node <code>/dir</code> of type <code>nt:folder</code> unless a <code>SLING-INF/content/dir.xml</code> or <code>SLING-INF/content/dir.json</code> file exists which defines the content for the <code>/dir</code> node. </td>
136,137c136,137
<    <td> File </td>
<    <td> Unless the file is a content definition file (see below) an <code>nt:file</code> node is created for the file and an <code>nt:resource</code> node is created as its <code>jcr:content</code> child node to take the contents of the bundle file. The properties of the <code>nt:resource</code> node are set from file information as available. If a content definition file exists with the same name as the file plus <code>.json</code> or <code>.xml</code> these properties are set additionally on the imported file. See below for the content definition file specification. </td>
---
>       <td>File </td>
>       <td>Unless the file is a content definition file (see below) an <code>nt:file</code> node is created for the file and an <code>nt:resource</code> node is created as its <code>jcr:content</code> child node to take the contents of the bundle file. The properties of the <code>nt:resource</code> node are set from file information as available. If a content definition file exists with the same name as the file plus <code>.json</code> or <code>.xml</code> these properties are set additionally on the imported file. See below for the content definition file specification. </td>
145,148c145,148
<    <th> Directive </th>
<    <th> Definition </th>
<    <th> Default value </th>
<    <th> Description </th>
---
>       <th>Directive </th>
>       <th>Definition </th>
>       <th>Default value </th>
>       <th>Description </th>
153,156c153,156
<    <td> <code>overwrite</code> </td>
<    <td> <code>overwrite:=(true|false)<code> </code></code></td>
<    <td> <code>false</code> </td>
<    <td> The overwrite directive specifies if content nodes should be overwritten (at the target repository path, which is "/" by default) or just initially added. If this is true, existing nodes are deleted and a new node is created in the same place. This directive should be used together with the <code>path</code> directive to limit overwriting. </td>
---
>       <td><code>overwrite</code> </td>
>       <td><code>overwrite:=(true&#124;false)<code> </td>
>       <td><code>false</code> </td>
>       <td>The overwrite directive specifies if content nodes should be overwritten (at the target repository path, which is "/" by default) or just initially added. If this is true, existing nodes are deleted and a new node is created in the same place. This directive should be used together with the <code>path</code> directive to limit overwriting. </td>
159,162c159,162
<    <td> <code>overwriteProperties</code> </td>
<    <td> <code>overwriteProperties:=(true|false)</code> </td>
<    <td> <code>false</code> </td>
<    <td> The overwriteProperties directive specifying if content properties should be overwritten or just initially added (at the target repository path, which is "/" by default). This directive should be used together with the <code>path</code> directive to limit overwriting. </td>
---
>       <td><code>overwriteProperties</code> </td>
>       <td><code>overwriteProperties:=(true&#124;false)</code> </td>
>       <td><code>false</code> </td>
>       <td>The overwriteProperties directive specifying if content properties should be overwritten or just initially added (at the target repository path, which is "/" by default). This directive should be used together with the <code>path</code> directive to limit overwriting. </td>
165,168c165,168
<    <td> <code>uninstall</code> </td>
<    <td> <code>uninstall:=(true|false)</code> </td>
<    <td> value from <code>overwrite</code> </td>
<    <td> The uninstall directive specifies if content should be uninstalled when bundle is unregistered. This value defaults to the value of the <code>overwrite</code> directive. </td>
---
>       <td><code>uninstall</code> </td>
>       <td><code>uninstall:=(true&#124;false)</code> </td>
>       <td>value from <code>overwrite</code> </td>
>       <td>The uninstall directive specifies if content should be uninstalled when bundle is unregistered. This value defaults to the value of the <code>overwrite</code> directive. </td>
171,174c171,174
<    <td> <code>path</code> </td>
<    <td> <code>path:=<em>/target/location</em></code> </td>
<    <td> <code>/</code> </td>
<    <td> The path directive specifies the target node where initial content will be loaded. If the path does not exist yet in the repository, it is created by the content loader. The intermediate nodes are of type <code>sling:Folder</code>. </td>
---
>       <td><code>path</code> </td>
>       <td><code>path:=*/target/location*</code> </td>
>       <td><code>/</code> </td>
>       <td>The path directive specifies the target node where initial content will be loaded. If the path does not exist yet in the repository, it is created by the content loader. The intermediate nodes are of type <code>sling:Folder</code>. </td>
177,180c177,180
<    <td> <code>checkin</code> </td>
<    <td> <code>checkin:=(true|false)</code> </td>
<    <td> <code>false</code> </td>
<    <td> The checkin directive specifies whether versionable nodes should be checked in. </td>
---
>       <td><code>checkin</code> </td>
>       <td><code>checkin:=(true&#124;false)</code> </td>
>       <td><code>false</code> </td>
>       <td>The checkin directive specifies whether versionable nodes should be checked in. </td>
183,186c183,186
<    <td> <code>ignoreImportProviders</code> </td>
<    <td> <code>ignoreImportProviders:=list of extensions</code> </td>
<    <td> <code>empty</code> </td>
<    <td> This directive can be used to not run one of the configured extractors (see below). </td>
---
>       <td><code>ignoreImportProviders</code> </td>
>       <td><code>ignoreImportProviders:=list of extensions</code> </td>
>       <td><code>empty</code> </td>
>       <td>This directive can be used to not run one of the configured extractors (see below). </td>
194,195c194,195
<    <th> <code>Sling-Initial-Content</code> header entry </th>
<    <th> Behaviour </th>
---
>       <th><code>Sling-Initial-Content</code> header entry </th>
>       <th>Behaviour </th>
200,201c200,201
<    <td> <code>SLING-INF/content/home;overwrite:=true;path:=/home</code> </td>
<    <td> Overwrites already existing content in <em>/home</em> and uninstalls the content when the bundle is unregistered. </td>
---
>       <td><code>SLING-INF/content/home;overwrite:=true;path:=/home</code> </td>
>       <td>Overwrites already existing content in <em>/home</em> and uninstalls the content when the bundle is unregistered. </td>
204,205c204,205
<    <td> <code>SLING-INF/content/home;overwriteProperties:=true;path:=/home</code> </td>
<    <td> Overwrites properties of existing content in <em>/home</em>. </td>
---
>       <td><code>SLING-INF/content/home;overwriteProperties:=true;path:=/home</code> </td>
>       <td>Overwrites properties of existing content in <em>/home</em>. </td>
208,209c208,209
<    <td> <code>SLING-INF/content/home;path:=/sites/sling_website</code> </td>
<    <td> This loads the content given in <em>SLING-INF/content/home</em> into <em>/sites/sling_website</em>. </td>
---
>       <td><code>SLING-INF/content/home;path:=/sites/sling_website</code> </td>
>       <td>This loads the content given in <em>SLING-INF/content/home</em> into <em>/sites/sling_website</em>. </td>
212,213c212,213
<    <td> <code>SLING-INF/content/home;checkin:=true</code> </td>
<    <td> After content loading, versionable nodes are checked in. </td>
---
>       <td><code>SLING-INF/content/home;checkin:=true</code> </td>
>       <td>After content loading, versionable nodes are checked in. </td>
217c217
< <h2><a href="#loading-initial-content-from-bundles" id="loading-initial-content-from-bundles">Loading initial content from bundles</a></h2> 
---
> <h2><a href="#loading-initial-content-from-bundles" name="loading-initial-content-from-bundles">Loading initial content from bundles</a></h2>
226c226
< <h3><a href="#directories" id="directories">Directories</a></h3> 
---
> <h3><a href="#directories" name="directories">Directories</a></h3>
228c228
< <h3><a href="#files" id="files">Files</a></h3> 
---
> <h3><a href="#files" name="files">Files</a></h3>
231c231
< <h3><a href="#xml-descriptor-files" id="xml-descriptor-files">XML Descriptor Files</a></h3> 
---
> <h3><a href="#xml-descriptor-files" name="xml-descriptor-files">XML Descriptor Files</a></h3>
286,289c286,289
< <h4><a href="#using-a-custom-xml-format" id="using-a-custom-xml-format">Using a custom XML format</a></h4> 
< <p>By writing an XSLT stylesheet file, you can use whatever XML format you prefer. The XML file references an XSLT stylesheet by using the xml-stylesheet processing instruction:</p> 
< <pre><code>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
< &lt;?xml-stylesheet href="my-transform.xsl" type="text/xsl"?&gt; &lt;!-- The path to my-transform.xsl is relative to this file --&gt;
---
> <h4><a href="#using-a-custom-xml-format" name="using-a-custom-xml-format">Using a custom XML format</a></h4>
> <p>By writing an XSLT stylesheet file, you can use whatever XML format you prefer. The XML file references an XSLT stylesheet by using the xml-stylesheet processing instruction: </p>
> <pre><code>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
> &lt;?xml-stylesheet href=&quot;my-transform.xsl&quot; type=&quot;text/xsl&quot;?&gt; &lt;!-- The path to my-transform.xsl is relative to this file --&gt;
299,301c299,301
< <pre><code>&lt;xsl:stylesheet version="1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" 
<   xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
<   xmlns:rep="internal" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"&gt;
---
> <pre><code>&lt;xsl:stylesheet version=&quot;1.0&quot; xmlns:jcr=&quot;http://www.jcp.org/jcr/1.0&quot; xmlns:mix=&quot;http://www.jcp.org/jcr/mix/1.0&quot; 
>   xmlns:sv=&quot;http://www.jcp.org/jcr/sv/1.0&quot; xmlns:sling=&quot;http://sling.apache.org/jcr/sling/1.0&quot;
>   xmlns:rep=&quot;internal&quot; xmlns:nt=&quot;http://www.jcp.org/jcr/nt/1.0&quot; xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
303c303
<   &lt;xsl:template match="your_custom_element"&gt;
---
>   &lt;xsl:template match=&quot;your_custom_element&quot;&gt;
311c311
< <h3><a href="#json-descriptor-files" id="json-descriptor-files">JSON Descriptor Files</a></h3> 
---
> <h3><a href="#json-descriptor-files" name="json-descriptor-files">JSON Descriptor Files</a></h3>
315c315
<     "nodename" : {
---
>     &quot;nodename&quot; : {
317,318c317,318
<         // optional primary node type, default "nt:unstructured"
<         "jcr:primaryType": "sling:ScriptedComponent",
---
>         // optional primary node type, default &quot;nt:unstructured&quot;
>         &quot;jcr:primaryType&quot;: &quot;sling:ScriptedComponent&quot;,
321c321
<         "jcr:mixinTypes": [ ],
---
>         &quot;jcr:mixinTypes&quot;: [ ],
328c328
<         "sling:contentClass": "com.day.sling.jcr.test.Test",
---
>         &quot;sling:contentClass&quot;: &quot;com.day.sling.jcr.test.Test&quot;,
331c331
<         "sampleMulti": [ "v1", "v2" ],
---
>         &quot;sampleMulti&quot;: [ &quot;v1&quot;, &quot;v2&quot; ],
334,335c334,335
<         "sampleStruct": 1,
<         "sampleStructMulti": [ 1, 2, 3 ],
---
>         &quot;sampleStruct&quot;: 1,
>         &quot;sampleStructMulti&quot;: [ 1, 2, 3 ],
338c338
<         "sampleDate": "2014-11-27T13:26:00.000+01:00",
---
>         &quot;sampleDate&quot;: &quot;2014-11-27T13:26:00.000+01:00&quot;,
341c341
<         "jcr:reference:sampleRef": "386b0f48-49c3-4c58-8735-ceee6bfc1933",
---
>         &quot;jcr:reference:sampleRef&quot;: &quot;386b0f48-49c3-4c58-8735-ceee6bfc1933&quot;,
344c344
<         "jcr:path:samplePath": "/content/data",
---
>         &quot;jcr:path:samplePath&quot;: &quot;/content/data&quot;,
347c347
<         "jcr:name:sampleName": "data",
---
>         &quot;jcr:name:sampleName&quot;: &quot;data&quot;,
350c350
<         "jcr:uri:sampleUri": "http://sling.apache.org/",
---
>         &quot;jcr:uri:sampleUri&quot;: &quot;http://sling.apache.org/&quot;,
353,359c353,359
<         "sling:scripts": {
<             "jcr:primaryType": "sling:ScriptList",
<             "sling:Script": {
<                     "jcr:primaryType": "sling:Script",
<                     "sling:name": "/test/content/jsp/start.jsp",
<                     "sling:type": "jsp",
<                     "sling:glob": "*"
---
>         &quot;sling:scripts&quot;: {
>             &quot;jcr:primaryType&quot;: &quot;sling:ScriptList&quot;,
>             &quot;sling:Script&quot;: {
>                     &quot;jcr:primaryType&quot;: &quot;sling:Script&quot;,
>                     &quot;sling:name&quot;: &quot;/test/content/jsp/start.jsp&quot;,
>                     &quot;sling:type&quot;: &quot;jsp&quot;,
>                     &quot;sling:glob&quot;: &quot;*&quot;
364,366c364,366
< <h3><a href="#extractors" id="extractors">Extractors</a></h3> 
< <p>By default, the <code>sling-jcr-contentloader</code> bundle tries to extract certain file types during content loading. These include <code>json</code>, <code>xml</code>, <code>zip</code>, and <code>jar</code> files. Therefore all available extractors are used for content processing. However if some files should be put into the repository unextracted, the <code>ignoreImportProviders</code> directive can be used with a comma separated list of extensions that should not be extracted, like <code>ignoreImportProviders:="jar,zip"</code>. Please note that the value needs to be put into quotation marks if more than one value is used like in the example.</p> 
< <h3><a href="#file-name-escaping" id="file-name-escaping">File name escaping</a></h3> 
---
> <h3><a href="#extractors" name="extractors">Extractors</a></h3>
> <p>By default, the <code>sling-jcr-contentloader</code> bundle tries to extract certain file types during content loading. These include <code>json</code>, <code>xml</code>, <code>zip</code>, and <code>jar</code> files. Therefore all available extractors are used for content processing. However if some files should be put into the repository unextracted, the <code>ignoreImportProviders</code> directive can be used with a comma separated list of extensions that should not be extracted, like <code>ignoreImportProviders:=&quot;jar,zip&quot;</code>. Please note that the value needs to be put into quotation marks if more than one value is used like in the example.</p>
> <h3><a href="#file-name-escaping" name="file-name-escaping">File name escaping</a></h3>
369,371c369,371
< <h3><a href="#workspace-targetting" id="workspace-targetting">Workspace Targetting</a></h3> 
< <p>By default, initial content will be loaded into the default workspace. To override this, add a <code>Sling-Initial-Content-Workspace</code> bundle manifest header to specify the workspace. Note that <em>all</em> content from a bundle will be loaded into the same workspace.</p> 
< <h3><a href="#example-load-i18n-json-files" id="example-load-i18n-json-files">Example: Load i18n JSON files</a></h3> 
---
> <h3><a href="#workspace-targetting" name="workspace-targetting">Workspace Targetting</a></h3>
> <p>By default, initial content will be loaded into the default workspace. To override this, add a <code>Sling-Initial-Content-Workspace</code> bundle manifest header to specify the workspace. Note that <em>all</em> content from a bundle will be loaded into the same workspace. </p>
> <h3><a href="#example-load-i18n-json-files" name="example-load-i18n-json-files">Example: Load i18n JSON files</a></h3>
385c385
< <pre><code>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
---
> <pre><code>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
396c396
< <h2><a href="#declared-node-type-registration" id="declared-node-type-registration">Declared Node Type Registration</a></h2> 
---
> <h2><a href="#declared-node-type-registration" name="declared-node-type-registration">Declared Node Type Registration</a></h2>
400c400
< <p>Node types installed by this mechanism will never be removed again by the <code>sling-jcr-base</code> bundle.</p> 
---
> <p>Node types installed by this mechanism will never be removed again by the <code>sling-jcr-base</code> bundle. </p>
403c403
<   Support for re-registration of node types is relatively limited. In Jackrabbit, for example, only "trivial" changes are allowed. 
---
> Support for re-registration of node types is relatively limited. In Jackrabbit, for example, only "trivial" changes are allowed.
405c405
< <h3><a href="#automated-tests" id="automated-tests">Automated tests</a></h3> 
---
> <h3><a href="#automated-tests" name="automated-tests">Automated tests</a></h3>
408c408
< <h2><a href="#acls-and-principals" id="acls-and-principals">ACLs and Principals</a></h2> 
---
> <h2><a href="#acls-and-principals" name="acls-and-principals">ACLs and Principals</a></h2>
412,414c412,414
<     "security:acl": [
<         { "principal": "TestGroup1", "granted": ["jcr:read","jcr:write"] },
<         { "principal": "TestUser1", "granted": ["jcr:read"], "denied": ["jcr:write"] }
---
>     &quot;security:acl&quot;: [
>         { &quot;principal&quot;: &quot;TestGroup1&quot;, &quot;granted&quot;: [&quot;jcr:read&quot;,&quot;jcr:write&quot;] },
>         { &quot;principal&quot;: &quot;TestUser1&quot;, &quot;granted&quot;: [&quot;jcr:read&quot;], &quot;denied&quot;: [&quot;jcr:write&quot;] }
428,430c428,430
<     "security:principals": [
<         { "name": "TestUser1", "password": "mypassword", "extraProp1": "extraProp1Value" },
<         { "name": "TestGroup1", "isgroup": "true", "members": ["TestUser1"], "extraProp1": "extraProp1Value" }
---
>     &quot;security:principals&quot;: [
>         { &quot;name&quot;: &quot;TestUser1&quot;, &quot;password&quot;: &quot;mypassword&quot;, &quot;extraProp1&quot;: &quot;extraProp1Value&quot; },
>         { &quot;name&quot;: &quot;TestGroup1&quot;, &quot;isgroup&quot;: &quot;true&quot;, &quot;members&quot;: [&quot;TestUser1&quot;], &quot;extraProp1&quot;: &quot;extraProp1Value&quot; }
diff -b -B -r ./documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
98c98
< <h1><a href="#about" id="about">About</a></h1> 
---
> <h1><a href="#about" name="about">About</a></h1>
101c101
< <h1><a href="#repository-paths" id="repository-paths">Repository paths</a></h1> 
---
> <h1><a href="#repository-paths" name="repository-paths">Repository paths</a></h1>
104c104
< <h1><a href="#context-paths" id="context-paths">Context paths</a></h1> 
---
> <h1><a href="#context-paths" name="context-paths">Context paths</a></h1>
106c106
< <h1><a href="#configuration-resource-resolving" id="configuration-resource-resolving">Configuration resource resolving</a></h1> 
---
> <h1><a href="#configuration-resource-resolving" name="configuration-resource-resolving">Configuration resource resolving</a></h1>
108c108
< <p><img src="http://sling.apache.org/config-resource-lookup.png" alt="Configuration resource lookup"></p> 
---
> <p><img src="config-resource-lookup.png" alt="Configuration resource lookup" /></p>
126c126
< <h1><a href="#configuration-persistence" id="configuration-persistence">Configuration persistence</a></h1> 
---
> <h1><a href="#configuration-persistence" name="configuration-persistence">Configuration persistence</a></h1>
132c132
<               @prop1 = 'value1'
---
>               @prop1 = &#39;value1&#39;
144c144
< <h1><a href="#resource-inheritance" id="resource-inheritance">Resource inheritance</a></h1> 
---
> <h1><a href="#resource-inheritance" name="resource-inheritance">Resource inheritance</a></h1>
155c155
< <p><img src="http://sling.apache.org/resource-inheritance.png" alt="Resource inheritance"></p> 
---
> <p><img src="resource-inheritance.png" alt="Resource inheritance" /></p>
157c157
< <h1><a href="#property-inheritance" id="property-inheritance">Property inheritance</a></h1> 
---
> <h1><a href="#property-inheritance" name="property-inheritance">Property inheritance</a></h1>
diff -b -B -r ./documentation/bundles/context-aware-configuration/context-aware-configuration-override.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
98c98
< <h1><a href="#about" id="about">About</a></h1> 
---
> <h1><a href="#about" name="about">About</a></h1>
102c102
< <h1><a href="#override-syntax" id="override-syntax">Override syntax</a></h1> 
---
> <h1><a href="#override-syntax" name="override-syntax">Override syntax</a></h1>
119,121c119,121
< <pre><code>my-config/property1="value 1"
< my-config/sub1/property1="value 1"
< my-config/property1=["value 1","value 2"]
---
> <pre><code>my-config/property1=&quot;value 1&quot;
> my-config/sub1/property1=&quot;value 1&quot;
> my-config/property1=[&quot;value 1&quot;,&quot;value 2&quot;]
123,125c123,125
< x.y.z.MyConfig={"prop1"="value1","prop2"=[1,2,3],"prop3"=true,"prop4"=1.23}
< [/content/region1]my-config/property1="value 1"
< [/content/region1]my-config/sub1={"prop1":"value 1"}
---
> x.y.z.MyConfig={&quot;prop1&quot;=&quot;value1&quot;,&quot;prop2&quot;=[1,2,3],&quot;prop3&quot;=true,&quot;prop4&quot;=1.23}
> [/content/region1]my-config/property1=&quot;value 1&quot;
> [/content/region1]my-config/sub1={&quot;prop1&quot;:&quot;value 1&quot;}
128,129c128,129
< <h1><a href="#built-in-override-providers" id="built-in-override-providers">Built-in override providers</a></h1> 
< <h2><a href="#override-via-system-properties" id="override-via-system-properties">Override via system properties</a></h2> 
---
> <h1><a href="#built-in-override-providers" name="built-in-override-providers">Built-in override providers</a></h1>
> <h2><a href="#override-via-system-properties" name="override-via-system-properties">Override via system properties</a></h2>
134,135c134,135
< -D"sling.caconfig.override.my-config/property1=[\"value 1\",\"value 2\"]"
< -D"sling.caconfig.override.[/content/region1]x.y.z.MyConfig={\"prop1\"=\"value1\",\"prop2\"=[1,2,3],\"prop3\"=true,\"prop4\"=1.23}"
---
> -D&quot;sling.caconfig.override.my-config/property1=[\&quot;value 1\&quot;,\&quot;value 2\&quot;]&quot;
> -D&quot;sling.caconfig.override.[/content/region1]x.y.z.MyConfig={\&quot;prop1\&quot;=\&quot;value1\&quot;,\&quot;prop2\&quot;=[1,2,3],\&quot;prop3\&quot;=true,\&quot;prop4\&quot;=1.23}&quot;
138c138
< <h2><a href="#override-via-osgi-configuration" id="override-via-osgi-configuration">Override via OSGi configuration</a></h2> 
---
> <h2><a href="#override-via-osgi-configuration" name="override-via-osgi-configuration">Override via OSGi configuration</a></h2>
diff -b -B -r ./documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
98c98
< <h1><a href="#about" id="about">About</a></h1> 
---
> <h1><a href="#about" name="about">About</a></h1>
101c101
< <h1><a href="#general-principles" id="general-principles">General principles</a></h1> 
---
> <h1><a href="#general-principles" name="general-principles">General principles</a></h1>
109c109
< <h1><a href="#context-path-strategy" id="context-path-strategy">Context Path Strategy</a></h1> 
---
> <h1><a href="#context-path-strategy" name="context-path-strategy">Context Path Strategy</a></h1>
112c112
< <h1><a href="#configuration-resource-resolver-strategy" id="configuration-resource-resolver-strategy">Configuration Resource Resolver Strategy</a></h1> 
---
> <h1><a href="#configuration-resource-resolver-strategy" name="configuration-resource-resolver-strategy">Configuration Resource Resolver Strategy</a></h1>
114c114
< <h1><a href="#configuration-inheritance-strategy" id="configuration-inheritance-strategy">Configuration Inheritance Strategy</a></h1> 
---
> <h1><a href="#configuration-inheritance-strategy" name="configuration-inheritance-strategy">Configuration Inheritance Strategy</a></h1>
116c116
< <h1><a href="#configuration-persistence-strategy" id="configuration-persistence-strategy">Configuration Persistence Strategy</a></h1> 
---
> <h1><a href="#configuration-persistence-strategy" name="configuration-persistence-strategy">Configuration Persistence Strategy</a></h1>
119c119
< <h1><a href="#configuration-metadata-provider" id="configuration-metadata-provider">Configuration Metadata Provider</a></h1> 
---
> <h1><a href="#configuration-metadata-provider" name="configuration-metadata-provider">Configuration Metadata Provider</a></h1>
121c121
< <h1><a href="#configuration-override-provider" id="configuration-override-provider">Configuration Override Provider</a></h1> 
---
> <h1><a href="#configuration-override-provider" name="configuration-override-provider">Configuration Override Provider</a></h1>
diff -b -B -r ./documentation/bundles/context-aware-configuration/context-aware-configuration.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/context-aware-configuration/context-aware-configuration.html
96c96
< <h1><a href="#about" id="about">About</a></h1> 
---
> <h1><a href="#about" name="about">About</a></h1>
99c99
< <p><img src="http://sling.apache.org/context-aware-config-example.png" alt="Configuration example"></p> 
---
> <p><img src="context-aware-config-example.png" alt="Configuration example" /></p>
102c102
< <h1><a href="#java-api" id="java-api">Java API</a></h1> 
---
> <h1><a href="#java-api" name="java-api">Java API</a></h1>
110c110
< <h2><a href="#context-aware-resources" id="context-aware-resources">Context-Aware Resources</a></h2> 
---
> <h2><a href="#context-aware-resources" name="context-aware-resources">Context-Aware Resources</a></h2>
117c117
< <pre><code><!-- TODO syntax marker (#!java) disabled -->Resource contentResource = resourceResolver.getResource("/content/mysite/page1");
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->Resource contentResource = resourceResolver.getResource(&quot;/content/mysite/page1&quot;);
119c119
< Resource configResource = configurationResourceResolver.getResource(contentResource, "my-bucket", "my-config");
---
> Resource configResource = configurationResourceResolver.getResource(contentResource, &quot;my-bucket&quot;, &quot;my-config&quot;);
122c122
< <pre><code><!-- TODO syntax marker (#!java) disabled -->Collection&lt;Resource&gt; configResources = configurationResourceResolver.getResourceCollection(contentResource, "my-bucket", "my-config");
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->Collection&lt;Resource&gt; configResources = configurationResourceResolver.getResourceCollection(contentResource, &quot;my-bucket&quot;, &quot;my-config&quot;);
125,126c125,126
< <p>The configuration name (3rd parameter) defines which configuration you are interested in. The name can be a relative path as well (e.g. <code>"sub1/my-config"</code>).</p> 
< <h2><a href="#context-aware-configurations" id="context-aware-configurations">Context-Aware Configurations</a></h2> 
---
> <p>The configuration name (3rd parameter) defines which configuration you are interested in. The name can be a relative path as well (e.g. <code>&quot;sub1/my-config&quot;</code>).</p>
> <h2><a href="#context-aware-configurations" name="context-aware-configurations">Context-Aware Configurations</a></h2>
129c129
< <pre><code><!-- TODO syntax marker (#!java) disabled -->Resource contentResource = resourceResolver.getResource("/content/mysite/page1");
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->Resource contentResource = resourceResolver.getResource(&quot;/content/mysite/page1&quot;);
138c138
< <h1><a href="#contexts-and-configuration-references" id="contexts-and-configuration-references">Contexts and configuration references</a></h1> 
---
> <h1><a href="#contexts-and-configuration-references" name="contexts-and-configuration-references">Contexts and configuration references</a></h1>
141c141
< <p><img src="http://sling.apache.org/context-and-config-reference.png" alt="Context and config reference"></p> 
---
> <p><img src="context-and-config-reference.png" alt="Context and config reference" /></p>
143c143
< <h1><a href="#describe-configurations-via-annotation-classes" id="describe-configurations-via-annotation-classes">Describe configurations via annotation classes</a></h1> 
---
> <h1><a href="#describe-configurations-via-annotation-classes" name="describe-configurations-via-annotation-classes">Describe configurations via annotation classes</a></h1>
146c146
< <pre><code><!-- TODO syntax marker (#!java) disabled -->@Configuration(label="My Configuration", description="Describe me")
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->@Configuration(label=&quot;My Configuration&quot;, description=&quot;Describe me&quot;)
149c149
<     @Property(label="Parameter #1", description="Describe me")
---
>     @Property(label=&quot;Parameter #1&quot;, description=&quot;Describe me&quot;)
152,153c152,153
<     @Property(label="Parameter with Default value", description="Describe me")
<     String paramWithDefault() default "defValue";
---
>     @Property(label=&quot;Parameter with Default value&quot;, description=&quot;Describe me&quot;)
>     String paramWithDefault() default &quot;defValue&quot;;
155c155
<     @Property(label="Integer parameter", description="Describe me")
---
>     @Property(label=&quot;Integer parameter&quot;, description=&quot;Describe me&quot;)
159c159
< <p>The <code>@Configuration</code> annotation is mandatory. All properties on the <code>@Configuration</code> annotation and the <code>@Property</code> annotations are optional - they provide additional metadata for tooling e.g. configuration editors.</p> 
---
> <p>The <code>@Configuration</code> annotation is mandatory. All properties on the <code>@Configuration</code> annotation and the <code>@Property</code> annotations are optional - they provide additional metadata for tooling e.g. configuration editors. </p>
165,166c165,166
< <p>To automate this you can use the Context-Aware Configuration bnd plugin (see next chapter).</p> 
< <h1><a href="#accessing-configuration-from-htlsightly-templates" id="accessing-configuration-from-htlsightly-templates">Accessing configuration from HTL/Sightly templates</a></h1> 
---
> <p>To automate this you can use the Context-Aware Configuration bnd plugin (see next chapter). </p>
> <h1><a href="#accessing-configuration-from-htl-sightly-templates" name="accessing-configuration-from-htl-sightly-templates">Accessing configuration from HTL/Sightly templates</a></h1>
171c171
<     &lt;dd&gt;${caconfig['x.y.z.ConfigSample'].stringParam}&lt;/dd&gt;
---
>     &lt;dd&gt;${caconfig[&#39;x.y.z.ConfigSample&#39;].stringParam}&lt;/dd&gt;
175c175
< <pre><code><!-- TODO syntax marker (#!html) disabled -->&lt;ul data-sly-list.item="${caconfig['x.y.z.ConfigSampleList']}"&gt;
---
> <pre><code><!-- TODO syntax marker (#!html) disabled -->&lt;ul data-sly-list.item=&quot;${caconfig[&#39;x.y.z.ConfigSampleList&#39;]}&quot;&gt;
180c180
< <pre><code><!-- TODO syntax marker (#!html) disabled -->${caconfig['x.y.z.ConfigSample']['nestedConfig/stringParam']}
---
> <pre><code><!-- TODO syntax marker (#!html) disabled -->${caconfig[&#39;x.y.z.ConfigSample&#39;][&#39;nestedConfig/stringParam&#39;]}
182c182
< <h1><a href="#context-aware-configuration-bnd-plugin" id="context-aware-configuration-bnd-plugin">Context-Aware Configuration bnd plugin</a></h1> 
---
> <h1><a href="#context-aware-configuration-bnd-plugin" name="context-aware-configuration-bnd-plugin">Context-Aware Configuration bnd plugin</a></h1>
204c204
< <h1><a href="#unit-tests-with-context-aware-configuration" id="unit-tests-with-context-aware-configuration">Unit Tests with Context-Aware Configuration</a></h1> 
---
> <h1><a href="#unit-tests-with-context-aware-configuration" name="unit-tests-with-context-aware-configuration">Unit Tests with Context-Aware Configuration</a></h1>
229c229
< <h1><a href="#customizing-the-configuration-lookup" id="customizing-the-configuration-lookup">Customizing the configuration lookup</a></h1> 
---
> <h1><a href="#customizing-the-configuration-lookup" name="customizing-the-configuration-lookup">Customizing the configuration lookup</a></h1>
233c233
< <h1><a href="#web-console-plugins" id="web-console-plugins">Web Console plugins</a></h1> 
---
> <h1><a href="#web-console-plugins" name="web-console-plugins">Web Console plugins</a></h1>
240c240
< <h1><a href="#management-api" id="management-api">Management API</a></h1> 
---
> <h1><a href="#management-api" name="management-api">Management API</a></h1>
244c244
< <h1><a href="#references" id="references">References</a></h1> 
---
> <h1><a href="#references" name="references">References</a></h1>
diff -b -B -r ./documentation/bundles/datasource-providers.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/datasource-providers.html
97c97
< <h2><a href="#pooled-connection-datasource-provider" id="pooled-connection-datasource-provider">Pooled Connection DataSource Provider</a></h2> 
---
> <h2><a href="#pooled-connection-datasource-provider" name="pooled-connection-datasource-provider">Pooled Connection DataSource Provider</a></h2>
105c105
< <h3><a href="#driver-loading" id="driver-loading">Driver Loading</a></h3> 
---
> <h3><a href="#driver-loading" name="driver-loading">Driver Loading</a></h3>
111c111
< <h3><a href="#configuration" id="configuration">Configuration</a></h3> 
---
> <h3><a href="#configuration" name="configuration">Configuration</a></h3>
118c118
< <p><img src="http://sling.apache.org/documentation/development/sling-datasource-config.png" alt="Web Console Config"></p> 
---
> <p><img src="/documentation/development/sling-datasource-config.png" alt="Web Console Config" /></p>
120c120
< <h3><a href="#convert-driver-jars-to-bundle" id="convert-driver-jars-to-bundle">Convert Driver jars to Bundle</a></h3> 
---
> <h3><a href="#convert-driver-jars-to-bundle" name="convert-driver-jars-to-bundle">Convert Driver jars to Bundle</a></h3>
140c140
< <h2><a href="#jndi-datasource" id="jndi-datasource">JNDI DataSource</a></h2> 
---
> <h2><a href="#jndi-datasource" name="jndi-datasource">JNDI DataSource</a></h2>
148c148
< <h2><a href="#usage" id="usage">Usage</a></h2> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
156c156
<     @Reference(target = "(&amp;(objectclass=javax.sql.DataSource)(datasource.name=foo))")
---
>     @Reference(target = &quot;(&amp;(objectclass=javax.sql.DataSource)(datasource.name=foo))&quot;)
160c160
< <h2><a href="#installation" id="installation">Installation</a></h2> 
---
> <h2><a href="#installation" name="installation">Installation</a></h2>
diff -b -B -r ./documentation/bundles/discovery-api-and-impl.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/discovery-api-and-impl.html
98c98
< <h2><a href="#discovery-entities" id="discovery-entities">Discovery Entities</a></h2> 
---
> <h2><a href="#discovery-entities" name="discovery-entities">Discovery Entities</a></h2>
100c100
< <h3><a href="#instance-instancedescription" id="instance-instancedescription">Instance, InstanceDescription</a></h3> 
---
> <h3><a href="#instance-instancedescription" name="instance-instancedescription">Instance, InstanceDescription</a></h3>
108c108
< <h3><a href="#cluster-clusterview" id="cluster-clusterview">Cluster, ClusterView</a></h3> 
---
> <h3><a href="#cluster-clusterview" name="cluster-clusterview">Cluster, ClusterView</a></h3>
116c116
< <h3><a href="#topology-topologyview" id="topology-topologyview">Topology, TopologyView</a></h3> 
---
> <h3><a href="#topology-topologyview" name="topology-topologyview">Topology, TopologyView</a></h3>
123c123
< <h2><a href="#cluster-leader-and-instance-ordering" id="cluster-leader-and-instance-ordering">Cluster Leader and Instance Ordering</a></h2> 
---
> <h2><a href="#cluster-leader-and-instance-ordering" name="cluster-leader-and-instance-ordering">Cluster Leader and Instance Ordering</a></h2>
125,126c125,126
< <p>Additionally each cluster (<code>ClusterView</code>) orders its instances in a stable list: each newly joined instances is added at the end of the list and retains its order in the list as long as it doesn't leave the cluster. This can be used to distribute "singleton" work amongst the cluster to more than just the leader.</p> 
< <h2><a href="#topology-changes" id="topology-changes">Topology Changes</a></h2> 
---
> <p>Additionally each cluster (<code>ClusterView</code>) orders its instances in a stable list: each newly joined instances is added at the end of the list and retains its order in the list as long as it doesn't leave the cluster. This can be used to distribute "singleton" work amongst the cluster to more than just the leader. </p>
> <h2><a href="#topology-changes" name="topology-changes">Topology Changes</a></h2>
146c146
< <h2><a href="#properties" id="properties">Properties</a></h2> 
---
> <h2><a href="#properties" name="properties">Properties</a></h2>
158c158
<           value = {"sample.value1", "sample.value2" })
---
>           value = {&quot;sample.value1&quot;, &quot;sample.value2&quot; })
162,165c162,165
< 		if ("sample.value1".equals(name)) {
< 			return "foo";
< 		} else if ("sample.value2".equals(name)) {
< 			return "bar";
---
>        if (&quot;sample.value1&quot;.equals(name)) {
>          return &quot;foo&quot;;
>        } else if (&quot;sample.value2&quot;.equals(name)) {
>          return &quot;bar&quot;;
172c172
< <h2><a href="#deployment-and-configuration" id="deployment-and-configuration">Deployment and configuration</a></h2> 
---
> <h2><a href="#deployment-and-configuration" name="deployment-and-configuration">Deployment and configuration</a></h2>
174,175c174,175
< <h2><a href="#discoveryimpl-resource-based-ootb-implementation" id="discoveryimpl-resource-based-ootb-implementation">discovery.impl: Resource-based, OOTB Implementation</a></h2> 
< <p>The <code>discovery.impl</code> bundle is a resource-based, out of the box implementation of the <code>discovery.api</code> using standard Sling.</p> 
---
> <h2><a href="#discovery-impl-resource-based-ootb-implementation" name="discovery-impl-resource-based-ootb-implementation">discovery.impl: Resource-based, OOTB Implementation</a></h2>
> <p>The <code>discovery.impl</code> bundle is a resource-based, out of the box implementation of the <code>discovery.api</code> using standard Sling. </p>
178c178
< <h3><a href="#location-in-repository" id="location-in-repository">Location in Repository</a></h3> 
---
> <h3><a href="#location-in-repository" name="location-in-repository">Location in Repository</a></h3>
182c182
< <h4><a href="#vardiscoveryimplclusterinstancesslingid" id="vardiscoveryimplclusterinstancesslingid">/var/discovery/impl/clusterInstances/&lt;slingId&gt;</a></h4> 
---
> <h4><a href="#var-discovery-impl-clusterinstances-lt-slingid-gt-" name="var-discovery-impl-clusterinstances-lt-slingid-gt-">/var/discovery/impl/clusterInstances/&lt;slingId&gt;</a></h4>
195c195
< <h4><a href="#vardiscoveryimplestablishedview" id="vardiscoveryimplestablishedview">/var/discovery/impl/establishedView</a></h4> 
---
> <h4><a href="#var-discovery-impl-establishedview" name="var-discovery-impl-establishedview">/var/discovery/impl/establishedView</a></h4>
202c202
< <h4><a href="#vardiscoveryimplongoingvotings" id="vardiscoveryimplongoingvotings">/var/discovery/impl/ongoingVotings</a></h4> 
---
> <h4><a href="#var-discovery-impl-ongoingvotings" name="var-discovery-impl-ongoingvotings">/var/discovery/impl/ongoingVotings</a></h4>
205c205
< <h4><a href="#vardiscoveryimplpreviousview" id="vardiscoveryimplpreviousview">/var/discovery/impl/previousView</a></h4> 
---
> <h4><a href="#var-discovery-impl-previousview" name="var-discovery-impl-previousview">/var/discovery/impl/previousView</a></h4>
207c207
< <h3><a href="#heartbeats-voting-and-intra-cluster-discovery" id="heartbeats-voting-and-intra-cluster-discovery">Heartbeats, Voting and Intra-Cluster Discovery</a></h3> 
---
> <h3><a href="#heartbeats-voting-and-intra-cluster-discovery" name="heartbeats-voting-and-intra-cluster-discovery">Heartbeats, Voting and Intra-Cluster Discovery</a></h3>
214c214
< <p>To avoid having each instance make it's own, perhaps differing conclusions as to which instance/heartbeat is dead or not, there is an explicit, unanimous voting mechanism that agrees upon a list of alive instances. This list of alive instances is called cluster view.</p> 
---
> <p>To avoid having each instance make it's own, perhaps differing conclusions as to which instance/heartbeat is dead or not, there is an explicit, unanimous voting mechanism that agrees upon a list of alive instances. This list of alive instances is called cluster view. </p>
222c222
< <h3><a href="#pseudo-network-partitioning-aka-split-brain" id="pseudo-network-partitioning-aka-split-brain">pseudo-network partitioning aka split-brain</a></h3> 
---
> <h3><a href="#pseudo-network-partitioning-aka-split-brain" name="pseudo-network-partitioning-aka-split-brain">pseudo-network partitioning aka split-brain</a></h3>
226c226
< <p><img src="http://sling.apache.org/discovery-impl-split-brain.png" alt="discovery.impl split brain"></p> 
---
> <p><img src="discovery-impl-split-brain.png" alt="discovery.impl split brain" /></p>
235c235
< <h3><a href="#topology-connectors-for-cross-cluster-discovery" id="topology-connectors-for-cross-cluster-discovery">Topology Connectors for Cross-Cluster Discovery</a></h3> 
---
> <h3><a href="#topology-connectors-for-cross-cluster-discovery" name="topology-connectors-for-cross-cluster-discovery">Topology Connectors for Cross-Cluster Discovery</a></h3>
240c240
< <h3><a href="#webconsole" id="webconsole">WebConsole</a></h3> 
---
> <h3><a href="#webconsole" name="webconsole">WebConsole</a></h3>
242c242
< <h3><a href="#configuration" id="configuration">Configuration</a></h3> 
---
> <h3><a href="#configuration" name="configuration">Configuration</a></h3>
245,254c245,264
<  <li> <p>heartbeatInterval: the time in seconds between two heartbeats (both cluster-internal and for HTTP-connectors). Default value is 15 seconds.</p> </li> 
<  <li> <p>heartbeatTimeout: the time in seconds after which an instance is considered dead if no heartbeat was sent since. Default value is 20 seconds.</p> </li> 
<  <li> <p>topologyConnectorUrls: a list of connector URLs to which this instance should connect to. The list can contain multiple instances of the same cluster (for fallback configurations). If the list is empty, no connector will be created. The default relative URL is /libs/sling/topology/connector. Note that this URL is accessible without authentication - to avoid having to configure administrative username/passwords in all instances. Instead, a whitelist approach is used (see next item).</p> </li> 
<  <li> <p>topologyConnectorWhitelist: As mentioned above, the path /libs/sling/topology/connector does not require authentication. To assure that only trusted instances can connect to the topology, its hostname or IP address must be in a whitelist. By default this whitelist only contains localhost and 127.0.0.1.</p> </li> 
<  <li> <p>minEventDelay: To reduce the number of events sent during changes, there is a delay (in seconds) before the event is sent. If additional changes happen during this delay, the change will be combined in one event.</p> </li> 
<  <li> <p>leaderElectionRepositoryDescriptor: this is an advanced parameter. It denotes a repository descriptor that is evaluated and taken into account for leader Election: the corresponding value of the descriptor is sorted by first.</p> </li> 
<  <li> <p>hmacEnabled: If this is true, and sharedKey is set to a value on all Sling instances within the same topology, then messages are validates using a signature of the content of the message based on the shared key. The signature and the digest of the content appear as http headers. When hmac message validation is enabled, whitelisting is disabled. This use useful where the topology messages are transported through multiple reverse proxy layers or the topology is dynamic. The Hmac algorithm in use is HmacSHA256. The JVM is expected to have a provider implementing this algorithm (The Standard JDKs do).</p> </li> 
<  <li> <p>sharedKey: If hmacEnabled is true, this must be set to a secret value, shared amongst all Sling instances that are members of the same topology.</p> </li> 
<  <li> <p>enableEncryption: If hmacEnabled is true, and sharedKey is set, setting this to true will encrypt the body of the message using 128 Bit AES encryption. The encryption key is derived from the sharedKey using a 9 byte random salt, giving 2^^72 potential salt values.</p> </li> 
<  <li> <p>hmacSharedKeyTTL: The key used for the signatures is derived from the shared key. Each derived key has a lifetime before the next key is generated. This parameter sets the lifetime of each key in ms. The default is 4h. Messages sent using old keys will remain valid for 2x the TTL, after which time the message will be ignored.</p> </li> 
---
>   <li>
>   <p>heartbeatInterval: the time in seconds between two heartbeats (both cluster-internal and for HTTP-connectors). Default  value is 15 seconds.</p></li>
>   <li>
>   <p>heartbeatTimeout: the time in seconds after which an instance is considered dead if no heartbeat was sent since. Default  value is 20 seconds.</p></li>
>   <li>
>   <p>topologyConnectorUrls: a list of connector URLs to which this instance should connect to. The list can contain multiple  instances of the same cluster (for fallback configurations). If the list is empty, no connector will be created.  The default relative URL is /libs/sling/topology/connector. Note that this URL is accessible without authentication -  to avoid having to configure administrative username/passwords in all instances. Instead, a whitelist approach is used  (see next item).</p></li>
>   <li>
>   <p>topologyConnectorWhitelist: As mentioned above, the path /libs/sling/topology/connector does not require authentication.  To assure that only trusted instances can connect to the topology, its hostname or IP address must be in a whitelist.  By default this whitelist only contains localhost and 127.0.0.1.</p></li>
>   <li>
>   <p>minEventDelay: To reduce the number of events sent during changes, there is a delay (in seconds) before the event is sent.  If additional changes happen during this delay, the change will be combined in one event.</p></li>
>   <li>
>   <p>leaderElectionRepositoryDescriptor: this is an advanced parameter. It denotes a repository descriptor that is evaluated  and taken into account for leader Election: the corresponding value of the descriptor is sorted by first.</p></li>
>   <li>
>   <p>hmacEnabled: If this is true, and sharedKey is set to a value on all Sling instances within the same topology, then messages are  validates using a signature of the content of the message based on the shared key. The signature and the digest of the content  appear as http headers. When hmac message validation is enabled, whitelisting is disabled. This use useful where the topology  messages are transported through multiple reverse proxy layers or the topology is dynamic. The Hmac algorithm in use is HmacSHA256.  The JVM is expected to have a provider implementing this algorithm (The Standard JDKs do).</p></li>
>   <li>
>   <p>sharedKey: If hmacEnabled is true, this must be set to a secret value, shared amongst all Sling instances that are members of the  same topology.</p></li>
>   <li>
>   <p>enableEncryption: If hmacEnabled is true, and sharedKey is set, setting this to true will encrypt the body of the message using 128 Bit AES encryption. The encryption key is derived from the sharedKey using a 9 byte random salt, giving 2^^72 potential salt values.</p></li>
>   <li>
>   <p>hmacSharedKeyTTL: The key used for the signatures is derived from the shared key. Each derived key has a lifetime before the next key is generated. This parameter sets the lifetime of each key in ms. The default is 4h. Messages sent using old keys will remain valid for 2x the TTL, after which time the message will be ignored.</p></li>
256c266
< <h2><a href="#discoveryoak-oak-based-ootb-implementation" id="discoveryoak-oak-based-ootb-implementation">discovery.oak: Oak-based, OOTB-implementation</a></h2> 
---
> <h2><a href="#discovery-oak-oak-based-ootb-implementation" name="discovery-oak-oak-based-ootb-implementation">discovery.oak: Oak-based, OOTB-implementation</a></h2>
259c269
< <h3><a href="#jackrabbit-oaks-discovery-lite" id="jackrabbit-oaks-discovery-lite">Jackrabbit Oak's discovery-lite</a></h3> 
---
> <h3><a href="#jackrabbit-oak-s-discovery-lite" name="jackrabbit-oak-s-discovery-lite">Jackrabbit Oak's discovery-lite</a></h3>
261c271
< <h4><a href="#oakdiscoveryliteclusterview" id="oakdiscoveryliteclusterview">'oak.discoverylite.clusterview'</a></h4> 
---
> <h4><a href="#oak-discoverylite-clusterview-" name="oak-discoverylite-clusterview-">'oak.discoverylite.clusterview'</a></h4>
272c282
< <h4><a href="#accessing-discovery-lite" id="accessing-discovery-lite">Accessing discovery-lite</a></h4> 
---
> <h4><a href="#accessing-discovery-lite" name="accessing-discovery-lite">Accessing discovery-lite</a></h4>
274c284
< <pre><code>getRepository().getDescriptor("oak.discoverylite.clusterview")
---
> <pre><code>getRepository().getDescriptor(&quot;oak.discoverylite.clusterview&quot;)
278c288
< <h3><a href="#slings-discoveryoak" id="slings-discoveryoak">Sling's discovery.oak</a></h3> 
---
> <h3><a href="#sling-s-discovery-oak" name="sling-s-discovery-oak">Sling's discovery.oak</a></h3>
283c293
< <h4><a href="#discoverycommons" id="discoverycommons">discovery.commons</a></h4> 
---
> <h4><a href="#discovery-commons" name="discovery-commons">discovery.commons</a></h4>
285c295
< <h4><a href="#discoverybase" id="discoverybase">discovery.base</a></h4> 
---
> <h4><a href="#discovery-base" name="discovery-base">discovery.base</a></h4>
diff -b -B -r ./documentation/bundles/distribution.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/distribution.html
94c94
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#overview" id="overview">Overview</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#overview" name="overview">Overview</a></h2>
101c101
< <h3><a href="#bundles" id="bundles">Bundles</a></h3> 
---
> <h3><a href="#bundles" name="bundles">Bundles</a></h3>
111c111
< <h2><a href="#design" id="design">Design</a></h2> 
---
> <h2><a href="#design" name="design">Design</a></h2>
123,124c123,124
< <p>In order to properly handle large number of <em>requests</em> against the same <em>agent</em> each of them is provided with <em>queues</em> where the exported <em>packages</em> are sent, the <em>agent</em> takes then care to process such a <em>queue</em> in order to <em>import</em> each <em>package</em>.</p> 
< <h3><a href="#distribution-agents-configuration" id="distribution-agents-configuration">Distribution agents configuration</a></h3> 
---
> <p>In order to properly handle large number of <em>requests</em> against the same <em>agent</em> each of them is provided with <em>queues</em> where the exported <em>packages</em> are sent, the <em>agent</em> takes then care to process such a <em>queue</em> in order to <em>import</em> each <em>package</em>. </p>
> <h3><a href="#distribution-agents-configuration" name="distribution-agents-configuration">Distribution agents configuration</a></h3>
141,143c141,143
<   "jcr:primaryType": "sling:OsgiConfig",
<   "provider.roots": [ "/libs/sling/distribution/settings/agents" ],
<   "kind" : "agent"
---
>   &quot;jcr:primaryType&quot;: &quot;sling:OsgiConfig&quot;,
>   &quot;provider.roots&quot;: [ &quot;/libs/sling/distribution/settings/agents&quot; ],
>   &quot;kind&quot; : &quot;agent&quot;
149c149
< <h3><a href="#distribution-agents-services" id="distribution-agents-services">Distribution agents services</a></h3> 
---
> <h3><a href="#distribution-agents-services" name="distribution-agents-services">Distribution agents services</a></h3>
153,155c153,155
<   "jcr:primaryType": "sling:OsgiConfig",
<   "provider.roots": [ "/libs/sling/distribution/services/agents" ],
<   "kind" : "agent"
---
>   &quot;jcr:primaryType&quot;: &quot;sling:OsgiConfig&quot;,
>   &quot;provider.roots&quot;: [ &quot;/libs/sling/distribution/services/agents&quot; ],
>   &quot;kind&quot; : &quot;agent&quot;
161,162c161,162
< <h3><a href="#distribution-queues" id="distribution-queues">Distribution queues</a></h3> 
< <h4><a href="#in-memory-queue" id="in-memory-queue">In Memory queue</a></h4> 
---
> <h3><a href="#distribution-queues" name="distribution-queues">Distribution queues</a></h3>
> <h4><a href="#in-memory-queue" name="in-memory-queue">In Memory queue</a></h4>
164c164
< <h4><a href="#sling-job-handling-based-queue" id="sling-job-handling-based-queue">Sling Job Handling based queue</a></h4> 
---
> <h4><a href="#sling-job-handling-based-queue" name="sling-job-handling-based-queue">Sling Job Handling based queue</a></h4>
172c172
< <h3><a href="#distribution-of-packages-among-queues" id="distribution-of-packages-among-queues">Distribution of packages among queues</a></h3> 
---
> <h3><a href="#distribution-of-packages-among-queues" name="distribution-of-packages-among-queues">Distribution of packages among queues</a></h3>
179,180c179,180
< <h2><a href="#usecases" id="usecases">Usecases</a></h2> 
< <h3><a href="#forward-distribution" id="forward-distribution">Forward distribution</a></h3> 
---
> <h2><a href="#usecases" name="usecases">Usecases</a></h2>
> <h3><a href="#forward-distribution" name="forward-distribution">Forward distribution</a></h3>
187,188c187,188
< <h4><a href="#createupdate-content" id="createupdate-content">Create/update content</a></h4> 
< <pre><code>$ curl -v -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish -d 'action=ADD' -d 'path=/content/sample1'
---
> <h4><a href="#create-update-content" name="create-update-content">Create/update content</a></h4>
> <pre><code>$ curl -v -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish -d &#39;action=ADD&#39; -d &#39;path=/content/sample1&#39;
190,191c190,191
< <h4><a href="#delete-content" id="delete-content">Delete content</a></h4> 
< <pre><code>$ curl -v -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish -d 'action= DELETE' -d 'path=/content/sample1'
---
> <h4><a href="#delete-content" name="delete-content">Delete content</a></h4>
> <pre><code>$ curl -v -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish -d &#39;action= DELETE&#39; -d &#39;path=/content/sample1&#39;
193c193
< <h3><a href="#reverse-distribution" id="reverse-distribution">Reverse distribution</a></h3> 
---
> <h3><a href="#reverse-distribution" name="reverse-distribution">Reverse distribution</a></h3>
196,198c196,198
< <h4><a href="#createupdate-content" id="createupdate-content">Create/update content</a></h4> 
< <pre><code>$ curl -u admin:admin http://localhost:8081/libs/sling/distribution/services/agents/reverse -d 'action=ADD' -d 'path=/content/sample1'
< $ curl -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish-reverse -d 'action=PULL'
---
> <h4><a href="#create-update-content" name="create-update-content">Create/update content</a></h4>
> <pre><code>$ curl -u admin:admin http://localhost:8081/libs/sling/distribution/services/agents/reverse -d &#39;action=ADD&#39; -d &#39;path=/content/sample1&#39;
> $ curl -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish-reverse -d &#39;action=PULL&#39;
200c200
< <h3><a href="#sync-distribution" id="sync-distribution">Sync distribution</a></h3> 
---
> <h3><a href="#sync-distribution" name="sync-distribution">Sync distribution</a></h3>
203,205c203,205
< <h4><a href="#createupdate-content" id="createupdate-content">Create/update content</a></h4> 
< <pre><code>$ curl -u admin:admin http://localhost:8081/libs/sling/distribution/services/agents/reverse-pubsync -d 'action=ADD' -d 'path=/content/sample1'
< $ curl -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/pubsync -d 'action=PULL'
---
> <h4><a href="#create-update-content" name="create-update-content">Create/update content</a></h4>
> <pre><code>$ curl -u admin:admin http://localhost:8081/libs/sling/distribution/services/agents/reverse-pubsync -d &#39;action=ADD&#39; -d &#39;path=/content/sample1&#39;
> $ curl -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/pubsync -d &#39;action=PULL&#39;
207c207
< <h3><a href="#installation" id="installation">Installation</a></h3> 
---
> <h3><a href="#installation" name="installation">Installation</a></h3>
212,213c212,213
< <h2><a href="#http-api" id="http-api">HTTP API</a></h2> 
< <h3><a href="#api-requirements" id="api-requirements">API Requirements</a></h3> 
---
> <h2><a href="#http-api" name="http-api">HTTP API</a></h2>
> <h3><a href="#api-requirements" name="api-requirements">API Requirements</a></h3>
226,227c226,227
< <h3><a href="#api-endpoints" id="api-endpoints">&nbsp;API endpoints</a></h3> 
< <h4><a href="#configuration-api" id="configuration-api">Configuration API</a></h4> 
---
> <h3><a href="#api-endpoints" name="api-endpoints"> API endpoints</a></h3>
> <h4><a href="#configuration-api" name="configuration-api">Configuration API</a></h4>
234c234
< <h4><a href="#command-api" id="command-api">Command API</a></h4> 
---
> <h4><a href="#command-api" name="command-api">Command API</a></h4>
240c240
< <h4><a href="#monitoring-api" id="monitoring-api">Monitoring API</a></h4> 
---
> <h4><a href="#monitoring-api" name="monitoring-api">Monitoring API</a></h4>
245c245
< <h2><a href="#java-api" id="java-api">Java API</a></h2> 
---
> <h2><a href="#java-api" name="java-api">Java API</a></h2>
249c249
< <h2><a href="#extensions" id="extensions">Extensions</a></h2> 
---
> <h2><a href="#extensions" name="extensions">Extensions</a></h2>
251c251
< <h3><a href="#apache-avro-serializer" id="apache-avro-serializer">Apache Avro serializer</a></h3> 
---
> <h3><a href="#apache-avro-serializer" name="apache-avro-serializer">Apache Avro serializer</a></h3>
253c253
< <h3><a href="#kryo-serializer" id="kryo-serializer">Kryo serializer</a></h3> 
---
> <h3><a href="#kryo-serializer" name="kryo-serializer">Kryo serializer</a></h3>
255c255
< <h2><a href="#ideas-for-future-developments" id="ideas-for-future-developments">Ideas for future developments</a></h2> 
---
> <h2><a href="#ideas-for-future-developments" name="ideas-for-future-developments">Ideas for future developments</a></h2>
diff -b -B -r ./documentation/bundles/dynamic-includes.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/dynamic-includes.html
95c95
< <h1><a href="#sling-dynamic-include-orgapacheslingdynamic-include" id="sling-dynamic-include-orgapacheslingdynamic-include">Sling Dynamic Include (org.apache.sling.dynamic-include)</a></h1> 
---
> <h1><a href="#sling-dynamic-include-org-apache-sling-dynamic-include-" name="sling-dynamic-include-org-apache-sling-dynamic-include-">Sling Dynamic Include (org.apache.sling.dynamic-include)</a></h1>
diff -b -B -r ./documentation/bundles/file-installer-provider.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/file-installer-provider.html
95c95
< <h2><a href="#setup" id="setup">Setup</a></h2> 
---
> <h2><a href="#setup" name="setup">Setup</a></h2>
123c123
< <h2><a href="#bundles" id="bundles">Bundles</a></h2> 
---
> <h2><a href="#bundles" name="bundles">Bundles</a></h2>
126c126
< <h2><a href="#configurations" id="configurations">Configurations</a></h2> 
---
> <h2><a href="#configurations" name="configurations">Configurations</a></h2>
128c128
< <h2><a href="#custom-artifacts" id="custom-artifacts">Custom Artifacts</a></h2> 
---
> <h2><a href="#custom-artifacts" name="custom-artifacts">Custom Artifacts</a></h2>
130,131c130,131
< <h2><a href="#runmode-support" id="runmode-support">Runmode Support</a></h2> 
< <p>The file installer supports run modes for installing artifacts (added with <a href="https://issues.apache.org/jira/browse/SLING-4478">SLING-4478</a>). Within the scanned directory, a folder prefixed with "install." and followed by one or more run modes (separated by ".") will only be considered if all the respective run modes are active. For example artifacts below a folder named <code>install.a1.dev</code> are only taken into account if the run modes <code>a1</code> and <code>dev</code> are both active.</p> 
---
> <h2><a href="#runmode-support" name="runmode-support">Runmode Support</a></h2>
> <p>The file installer supports run modes for installing artifacts (added with <a href="https://issues.apache.org/jira/browse/SLING-4478">SLING-4478</a>). Within the scanned directory, a folder prefixed with "install." and followed by one or more run modes (separated by ".") will only be considered if all the respective run modes are active. For example artifacts below a folder named <code>install.a1.dev</code> are only taken into account if the run modes <code>a1</code> and <code>dev</code> are both active. </p>
133c133
< <h1><a href="#project-info" id="project-info">Project Info</a></h1> 
---
> <h1><a href="#project-info" name="project-info">Project Info</a></h1>
diff -b -B -r ./documentation/bundles/hapi.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/hapi.html
94,95c94,95
< <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#hapi-hypermedia-api-tools" id="hapi-hypermedia-api-tools"></a><a name="section-1">HApi - Hypermedia API tools</a></h1> 
< <p>The hypermedia API tools are a way to enable sling component developers to add metadata information to their HTML components and easily define an API using the html markup generated by the components.</p> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a name="section-1">HApi - Hypermedia API tools</a></h1>
> <p>The hypermedia API tools are a way to enable sling component developers to add metadata information to their HTML components and easily define an API using the html markup generated by the components. </p>
98c98
< <h2><a href="#installation" id="installation"></a><a name="section-install">Installation</a></h2> 
---
> <h2><a name="section-install">Installation</a></h2>
103c103
< <h2><a href="#hypermedia-api-with-microdata" id="hypermedia-api-with-microdata"></a><a name="section-2">Hypermedia API with Microdata</a></h2> 
---
> <h2><a name="section-2">Hypermedia API with Microdata</a></h2>
106,109c106,109
< <pre><code>&lt;div itemscope itemtype="http://schema.org/Movie"&gt;
<    &lt;h1 itemprop="name"&gt;Avatar&lt;/h1&gt;
<    &lt;span itemprop="genre"&gt;Science fiction&lt;/span&gt;
<    &lt;a href="../movies/avatar-theatrical-trailer.html" itemprop="trailer"&gt;Trailer&lt;/a&gt;
---
> <pre><code>&lt;div itemscope itemtype=&quot;http://schema.org/Movie&quot;&gt;
>    &lt;h1 itemprop=&quot;name&quot;&gt;Avatar&lt;/h1&gt;
>    &lt;span itemprop=&quot;genre&quot;&gt;Science fiction&lt;/span&gt;
>    &lt;a href=&quot;../movies/avatar-theatrical-trailer.html&quot; itemprop=&quot;trailer&quot;&gt;Trailer&lt;/a&gt;
111,112c111,112
<    &lt;div itemprop="director" itemscope itemtype="http://schema.org/Person"&gt; 
<        Director: &lt;span itemprop="name"&gt;James Cameron&lt;/span&gt; (born &lt;span itemprop="birthDate"&gt;August16, 1954)&lt;/span&gt;
---
>    &lt;div itemprop=&quot;director&quot; itemscope itemtype=&quot;http://schema.org/Person&quot;&gt; 
>        Director: &lt;span itemprop=&quot;name&quot;&gt;James Cameron&lt;/span&gt; (born &lt;span itemprop=&quot;birthDate&quot;&gt;August16, 1954)&lt;/span&gt;
116c116
< <p>The attribute <em>itemscope</em> defines a scope for an object. The (optional) <em>itemtype</em> links to a description of the type of the object. Inside an element with an <em>itemscope</em> attribute, we have descendant elements with a property <em>itemprop</em>. This means the <em>name</em> property will point to the enclosed object, which is the simple text "Avatar". Similarly, the <em>genre</em> property is "Science Fiction".</p> 
---
> <p>The attribute <em>itemscope</em> defines a scope for an object. The (optional) <em>itemtype</em> links to a description of the type of the object. Inside an element with an <em>itemscope</em> attribute, we have descendant elements with a property <em>itemprop</em>. This means the <em>name</em> property will point to the enclosed object, which is the simple text "Avatar". Similarly, the <em>genre</em> property is "Science Fiction". </p>
118c118
< <h2><a href="#how-hapi-works-by-example" id="how-hapi-works-by-example"></a><a name="section-3">How HApi works, by example</a></h2> 
---
> <h2><a name="section-3">How HApi works, by example</a></h2>
120,121c120,121
< <h3><a href="#consuming-the-api" id="consuming-the-api"></a><a name="section-3a">Consuming the API</a></h3> 
< <p>The app looks like this in the browser: <img src="http://sling.apache.org/hapi/browser1.png" alt="Page in the browser"></p> 
---
> <h3><a name="section-3a">Consuming the API</a></h3>
> <p>The app looks like this in the browser: <img src="hapi/browser1.png" alt="Page in the browser" /></p>
123,125c123,125
< <pre><code>&lt;div itemtype="/apps/sling/hapi_sample/types/album_card.html" itemscope="itemscope" class="card-asset"&gt;
<     &lt;a href="details.html" rel="self"&gt;
<         &lt;img itemprop="thumbnail" itemtype="/libs/sling/hapi/types/image.html" alt="" src="assets/preview-small-album.png" class="show-grid"&gt;
---
> <pre><code>&lt;div itemtype=&quot;/apps/sling/hapi_sample/types/album_card.html&quot; itemscope=&quot;itemscope&quot; class=&quot;card-asset&quot;&gt;
>     &lt;a href=&quot;details.html&quot; rel=&quot;self&quot;&gt;
>         &lt;img itemprop=&quot;thumbnail&quot; itemtype=&quot;/libs/sling/hapi/types/image.html&quot; alt=&quot;&quot; src=&quot;assets/preview-small-album.png&quot; class=&quot;show-grid&quot;&gt;
128c128
<             &lt;h4 itemprop="title" itemtype="/libs/sling/hapi/types/text.html"&gt;PIC 001&lt;/h4&gt;
---
>             &lt;h4 itemprop=&quot;title&quot; itemtype=&quot;/libs/sling/hapi/types/text.html&quot;&gt;PIC 001&lt;/h4&gt;
130c130
<             &lt;p class="type"&gt;album&lt;/p&gt;
---
>             &lt;p class=&quot;type&quot;&gt;album&lt;/p&gt;
132,135c132,135
<             &lt;p itemprop="cards" itemtype="/libs/sling/hapi/types/number.html" class="size"&gt;5&lt;/p&gt;
<             &lt;meta itemprop="disabled" itemtype="/libs/sling/hapi/types/boolean.html" content="false"&gt;
<             &lt;div class="myinfo"&gt;
<                 &lt;p class="mymodified"&gt;
---
>             &lt;p itemprop=&quot;cards&quot; itemtype=&quot;/libs/sling/hapi/types/number.html&quot; class=&quot;size&quot;&gt;5&lt;/p&gt;
>             &lt;meta itemprop=&quot;disabled&quot; itemtype=&quot;/libs/sling/hapi/types/boolean.html&quot; content=&quot;false&quot;&gt;
>             &lt;div class=&quot;myinfo&quot;&gt;
>                 &lt;p class=&quot;mymodified&quot;&gt;
137c137
<                     &lt;span itemprop="modified" itemtype="/libs/sling/hapi/types/text.html" class="date"&gt;2 days ago&lt;/span&gt;
---
>                     &lt;span itemprop=&quot;modified&quot; itemtype=&quot;/libs/sling/hapi/types/text.html&quot; class=&quot;date&quot;&gt;2 days ago&lt;/span&gt;
147,148c147,148
<  <li><code>&lt;div itemtype="/apps/sling/hapi_sample/types/album_card.html" itemscope="itemscope" class="card-asset"&gt;</code></li> 
<  <li><code>&lt;a href="details.html" rel="self"&gt;</code></li> 
---
>   <li><code>&lt;div itemtype=&quot;/apps/sling/hapi_sample/types/album_card.html&quot; itemscope=&quot;itemscope&quot; class=&quot;card-asset&quot;&gt;</code></li>
>   <li><code>&lt;a href=&quot;details.html&quot; rel=&quot;self&quot;&gt;</code></li>
153c153
< <p><img src="http://sling.apache.org/hapi/python1.png" alt="Enter example"></p> 
---
> <p><img src="hapi/python1.png" alt="Enter example" /></p>
155c155
< <p><img src="http://sling.apache.org/hapi/browser2.png" alt="Type in browser"></p> 
---
> <p><img src="hapi/browser2.png" alt="Type in browser" /></p>
157c157
< <p><img src="http://sling.apache.org/hapi/python2.png" alt="Properties example"> <img src="http://sling.apache.org/hapi/python3.png" alt="Properties example"></p> 
---
> <p><img src="hapi/python2.png" alt="Properties example" /> <img src="hapi/python3.png" alt="Properties example" /></p>
159c159
< <p><img src="http://sling.apache.org/hapi/python4.png" alt="Links example"></p> 
---
> <p><img src="hapi/python4.png" alt="Links example" /></p>
162c162
< <h3><a href="#defining-the-types" id="defining-the-types">Defining the types</a></h3> 
---
> <h3><a href="#defining-the-types" name="defining-the-types">Defining the types</a></h3>
166,173c166,173
<     "fqdn": "org.apache.sling.hapi_sample.album_card",
<     "description": "A demo card type for HApi",
<     "name": "album_card",
<     "sling:resourceType": "sling/hapi/components/type",
<     "parameters": [ ],
<     "extends": "/apps/sling/hapi_sample/types/demo_card",
<     "jcr:primaryType": "nt:unstructured",
<     "thumbnail": 
---
>     &quot;fqdn&quot;: &quot;org.apache.sling.hapi_sample.album_card&quot;,
>     &quot;description&quot;: &quot;A demo card type for HApi&quot;,
>     &quot;name&quot;: &quot;album_card&quot;,
>     &quot;sling:resourceType&quot;: &quot;sling/hapi/components/type&quot;,
>     &quot;parameters&quot;: [ ],
>     &quot;extends&quot;: &quot;/apps/sling/hapi_sample/types/demo_card&quot;,
>     &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;,
>     &quot;thumbnail&quot;: 
177,180c177,180
<     "description": "The thumbnail of the demo pic card",
<     "type": "org.apache.sling.hapi.common.Image",
<     "multiple": true,
<     "jcr:primaryType": "nt:unstructured"
---
>     &quot;description&quot;: &quot;The thumbnail of the demo pic card&quot;,
>     &quot;type&quot;: &quot;org.apache.sling.hapi.common.Image&quot;,
>     &quot;multiple&quot;: true,
>     &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;
183c183
< "disabled":
---
> &quot;disabled&quot;:
186,189c186,189
<     "description": "Whether this album is disabled or not",
<     "type": "org.apache.sling.hapi.common.Boolean",
<     "multiple": false,
<     "jcr:primaryType": "nt:unstructured"
---
>     &quot;description&quot;: &quot;Whether this album is disabled or not&quot;,
>     &quot;type&quot;: &quot;org.apache.sling.hapi.common.Boolean&quot;,
>     &quot;multiple&quot;: false,
>     &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;
192c192
< "modified":
---
> &quot;modified&quot;:
195,198c195,198
<     "description": "When was the pic last modified",
<     "type": "org.apache.sling.hapi.common.Text",
<     "multiple": false,
<     "jcr:primaryType": "nt:unstructured"
---
>     &quot;description&quot;: &quot;When was the pic last modified&quot;,
>     &quot;type&quot;: &quot;org.apache.sling.hapi.common.Text&quot;,
>     &quot;multiple&quot;: false,
>     &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;
201c201
< "cards":
---
> &quot;cards&quot;:
204,207c204,207
<     "description": "The number of pictures in this album",
<     "type": "org.apache.sling.hapi.common.Number",
<     "multiple": false,
<     "jcr:primaryType": "nt:unstructured"
---
>     &quot;description&quot;: &quot;The number of pictures in this album&quot;,
>     &quot;type&quot;: &quot;org.apache.sling.hapi.common.Number&quot;,
>     &quot;multiple&quot;: false,
>     &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;
210c210
< "users":
---
> &quot;users&quot;:
213,216c213,216
<         "description": "The numbers of users for this album",
<         "type": "org.apache.sling.hapi.common.Number",
<         "multiple": false,
<         "jcr:primaryType": "nt:unstructured"
---
>         &quot;description&quot;: &quot;The numbers of users for this album&quot;,
>         &quot;type&quot;: &quot;org.apache.sling.hapi.common.Number&quot;,
>         &quot;multiple&quot;: false,
>         &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;
221,222c221,222
< <h3><a href="#using-the-sightly-hapiuse-class" id="using-the-sightly-hapiuse-class">Using the sightly HApiUse class</a></h3> 
< <p>After defining the types needed for the component in question, you can immediately benefit from the HApi tools and add the microdata annotations. There is also validation for the properties and the itemtype for properties is added automatically by the tools.</p> 
---
> <h3><a href="#using-the-sightly-hapiuse-class" name="using-the-sightly-hapiuse-class">Using the sightly HApiUse class</a></h3>
> <p>After defining the types needed for the component in question, you can immediately benefit from the HApi tools and add the microdata annotations. There is also validation for the properties and the itemtype for properties is added automatically by the tools. </p>
224,227c224,227
< <pre><code>&lt;div data-sly-use.card="${'org.apache.sling.hapi.sightly.HApiUse' @type='/apps/sling/hapi_sample/types/pic_card'}"
<              data-sly-attribute="${card.itemtype}" class="card-asset"&gt;
<             &lt;a rel="self" href="details.html"&gt;
<                 &lt;img data-sly-attribute="${card.itemprop.thumbnail}" class="show-grid" src="assets/preview-small.png" alt=""&gt;
---
> <pre><code>&lt;div data-sly-use.card=&quot;${&#39;org.apache.sling.hapi.sightly.HApiUse&#39; @type=&#39;/apps/sling/hapi_sample/types/pic_card&#39;}&quot;
>              data-sly-attribute=&quot;${card.itemtype}&quot; class=&quot;card-asset&quot;&gt;
>             &lt;a rel=&quot;self&quot; href=&quot;details.html&quot;&gt;
>                 &lt;img data-sly-attribute=&quot;${card.itemprop.thumbnail}&quot; class=&quot;show-grid&quot; src=&quot;assets/preview-small.png&quot; alt=&quot;&quot;&gt;
230c230
<                     &lt;h4 data-sly-attribute="${card.itemprop['title']}"&gt;PIC 001&lt;/h4&gt;
---
>                     &lt;h4 data-sly-attribute=&quot;${card.itemprop[&#39;title&#39;]}&quot;&gt;PIC 001&lt;/h4&gt;
232c232
<                     &lt;p class="type"&gt;PSD&lt;/p&gt;
---
>                     &lt;p class=&quot;type&quot;&gt;PSD&lt;/p&gt;
234,237c234,237
<                     &lt;p data-sly-attribute="${card.itemprop.resolution}"
<                        data-sly-use.resolution="${'org.apache.sling.hapi.sightly.HApiUse' @type=card.proptype.resolution}" class="resolution"&gt;
<                         &lt;span data-sly-attribute="${resolution.itemprop.width}"&gt;1620&lt;/span&gt; x &lt;span
<                             data-sly-attribute="${resolution.itemprop.height}"&gt;670&lt;/span&gt;
---
>                     &lt;p data-sly-attribute=&quot;${card.itemprop.resolution}&quot;
>                        data-sly-use.resolution=&quot;${&#39;org.apache.sling.hapi.sightly.HApiUse&#39; @type=card.proptype.resolution}&quot; class=&quot;resolution&quot;&gt;
>                         &lt;span data-sly-attribute=&quot;${resolution.itemprop.width}&quot;&gt;1620&lt;/span&gt; x &lt;span
>                             data-sly-attribute=&quot;${resolution.itemprop.height}&quot;&gt;670&lt;/span&gt;
240,243c240,243
<                     &lt;p data-sly-attribute="${card.itemprop.size}" class="size"&gt;249KB&lt;/p&gt;
<                     &lt;meta data-sly-attribute="${card.itemprop.disabled}" content="false"/&gt;
<                     &lt;div class="myinfo"&gt;
<                         &lt;p class="mymodified"&gt;
---
>                     &lt;p data-sly-attribute=&quot;${card.itemprop.size}&quot; class=&quot;size&quot;&gt;249KB&lt;/p&gt;
>                     &lt;meta data-sly-attribute=&quot;${card.itemprop.disabled}&quot; content=&quot;false&quot;/&gt;
>                     &lt;div class=&quot;myinfo&quot;&gt;
>                         &lt;p class=&quot;mymodified&quot;&gt;
245c245
<                             &lt;span data-sly-attribute="${card.itemprop.modified}" class="date"&gt;2 days ago&lt;/span&gt;
---
>                             &lt;span data-sly-attribute=&quot;${card.itemprop.modified}&quot; class=&quot;date&quot;&gt;2 days ago&lt;/span&gt;
254c254
< <pre><code>&lt;img data-sly-attribute="${card.itemprop.inexistent_property}" class="show-grid" src="assets/preview-small.png" alt=""&gt;&lt;/span&gt;           
---
> <pre><code>&lt;img data-sly-attribute=&quot;${card.itemprop.inexistent_property}&quot; class=&quot;show-grid&quot; src=&quot;assets/preview-small.png&quot; alt=&quot;&quot;&gt;&lt;/span&gt;           
diff -b -B -r ./documentation/bundles/internationalization-support-i18n.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/internationalization-support-i18n.html
102c102
< <h2><a href="#default-implementation-in-the-orgapacheslingengine-bundle" id="default-implementation-in-the-orgapacheslingengine-bundle">Default Implementation in the <code>org.apache.sling.engine</code> Bundle</a></h2> 
---
> <h2>Default Implementation in the <code>org.apache.sling.engine</code> Bundle</h2>
111c111
< <h2><a href="#extensible-implementation-in-the-orgapacheslingi18n-bundle" id="extensible-implementation-in-the-orgapacheslingi18n-bundle">Extensible Implementation in the <code>org.apache.sling.i18n</code> Bundle</a></h2> 
---
> <h2>Extensible Implementation in the <code>org.apache.sling.i18n</code> Bundle</h2>
114,115c114,117
<  <li> <p><code>LocaleResolver</code> -- The <code>LocaleResolver</code> interface defines a method which may be implemented by a service outside of the sling.i18n bundle. If no such service is registered the default behaviour is as described above for the sling.core bundle. The service described by this interface is used to implement the <code>getLocale()</code> and <code>getLocales()</code> method.</p> </li> 
<  <li> <p><code>ResourceBundleProvider</code> -- The <code>ResourceBundleProvider</code> interface defines two methods to acquire a <code>ResourceBundle</code> for any <code>Locale</code> and an optional base name. This service interface is not intended to be implemented outside of the sling.i18n bundle: A JCR Repository based implementation is contained in the sling.i18n bundle. The <code>ResourceBundleProvider</code> service is not only used within the sling.i18n bundle to implement the <code>SlingHttpServletRequest.getResourceBundle(Locale)</code> and <code>SlingHttpServletRequest.getResourceBundle(String, Locale)</code> methods. The service may also be used by Sling applications to acquire <code>ResourceBundle</code> instances without having a request object by getting the service and calling its <code>getResourceBundle(Locale)</code> or <code>getResourceBundle(String, Locale)</code> method directly.</p> </li> 
---
>   <li>
>   <p><code>LocaleResolver</code> -- The <code>LocaleResolver</code> interface defines a method which may be implemented by a service outside of the sling.i18n bundle. If no such service is registered the default behaviour is as described above for the sling.core bundle. The service described by this interface is used to implement the <code>getLocale()</code> and <code>getLocales()</code> method.</p></li>
>   <li>
>   <p><code>ResourceBundleProvider</code> -- The <code>ResourceBundleProvider</code> interface defines two methods to acquire a <code>ResourceBundle</code> for any <code>Locale</code> and an optional base name. This service interface is not intended to be implemented outside of the sling.i18n bundle: A JCR Repository based implementation is contained in the sling.i18n bundle. The <code>ResourceBundleProvider</code> service is not only used within the sling.i18n bundle to implement the <code>SlingHttpServletRequest.getResourceBundle(Locale)</code> and <code>SlingHttpServletRequest.getResourceBundle(String, Locale)</code> methods. The service may also be used by Sling applications to acquire <code>ResourceBundle</code> instances without having a request object by getting the service and calling its <code>getResourceBundle(Locale)</code> or <code>getResourceBundle(String, Locale)</code> method directly.</p></li>
117c119
< <h3><a href="#jcr-repository-based-resourcebundleprovider" id="jcr-repository-based-resourcebundleprovider">JCR Repository based <code>ResourceBundleProvider</code></a></h3> 
---
> <h3>JCR Repository based <code>ResourceBundleProvider</code></h3>
121c123
< <h4><a href="#slingmessageentry-based" id="slingmessageentry-based"><code>sling:MessageEntry</code> based</a></h4> 
---
> <h4><code>sling:MessageEntry</code> based</h4>
128c130
< <h5><a href="#sample-resources" id="sample-resources">Sample Resources</a></h5> 
---
> <h5><a href="#sample-resources" name="sample-resources">Sample Resources</a></h5>
134,135c136,137
<            |    |    +-- sling:key = "msg001"
<            |    |    +-- sling:message = "This is a message"
---
>            |    |    +-- sling:key = &quot;msg001&quot;
>            |    |    +-- sling:message = &quot;This is a message&quot;
137,138c139,140
<            |         +-- sling:key = "msg002"
<            |         +-- sling:message = "Another message"
---
>            |         +-- sling:key = &quot;msg002&quot;
>            |         +-- sling:message = &quot;Another message&quot;
142,143c144,145
<                 |    +-- sling:key = "msg001"
<                 |    +-- sling:message = "Das ist ein Text"
---
>                 |    +-- sling:key = &quot;msg001&quot;
>                 |    +-- sling:message = &quot;Das ist ein Text&quot;
145,146c147,148
<                      +-- sling:key = "msg002"
<                      +-- sling:message = "Ein anderer Text"
---
>                      +-- sling:key = &quot;msg002&quot;
>                      +-- sling:message = &quot;Ein anderer Text&quot;
152,153c154,155
<            |         +-- sling:key = "msgXXX"
<            |         +-- sling:message = "An Application Text"
---
>            |         +-- sling:key = &quot;msgXXX&quot;
>            |         +-- sling:message = &quot;An Application Text&quot;
157,158c159,160
<                      +-- sling:key = "msgXXX"
<                      +-- sling:message = "Ein Anwendungstext"
---
>                      +-- sling:key = &quot;msgXXX&quot;
>                      +-- sling:message = &quot;Ein Anwendungstext&quot;
161c163
< <h4><a href="#json-file-based" id="json-file-based">JSON-file based</a></h4> 
---
> <h4><a href="#json-file-based" name="json-file-based">JSON-file based</a></h4>
163c165
< <h5><a href="#sample-resources" id="sample-resources">Sample Resources</a></h5> 
---
> <h5><a href="#sample-resources" name="sample-resources">Sample Resources</a></h5>
175c177
< <h4><a href="#jcr-node-types-supporting-the-jcr-repository-based-resourcebundleprovider" id="jcr-node-types-supporting-the-jcr-repository-based-resourcebundleprovider">JCR Node Types supporting the JCR Repository based <code>ResourceBundleProvider</code></a></h4> 
---
> <h4>JCR Node Types supporting the JCR Repository based <code>ResourceBundleProvider</code></h4>
190c192
< <h3><a href="#resourcebundle-with-base-names" id="resourcebundle-with-base-names"><code>ResourceBundle</code> with base names</a></h3> 
---
> <h3><code>ResourceBundle</code> with base names</h3>
196,197c198,199
<    <th> Value </th>
<    <th> <code>ResourceBundle</code> selection </th>
---
>       <th>Value </th>
>       <th><code>ResourceBundle</code> selection </th>
202,203c204,205
<    <td> <code>null</code> </td>
<    <td> Selects messages of <code>mix:language</code> nodes ignoring the existence or absence of <code>sling:basename</code> properties </td>
---
>       <td><code>null</code> </td>
>       <td>Selects messages of <code>mix:language</code> nodes ignoring the existence or absence of <code>sling:basename</code> properties </td>
206,207c208,209
<    <td> Empty String </td>
<    <td> Selects messages of <code>mix:language</code> nodes which have <code>sling:basename</code> properties, ignoring the actual values </td>
---
>       <td>Empty String </td>
>       <td>Selects messages of <code>mix:language</code> nodes which have <code>sling:basename</code> properties, ignoring the actual values </td>
210,211c212,213
<    <td> Any other Value </td>
<    <td> Selects messages of <code>mix:language</code> nodes whose <code>sling:basename</code> properties has any value which matches the base name string </td>
---
>       <td>Any other Value </td>
>       <td>Selects messages of <code>mix:language</code> nodes whose <code>sling:basename</code> properties has any value which matches the base name string </td>
216c218
< <h3><a href="#resourcebundle-hierarchies" id="resourcebundle-hierarchies"><code>ResourceBundle</code> hierarchies</a></h3> 
---
> <h3><code>ResourceBundle</code> hierarchies</h3>
diff -b -B -r ./documentation/bundles/jcr-installer-provider.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/jcr-installer-provider.html
95c95
< <h2><a href="#configuration-and-scanning" id="configuration-and-scanning">Configuration and Scanning</a></h2> 
---
> <h2><a href="#configuration-and-scanning" name="configuration-and-scanning">Configuration and Scanning</a></h2>
97c97
< <p>If such an install folder contains a binary artifact (e.g. a bundle or a config file as described in <a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a>) this is provided to the OSGi installer.</p> 
---
> <p>If such an install folder contains a binary artifact (e.g. a bundle or a config file as described in <a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a>) this is provided to the OSGi installer. </p>
100c100
< <h3><a href="#runmode-support" id="runmode-support">Runmode Support</a></h3> 
---
> <h3><a href="#runmode-support" name="runmode-support">Runmode Support</a></h3>
103,104c103,104
< <h2><a href="#write-back-support" id="write-back-support">Write Back Support</a></h2> 
< <p>The JCR installer supports writing back of configurations which are changed by some other ways, e.g by using the Apache Felix web console. If this is a new configuration which was not originally stored in the repository, a new configuration is stored under <em>/apps/sling/install</em>. The highest search path is used together with a configurable folder (<em>sling/install</em> in this case). If a configuration is changed which already exists in the repository, then it depends where the original configuration is stored. If its under <em>/libs</em> a new configuration at the same path under <em>/apps</em> is created. Otherwise the configuration is directly modified. As JCR properties do not support all Java primitive types like Integer, the write back does not generate a node of type <em>sling:OsgiConfig</em> in the repository but a properties file as described in <a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a>.</p> 
---
> <h2><a href="#write-back-support" name="write-back-support">Write Back Support</a></h2>
> <p>The JCR installer supports writing back of configurations which are changed by some other ways, e.g by using the Apache Felix web console. If this is a new configuration which was not originally stored in the repository, a new configuration is stored under <em>/apps/sling/install</em>. The highest search path is used together with a configurable folder (*sling/install* in this case). If a configuration is changed which already exists in the repository, then it depends where the original configuration is stored. If its under <em>/libs</em> a new configuration at the same path under <em>/apps</em> is created. Otherwise the configuration is directly modified. As JCR properties do not support all Java primitive types like Integer, the write back does not generate a node of type <em>sling:OsgiConfig</em> in the repository but a properties file as described in <a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a>.</p>
106,108c106,108
< <h3><a href="#start-level-support" id="start-level-support">Start Level Support</a></h3> 
< <p>If the parent folder of a bundle has a name which is a number, this is used as the start level (when installing the bundle for the first time, compare with <a href="https://issues.apache.org/jira/browse/SLING-2011">SLING-2011</a>). So e.g. a bundle in the path <code>/libs/sling/install/15/somebundle.jar</code> is having the start level <strong>15</strong>.</p> 
< <h1><a href="#example" id="example">Example</a></h1> 
---
> <h3><a href="#start-level-support" name="start-level-support">Start Level Support</a></h3>
> <p>If the parent folder of a bundle has a name which is a number, this is used as the start level (when installing the bundle for the first time, compare with <a href="https://issues.apache.org/jira/browse/SLING-2011">SLING-2011</a>). So e.g. a bundle in the path <code>/libs/sling/install/15/somebundle.jar</code> is having the start level <strong>15</strong>. </p>
> <h1><a href="#example" name="example">Example</a></h1>
110c110
< <h2><a href="#installation" id="installation">Installation</a></h2> 
---
> <h2><a href="#installation" name="installation">Installation</a></h2>
112,113c112,113
< <p>To watch the logs produced by these modules, you can filter <code>sling/logs/error.log</code> using <code>egrep 'jcrinstall|osgi.installer'</code>.</p> 
< <h2><a href="#install-and-remove-a-bundle" id="install-and-remove-a-bundle">Install and remove a bundle</a></h2> 
---
> <p>To watch the logs produced by these modules, you can filter <code>sling/logs/error.log</code> using <code>egrep &#39;jcrinstall|osgi.installer&#39;</code>.</p>
> <h2><a href="#install-and-remove-a-bundle" name="install-and-remove-a-bundle">Install and remove a bundle</a></h2>
130c130
< <h2><a href="#install-modify-and-remove-a-configuration" id="install-modify-and-remove-a-configuration">Install, modify and remove a configuration</a></h2> 
---
> <h2><a href="#install-modify-and-remove-a-configuration" name="install-modify-and-remove-a-configuration">Install, modify and remove a configuration</a></h2>
134c134
<   -F "jcr:primaryType=sling:OsgiConfig" \
---
>   -F &quot;jcr:primaryType=sling:OsgiConfig&quot; \
143,145c143,145
< <pre><code>{"foo":"bar",
< "jcr:created":"Wed Aug 26 2009 17:06:40GMT+0200",
< "jcr:primaryType":"sling:OsgiConfig","works":"yes"}
---
> <pre><code>{&quot;foo&quot;:&quot;bar&quot;,
> &quot;jcr:created&quot;:&quot;Wed Aug 26 2009 17:06:40GMT+0200&quot;,
> &quot;jcr:primaryType&quot;:&quot;sling:OsgiConfig&quot;,&quot;works&quot;:&quot;yes&quot;}
176c176
< <h1><a href="#automated-tests" id="automated-tests">Automated Tests</a></h1> 
---
> <h1><a href="#automated-tests" name="automated-tests">Automated Tests</a></h1>
183c183
< <h1><a href="#project-info" id="project-info">Project Info</a></h1> 
---
> <h1><a href="#project-info" name="project-info">Project Info</a></h1>
diff -b -B -r ./documentation/bundles/log-tracers.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/log-tracers.html
98,102c98,102
<  -d "./jcr:content/jcr:title=Summer Collection" \
<  -d ":name=summer-collection" \
<  -d "./jcr:primaryType=sling:Folder" \
<  -d "./jcr:content/jcr:primaryType=nt:unstructured" \
<  -d "tracers=oak-writes" \
---
>  -d &quot;./jcr:content/jcr:title=Summer Collection&quot; \
>  -d &quot;:name=summer-collection&quot; \
>  -d &quot;./jcr:primaryType=sling:Folder&quot; \
>  -d &quot;./jcr:content/jcr:primaryType=nt:unstructured&quot; \
>  -d &quot;tracers=oak-writes&quot; \
105,106c105,106
< <h2><a href="#configuration" id="configuration">Configuration</a></h2> 
< <p><img src="http://sling.apache.org/documentation/bundles/tracer-config.png" alt="Tracer Config"></p> 
---
> <h2><a href="#configuration" name="configuration">Configuration</a></h2>
> <p><img src="/documentation/bundles/tracer-config.png" alt="Tracer Config" /></p>
109c109
< <h3><a href="#tracer-sets" id="tracer-sets">Tracer Sets</a></h3> 
---
> <h3><a href="#tracer-sets" name="tracer-sets">Tracer Sets</a></h3>
118c118
< <pre><code>tracerConfig := loggerConfig ( ',' loggerConfig) *
---
> <pre><code>tracerConfig := loggerConfig ( &#39;,&#39; loggerConfig) *
120c120
< attributes := attributeName '=' attributeValue
---
> attributes := attributeName &#39;=&#39; attributeValue
125c125
<  <li><code>caller</code> - Used to dump stacktrace of caller. It can have following value (<em>since 1.0.0</em>, <a href="https://issues.apache.org/jira/browse/SLING-5505">SLING-5505</a>) 
---
>   <li><code>caller</code> - Used to dump stacktrace of caller. It can have following value (_since 1.0.0_, <a href="https://issues.apache.org/jira/browse/SLING-5505">SLING-5505</a>)
129c129,130
<   </ul> </li> 
---
>     </ul>
>   </li>
132c133
< <h3><a href="#performance-impact" id="performance-impact">Performance Impact</a></h3> 
---
> <h3><a href="#performance-impact" name="performance-impact">Performance Impact</a></h3>
135c136
< <h2><a href="#where-do-logs-go" id="where-do-logs-go">Where do logs go</a></h2> 
---
> <h2><a href="#where-do-logs-go" name="where-do-logs-go">Where do logs go</a></h2>
137c138
< <h3><a href="#requestprogresstracker" id="requestprogresstracker">RequestProgressTracker</a></h3> 
---
> <h3><a href="#requestprogresstracker" name="requestprogresstracker">RequestProgressTracker</a></h3>
140c141
< <p><img src="http://sling.apache.org/documentation/bundles/sling-main-servlet-config.png" alt="Sling Main Servlet Config"></p> 
---
> <p><img src="/documentation/bundles/sling-main-servlet-config.png" alt="Sling Main Servlet Config" /></p>
143c144
< <pre><code>132 (2015-05-11 17:39:55) LOG [JCR]  Query SELECT * FROM [granite:InboxItem] AS s where  status='ACTIVE' ORDER BY s.startTime DESC
---
> <pre><code>132 (2015-05-11 17:39:55) LOG [JCR]  Query SELECT * FROM [granite:InboxItem] AS s where  status=&#39;ACTIVE&#39; ORDER BY s.startTime DESC
149c150
< <h3><a href="#server-logs" id="server-logs">Server Logs</a></h3> 
---
> <h3><a href="#server-logs" name="server-logs">Server Logs</a></h3>
151c152
< <h2><a href="#usage" id="usage">Usage</a></h2> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
157c158
< <h3><a href="#request-parameters" id="request-parameters">Request Parameters</a></h3> 
---
> <h3><a href="#request-parameters" name="request-parameters">Request Parameters</a></h3>
161c162,164
<  <li><code>tracerConfig</code> - Tracer config like org.apache.sling.auth;level=trace` <p>curl -u admin:admin http://localhost:4802/projects.html?tracerConfig=org.apache.sling</p> </li> 
---
>   <li><code>tracerConfig</code> - Tracer config like org.apache.sling.auth;level=trace`
>     <p>curl -u admin:admin http://localhost:4802/projects.html?tracerConfig=org.apache.sling</p>
>   </li>
165,169c168,172
<  -d "./jcr:content/jcr:title=Summer Collection" \
<  -d ":name=summer-collection" \
<  -d "./jcr:primaryType=sling:Folder" \
<  -d "./jcr:content/jcr:primaryType=nt:unstructured" \
<  -d "tracers=oak-writes" \
---
>  -d &quot;./jcr:content/jcr:title=Summer Collection&quot; \
>  -d &quot;:name=summer-collection&quot; \
>  -d &quot;./jcr:primaryType=sling:Folder&quot; \
>  -d &quot;./jcr:content/jcr:primaryType=nt:unstructured&quot; \
>  -d &quot;tracers=oak-writes&quot; \
172c175
< <p>Above request would create a folder in Assets and for that we have enabled the <code>oak-writes</code> tracer. This would result in following output</p> 
---
> <p>Above request would create a folder in Assets and for that we have enabled the <code>oak-writes</code> tracer. This would result in following output </p>
182c185
< <h3><a href="#request-headers" id="request-headers">Request Headers</a></h3> 
---
> <h3><a href="#request-headers" name="request-headers">Request Headers</a></h3>
189,192c192,195
< <pre><code>curl -D - -d "j_username=admin" \
<     -d "j_password=admin" \
<     -d "j_validate=true"  \
<     -H "Sling-Tracer-Config : org.apache.sling.auth;level=trace,org.apache.jackrabbit.oak.security;level=trace" \
---
> <pre><code>curl -D - -d &quot;j_username=admin&quot; \
>     -d &quot;j_password=admin&quot; \
>     -d &quot;j_validate=true&quot;  \
>     -H &quot;Sling-Tracer-Config : org.apache.sling.auth;level=trace,org.apache.jackrabbit.oak.security;level=trace&quot; \
203c206
< <h2><a href="#tracer-recording" id="tracer-recording">Tracer Recording</a></h2> 
---
> <h2><a href="#tracer-recording" name="tracer-recording">Tracer Recording</a></h2>
208,214c211,219
<  <li> <p>Client sends an HTTP request with header <code>Sling-Tracer-Record</code>​ set to <code>true</code></p> <pre><code>curl -D - -u admin:admin \
<   -H "Sling-Tracer-Record : true" \
<  -d "./jcr:content/jcr:title=Summer Collection" \
<  -d ":name=summer-collection" \
<  -d "./jcr:primaryType=sling:Folder" \
<  -d "./jcr:content/jcr:primaryType=nt:unstructured" \
<  -d "tracers=oak-writes" \
---
>   <li>
>     <p>Client sends an HTTP request with header <code>Sling-Tracer-Record</code>​ set to <code>true</code></p>
>     <pre><code>curl -D - -u admin:admin \
>   -H &quot;Sling-Tracer-Record : true&quot; \
>  -d &quot;./jcr:content/jcr:title=Summer Collection&quot; \
>  -d &quot;:name=summer-collection&quot; \
>  -d &quot;./jcr:primaryType=sling:Folder&quot; \
>  -d &quot;./jcr:content/jcr:primaryType=nt:unstructured&quot; \
>  -d &quot;tracers=oak-writes&quot; \
216,217c221,225
< </code></pre> </li> 
<  <li> <p>Server includes a request id as part of <code>Sling-Tracer-Request-Id</code> response headers</p> <pre><code>HTTP/1.1 201 Created
---
> </code></pre>
>   </li>
>   <li>
>     <p>Server includes a request id as part of <code>Sling-Tracer-Request-Id</code> response headers </p>
>     <pre><code>HTTP/1.1 201 Created
225,227c233,238
< </code></pre> </li> 
<  <li> <p>The logs in json format can then be fetched from server at <code>/system/console/tracer</code> like http://localhost:8080/system/console/tracer/9b5b01f6-f269-47c3-a889-2dc8d4d7938f.json.</p> <pre><code>curl -s -D - -H "Sling-Tracer-Record : true" -H "Sling-Tracers : oak-query" \
< -H "Sling-Tracer-Config : org.apache.jackrabbit.oak.query" \
---
> </code></pre>
>   </li>
>   <li>
>     <p>The logs in json format can then be fetched from server at <code>/system/console/tracer</code> like  http://localhost:8080/system/console/tracer/9b5b01f6-f269-47c3-a889-2dc8d4d7938f.json. </p>
>     <pre><code>curl -s -D - -H &quot;Sling-Tracer-Record : true&quot; -H &quot;Sling-Tracers : oak-query&quot; \
> -H &quot;Sling-Tracer-Config : org.apache.jackrabbit.oak.query&quot; \
229,235c240,248
< </code></pre> <p>Below is a json output for GET request</p> <pre><code><!-- TODO syntax marker (::javascript) disabled -->{
<   "method": "GET",
<   "time": 15140,
<   "timestamp": 1461574009024,
<   "requestProgressLogs": [
<     "0 TIMER_START{Request Processing}",
<     "0 COMMENT timer_end format is {&lt;elapsed msec&gt;,&lt;timer name&gt;} &lt;optional message&gt;",
---
> </code></pre>
>     <p>Below is a json output for GET request</p>
>     <pre><code><!-- TODO syntax marker (::javascript) disabled -->{
>   &quot;method&quot;: &quot;GET&quot;,
>   &quot;time&quot;: 15140,
>   &quot;timestamp&quot;: 1461574009024,
>   &quot;requestProgressLogs&quot;: [
>     &quot;0 TIMER_START{Request Processing}&quot;,
>     &quot;0 COMMENT timer_end format is {&lt;elapsed msec&gt;,&lt;timer name&gt;} &lt;optional message&gt;&quot;,
238,241c251,254
<   "queries": [{
<     "query": "/jcr:root/etc/workflow/instances//element(*,app:Workflow)[@status='RUNNING'] order by @startTime descending",
<     "plan": "[app:Workflow] as [a] /* property status = RUNNING where ([a].[status] = 'RUNNING') and (isdescendantnode([a], [/etc/workflow/instances])) */",
<     "caller": "com.example.WorkflowManager.getWorkflowInstances(WorkflowManager.java:902)"
---
>   &quot;queries&quot;: [{
>     &quot;query&quot;: &quot;/jcr:root/etc/workflow/instances//element(*,app:Workflow)[@status=&#39;RUNNING&#39;] order by @startTime descending&quot;,
>     &quot;plan&quot;: &quot;[app:Workflow] as [a] /* property status = RUNNING where ([a].[status] = &#39;RUNNING&#39;) and (isdescendantnode([a], [/etc/workflow/instances])) */&quot;,
>     &quot;caller&quot;: &quot;com.example.WorkflowManager.getWorkflowInstances(WorkflowManager.java:902)&quot;
244,251c257,264
<   "logs": [{
<     "timestamp": 1461574022401,
<     "level": "DEBUG",
<     "logger": "org.apache.jackrabbit.oak.query.QueryEngineImpl",
<     "message": "Parsing xpath statement: /jcr:root/etc/workflow/instances//element(*,cq:Workflow)[@status='RUNNING'] order by @startTime descending",
<     "params": [
<       "xpath",
<       "/jcr:root/etc/workflow/instances//element(*,cq:Workflow)[@status='RUNNING'] order by @startTime descending"
---
>   &quot;logs&quot;: [{
>     &quot;timestamp&quot;: 1461574022401,
>     &quot;level&quot;: &quot;DEBUG&quot;,
>     &quot;logger&quot;: &quot;org.apache.jackrabbit.oak.query.QueryEngineImpl&quot;,
>     &quot;message&quot;: &quot;Parsing xpath statement: /jcr:root/etc/workflow/instances//element(*,cq:Workflow)[@status=&#39;RUNNING&#39;] order by @startTime descending&quot;,
>     &quot;params&quot;: [
>       &quot;xpath&quot;,
>       &quot;/jcr:root/etc/workflow/instances//element(*,cq:Workflow)[@status=&#39;RUNNING&#39;] order by @startTime descending&quot;
257c270,271
< </code></pre> </li> 
---
> </code></pre>
>   </li>
269c283
< <h2><a href="#installation" id="installation">Installation</a></h2> 
---
> <h2><a href="#installation" name="installation">Installation</a></h2>
diff -b -B -r ./documentation/bundles/managing-permissions-jackrabbit-accessmanager.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
96c96
< <h2><a href="#privileges" id="privileges">Privileges</a></h2> 
---
> <h2><a href="#privileges" name="privileges">Privileges</a></h2>
100,101c100,101
<    <th> privilagename </th>
<    <th> description </th>
---
>       <th>privilagename </th>
>       <th>description </th>
106,107c106,107
<    <td> jcr:read </td>
<    <td> the privilege to retrieve a node and get its properties and their values </td>
---
>       <td>jcr:read </td>
>       <td>the privilege to retrieve a node and get its properties and their values </td>
110,111c110,111
<    <td> jcr:readAccessControl </td>
<    <td> the privilege to get the access control policy of a node </td>
---
>       <td>jcr:readAccessControl </td>
>       <td>the privilege to get the access control policy of a node </td>
114,115c114,115
<    <td> jcr:modifyProperties </td>
<    <td> the privilege to create, modify and remove the properties of a node </td>
---
>       <td>jcr:modifyProperties </td>
>       <td>the privilege to create, modify and remove the properties of a node </td>
118,119c118,119
<    <td> jcr:addChildNodes </td>
<    <td> the privilege to create child nodes of a node </td>
---
>       <td>jcr:addChildNodes </td>
>       <td>the privilege to create child nodes of a node </td>
122,123c122,123
<    <td> jcr:removeChildNodes </td>
<    <td> the privilege to remove child nodes of a node </td>
---
>       <td>jcr:removeChildNodes </td>
>       <td>the privilege to remove child nodes of a node </td>
126,127c126,127
<    <td> jcr:removeNode </td>
<    <td> the privilege to remove a node </td>
---
>       <td>jcr:removeNode </td>
>       <td>the privilege to remove a node </td>
130,131c130,131
<    <td> jcr:write </td>
<    <td> an aggregate privilege that contains: jcr:modifyProperties jcr:addChildNodes jcr:removeNode jcr:removeChildNodes </td>
---
>       <td>jcr:write </td>
>       <td>an aggregate privilege that contains: jcr:modifyProperties jcr:addChildNodes jcr:removeNode jcr:removeChildNodes </td>
134,135c134,135
<    <td> jcr:modifyAccessControl </td>
<    <td> the privilege to modify the access control policies of a node </td>
---
>       <td>jcr:modifyAccessControl </td>
>       <td>the privilege to modify the access control policies of a node </td>
138,139c138,139
<    <td> jcr:lockManagement </td>
<    <td> the privilege to lock and unlock a node </td>
---
>       <td>jcr:lockManagement </td>
>       <td>the privilege to lock and unlock a node </td>
142,143c142,143
<    <td> jcr:versionManagement </td>
<    <td> the privilege to perform versioning operations on a node </td>
---
>       <td>jcr:versionManagement </td>
>       <td>the privilege to perform versioning operations on a node </td>
146,147c146,147
<    <td> jcr:nodeTypeManagement </td>
<    <td> the privilege to add and remove mixin node types and change the primary node type of a node </td>
---
>       <td>jcr:nodeTypeManagement </td>
>       <td>the privilege to add and remove mixin node types and change the primary node type of a node </td>
150,151c150,151
<    <td> jcr:retentionManagement </td>
<    <td> the privilege to perform retention management operations on a node </td>
---
>       <td>jcr:retentionManagement </td>
>       <td>the privilege to perform retention management operations on a node </td>
154,155c154,155
<    <td> jcr:lifecycleManagement </td>
<    <td> the privilege to perform lifecycle operations on a node </td>
---
>       <td>jcr:lifecycleManagement </td>
>       <td>the privilege to perform lifecycle operations on a node </td>
158,159c158,159
<    <td> jcr:all </td>
<    <td> an aggregate privilege that contains all predefined privileges </td>
---
>       <td>jcr:all </td>
>       <td>an aggregate privilege that contains all predefined privileges </td>
163c163
< <h2><a href="#add-or-modify-permissions" id="add-or-modify-permissions">Add or modify permissions</a></h2> 
---
> <h2><a href="#add-or-modify-permissions" name="add-or-modify-permissions">Add or modify permissions</a></h2>
171c171
< <h2><a href="#delete-permissions" id="delete-permissions">Delete permissions</a></h2> 
---
> <h2><a href="#delete-permissions" name="delete-permissions">Delete permissions</a></h2>
176,178c176,178
< <h2><a href="#get-permissions" id="get-permissions">Get permissions</a></h2> 
< <h3><a href="#bound-permissions" id="bound-permissions">Bound Permissions</a></h3> 
< <p>To get the permissions bound to a particular node in a json format for a node send a GET request to <code>/&lt;path-to-the-node&gt;.acl.json</code>.</p> 
---
> <h2><a href="#get-permissions" name="get-permissions">Get permissions</a></h2>
> <h3><a href="#bound-permissions" name="bound-permissions">Bound Permissions</a></h3>
> <p>To get the permissions bound to a particular node in a json format for a node send a GET request to <code>/&lt;path-to-the-node&gt;.acl.json</code>. </p>
182,183c182,183
< <h3><a href="#effective-permissions" id="effective-permissions">Effective Permissions</a></h3> 
< <p>To get the permissions which are effective for a particular node in a json format for a node send a GET request to <code>/&lt;path-to-the-node&gt;.eacl.json</code>.</p> 
---
> <h3><a href="#effective-permissions" name="effective-permissions">Effective Permissions</a></h3>
> <p>To get the permissions which are effective for a particular node in a json format for a node send a GET request to <code>/&lt;path-to-the-node&gt;.eacl.json</code>. </p>
188c188
<   See section 16.3 of the JCR 2.0 specification for an explanation of the difference between bound and effective policies. 
---
> See section 16.3 of the JCR 2.0 specification for an explanation of the difference between bound and effective policies.
diff -b -B -r ./documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
98c98
< <h2><a href="#list-users" id="list-users">List users</a></h2> 
---
> <h2><a href="#list-users" name="list-users">List users</a></h2>
103,105c103,105
<   "admin": {
<     "memberOf": [],
<     "declaredMemberOf": []
---
>   &quot;admin&quot;: {
>     &quot;memberOf&quot;: [],
>     &quot;declaredMemberOf&quot;: []
107,109c107,109
<   "anonymous": {
<     "memberOf": [],
<     "declaredMemberOf": []
---
>   &quot;anonymous&quot;: {
>     &quot;memberOf&quot;: [],
>     &quot;declaredMemberOf&quot;: []
113c113
< <h2><a href="#get-user" id="get-user">Get user</a></h2> 
---
> <h2><a href="#get-user" name="get-user">Get user</a></h2>
118,119c118,119
<     "memberOf": [],
<     "declaredMemberOf": []
---
>     &quot;memberOf&quot;: [],
>     &quot;declaredMemberOf&quot;: []
123c123
< <h2><a href="#create-user" id="create-user">Create user</a></h2> 
---
> <h2><a href="#create-user" name="create-user">Create user</a></h2>
129,130c129,130
<    <th> Required </th>
<    <th> Description</th>
---
>       <th>Required </th>
>       <th>Description</th>
136,137c136,137
<    <td> yes </td>
<    <td> The name of the new user</td>
---
>       <td>yes </td>
>       <td>The name of the new user</td>
141,142c141,142
<    <td> yes </td>
<    <td> The password of the new user</td>
---
>       <td>yes </td>
>       <td>The password of the new user</td>
146,147c146,147
<    <td> yes </td>
<    <td> The password of the new user (must be equal to the value of <code>pwd</code>)</td>
---
>       <td>yes </td>
>       <td>The password of the new user (must be equal to the value of <code>pwd</code>)</td>
151,152c151,152
<    <td> no </td>
<    <td> Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
---
>       <td>no </td>
>       <td>Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
161c161
<    <th> Description</th>
---
>       <th>Description</th>
167c167
<    <td> Success, a redirect is sent to the users resource locator with HTML (or JSON) describing status.</td>
---
>       <td>Success, a redirect is sent to the users resource locator with HTML (or JSON) describing status.</td>
171c171
<    <td> Failure, including user already exists. HTML (or JSON) explains failure.</td>
---
>       <td>Failure, including user already exists. HTML (or JSON) explains failure.</td>
179c179
< <h2><a href="#update-user" id="update-user">Update user</a></h2> 
---
> <h2><a href="#update-user" name="update-user">Update user</a></h2>
185,186c185,186
<    <th> Required </th>
<    <th> Description</th>
---
>       <th>Required </th>
>       <th>Description</th>
192,193c192,193
<    <td> no </td>
<    <td> (since version 2.1.1) If <code>true</code> disables the user to block further login attempts. If <code>false</code> enables a disabled user.</td>
---
>       <td>no </td>
>       <td>(since version 2.1.1) If <code>true</code> disables the user to block further login attempts. If <code>false</code> enables a disabled user.</td>
197,198c197,198
<    <td> no </td>
<    <td> Specifies the reason why a user has been disabled.</td>
---
>       <td>no </td>
>       <td>Specifies the reason why a user has been disabled.</td>
202,203c202,203
<    <td> no </td>
<    <td> Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
---
>       <td>no </td>
>       <td>Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
207,208c207,208
<    <td> no </td>
<    <td> Properties with @Delete at the end of the name will be deleted in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
---
>       <td>no </td>
>       <td>Properties with @Delete at the end of the name will be deleted in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
217c217
<    <th> Description</th>
---
>       <th>Description</th>
223c223
<    <td> Success, a redirect is sent to the users resource locator with HTML (or JSON) describing status.</td>
---
>       <td>Success, a redirect is sent to the users resource locator with HTML (or JSON) describing status.</td>
227c227
<    <td> User was not found.</td>
---
>       <td>User was not found.</td>
231c231
<    <td> Any other failure. HTML (or JSON) explains failure.</td>
---
>       <td>Any other failure. HTML (or JSON) explains failure.</td>
239c239
< <h2><a href="#change-password" id="change-password">Change password</a></h2> 
---
> <h2><a href="#change-password" name="change-password">Change password</a></h2>
245,246c245,246
<    <th> Required </th>
<    <th> Description</th>
---
>       <th>Required </th>
>       <th>Description</th>
252,253c252,253
<    <td> yes </td>
<    <td> Old password.</td>
---
>       <td>yes </td>
>       <td>Old password.</td>
257,258c257,258
<    <td> yes </td>
<    <td> New password.</td>
---
>       <td>yes </td>
>       <td>New password.</td>
262,263c262,263
<    <td> yes </td>
<    <td> New password (must be equal to the value of <code>newPwd</code>).</td>
---
>       <td>yes </td>
>       <td>New password (must be equal to the value of <code>newPwd</code>).</td>
272c272
<    <th> Description</th>
---
>       <th>Description</th>
278c278
<    <td> Success, no body.</td>
---
>       <td>Success, no body.</td>
282c282
<    <td> User was not found.</td>
---
>       <td>User was not found.</td>
286c286
<    <td> Any other failure. HTML (or JSON) explains failure.</td>
---
>       <td>Any other failure. HTML (or JSON) explains failure.</td>
294c294
< <h2><a href="#delete-user" id="delete-user">Delete user</a></h2> 
---
> <h2><a href="#delete-user" name="delete-user">Delete user</a></h2>
300,301c300,301
<    <th> Required </th>
<    <th> Description</th>
---
>       <th>Required </th>
>       <th>Description</th>
307,308c307,308
<    <td> no </td>
<    <td> An array of relative resource references to users to be deleted. If this parameter is present, the username from the URL is ignored and all listed users are removed.</td>
---
>       <td>no </td>
>       <td>An array of relative resource references to users to be deleted. If this parameter is present, the username from the URL is ignored and all listed users are removed.</td>
317c317
<    <th> Description</th>
---
>       <th>Description</th>
323c323
<    <td> Success, no body.</td>
---
>       <td>Success, no body.</td>
327c327
<    <td> User(s) was/were not found.</td>
---
>       <td>User(s) was/were not found.</td>
331c331
<    <td> Any other failure. HTML (or JSON) explains failure.</td>
---
>       <td>Any other failure. HTML (or JSON) explains failure.</td>
338c338
< <h2><a href="#list-groups" id="list-groups">List groups</a></h2> 
---
> <h2><a href="#list-groups" name="list-groups">List groups</a></h2>
343,347c343,347
<   "UserAdmin": {
<     "members": [],
<     "declaredMembers": [],
<     "memberOf": [],
<     "declaredMemberOf": []
---
>   &quot;UserAdmin&quot;: {
>     &quot;members&quot;: [],
>     &quot;declaredMembers&quot;: [],
>     &quot;memberOf&quot;: [],
>     &quot;declaredMemberOf&quot;: []
349,353c349,353
<   "GroupAdmin": {
<     "members": [],
<     "declaredMembers": [],
<     "memberOf": [],
<     "declaredMemberOf": []
---
>   &quot;GroupAdmin&quot;: {
>     &quot;members&quot;: [],
>     &quot;declaredMembers&quot;: [],
>     &quot;memberOf&quot;: [],
>     &quot;declaredMemberOf&quot;: []
355,359c355,359
<   "administrators": {
<     "members": [],
<     "declaredMembers": [],
<     "memberOf": [],
<     "declaredMemberOf": []
---
>   &quot;administrators&quot;: {
>     &quot;members&quot;: [],
>     &quot;declaredMembers&quot;: [],
>     &quot;memberOf&quot;: [],
>     &quot;declaredMemberOf&quot;: []
363c363
< <h2><a href="#get-group" id="get-group">Get group</a></h2> 
---
> <h2><a href="#get-group" name="get-group">Get group</a></h2>
368,371c368,371
<     "members": [],
<     "declaredMembers": [],
<     "memberOf": [],
<     "declaredMemberOf": []
---
>     &quot;members&quot;: [],
>     &quot;declaredMembers&quot;: [],
>     &quot;memberOf&quot;: [],
>     &quot;declaredMemberOf&quot;: []
375c375
< <h2><a href="#create-group" id="create-group">Create group</a></h2> 
---
> <h2><a href="#create-group" name="create-group">Create group</a></h2>
381,382c381,382
<    <th> Required </th>
<    <th> Description</th>
---
>       <th>Required </th>
>       <th>Description</th>
388,389c388,389
<    <td> yes </td>
<    <td> The name of the new group</td>
---
>       <td>yes </td>
>       <td>The name of the new group</td>
393,394c393,394
<    <td> no </td>
<    <td> Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
---
>       <td>no </td>
>       <td>Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
403c403
<    <th> Description</th>
---
>       <th>Description</th>
409c409
<    <td> Success, a redirect is sent to the group resource locator with HTML (or JSON) describing status</td>
---
>       <td>Success, a redirect is sent to the group resource locator with HTML (or JSON) describing status</td>
413c413
<    <td> Failure including group already exists. HTML (or JSON) explains failure.</td>
---
>       <td>Failure including group already exists. HTML (or JSON) explains failure.</td>
421c421
< <h2><a href="#update-group" id="update-group">Update group</a></h2> 
---
> <h2><a href="#update-group" name="update-group">Update group</a></h2>
427,428c427,428
<    <th> Required </th>
<    <th> Description</th>
---
>       <th>Required </th>
>       <th>Description</th>
434,435c434,435
<    <td> no </td>
<    <td> user(s) (name or URI) to add to the group as a member. Can also be an array of users.</td>
---
>       <td>no </td>
>       <td>user(s) (name or URI) to add to the group as a member. Can also be an array of users.</td>
439,440c439,440
<    <td> no </td>
<    <td> user(s) (name or URI) to remove from the group. Can also be an array of users.</td>
---
>       <td>no </td>
>       <td>user(s) (name or URI) to remove from the group. Can also be an array of users.</td>
444,445c444,445
<    <td> no </td>
<    <td> Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
---
>       <td>no </td>
>       <td>Additional parameters will be stored as node properties in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
449,450c449,450
<    <td> no </td>
<    <td> Properties with @Delete at the end of the name will be deleted in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
---
>       <td>no </td>
>       <td>Properties with @Delete at the end of the name will be deleted in the JCR. Nested properties are supported since 2.2.6 (<a href="https://issues.apache.org/jira/browse/SLING-6747">SLING-6747</a>).</td>
459c459
<    <th> Description</th>
---
>       <th>Description</th>
465c465
<    <td> Success, a redirect is sent to the group resource locator with HTML (or JSON) describing status.</td>
---
>       <td>Success, a redirect is sent to the group resource locator with HTML (or JSON) describing status.</td>
469c469
<    <td> Group was not found.</td>
---
>       <td>Group was not found.</td>
473c473
<    <td> Any other failure. HTML (or JSON) explains failure.</td>
---
>       <td>Any other failure. HTML (or JSON) explains failure.</td>
478c478
< <pre><code>curl -Fanyproperty1@Delete -Fproperty2=value2 -F ":member=/system/userManager/user/myuser" \
---
> <pre><code>curl -Fanyproperty1@Delete -Fproperty2=value2 -F &quot;:member=/system/userManager/user/myuser&quot; \
481c481
< <h2><a href="#delete-group" id="delete-group">Delete group</a></h2> 
---
> <h2><a href="#delete-group" name="delete-group">Delete group</a></h2>
487,488c487,488
<    <th> Required </th>
<    <th> Description</th>
---
>       <th>Required </th>
>       <th>Description</th>
494,495c494,495
<    <td> no </td>
<    <td> An array of relative resource references to groups to be deleted. If this parameter is present, the name of the group from the URL is ignored and all listed groups are removed.</td>
---
>       <td>no </td>
>       <td>An array of relative resource references to groups to be deleted. If this parameter is present, the name of the group from the URL is ignored and all listed groups are removed.</td>
504c504
<    <th> Description</th>
---
>       <th>Description</th>
510c510
<    <td> Success, sent with no body.</td>
---
>       <td>Success, sent with no body.</td>
514c514
<    <td> Group(s) was/were not found.</td>
---
>       <td>Group(s) was/were not found.</td>
518c518
<    <td> Any other failure. HTML (or JSON) explains failure.</td>
---
>       <td>Any other failure. HTML (or JSON) explains failure.</td>
525c525
< <h2><a href="#automated-tests" id="automated-tests">Automated Tests</a></h2> 
---
> <h2><a href="#automated-tests" name="automated-tests">Automated Tests</a></h2>
527c527
< <h2><a href="#permissions-checking-from-scripts" id="permissions-checking-from-scripts">Permissions checking from scripts</a></h2> 
---
> <h2><a href="#permissions-checking-from-scripts" name="permissions-checking-from-scripts">Permissions checking from scripts</a></h2>
535,536c535,536
<    <th> Method </th>
<    <th> Description </th>
---
>       <th>Method </th>
>       <th>Description </th>
541,542c541,542
<    <td> <code>canAddUser(jcrSession)</code> </td>
<    <td> Checks if the current user may add new users </td>
---
>       <td><code>canAddUser(jcrSession)</code> </td>
>       <td>Checks if the current user may add new users </td>
545,546c545,546
<    <td> <code>canAddGroup(jcrSession)</code> </td>
<    <td> Checks if the current user may add new groups </td>
---
>       <td><code>canAddGroup(jcrSession)</code> </td>
>       <td>Checks if the current user may add new groups </td>
549,550c549,550
<    <td> <code>canUpdateProperties(jcrSession, principalId)</code> </td>
<    <td> Checks if the current user may update the properties of the specified principal </td>
---
>       <td><code>canUpdateProperties(jcrSession, principalId)</code> </td>
>       <td>Checks if the current user may update the properties of the specified principal </td>
553,554c553,554
<    <td> <code>canRemove(jcrSession, principalId)</code> </td>
<    <td> Checks if the current user may remove the specified user or group </td>
---
>       <td><code>canRemove(jcrSession, principalId)</code> </td>
>       <td>Checks if the current user may remove the specified user or group </td>
557,558c557,558
<    <td> <code>canUpdateGroupMembers(jcrSession, groupId)</code> </td>
<    <td> Checks if the current user may modify the membership of the specified group </td>
---
>       <td><code>canUpdateGroupMembers(jcrSession, groupId)</code> </td>
>       <td>Checks if the current user may modify the membership of the specified group </td>
575c575
<     if (privilegesInfo.canUpdateProperties(currentSession, "someUserId")) {
---
>     if (privilegesInfo.canUpdateProperties(currentSession, &quot;someUserId&quot;)) {
579c579
<     if (privilegesInfo.canRemove(currentSession, "someUserId")) {
---
>     if (privilegesInfo.canRemove(currentSession, &quot;someUserId&quot;)) {
583c583
<     if (privilegesInfo.canUpdateGroupMembers(currentSession, "GroupName")) {
---
>     if (privilegesInfo.canUpdateGroupMembers(currentSession, &quot;GroupName&quot;)) {
diff -b -B -r ./documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
98c98
< <h2><a href="#multiple-ways-to-modify-content" id="multiple-ways-to-modify-content">Multiple Ways to Modify Content</a></h2> 
---
> <h2><a href="#multiple-ways-to-modify-content" name="multiple-ways-to-modify-content">Multiple Ways to Modify Content</a></h2>
101c101
< <h2><a href="#quickstart-creating-content" id="quickstart-creating-content">Quickstart: Creating Content</a></h2> 
---
> <h2><a href="#quickstart-creating-content" name="quickstart-creating-content">Quickstart: Creating Content</a></h2>
103,105c103,105
< <pre><code>&lt;form method="POST" action="http://host/some/new/content" enctype="multipart/form-data"&gt;
<    &lt;input type="text" name="title" value="" /&gt;
<    &lt;input type="text" name="text" value="" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;http://host/some/new/content&quot; enctype=&quot;multipart/form-data&quot;&gt;
>    &lt;input type=&quot;text&quot; name=&quot;title&quot; value=&quot;&quot; /&gt;
>    &lt;input type=&quot;text&quot; name=&quot;text&quot; value=&quot;&quot; /&gt;
110c110
< <pre><code>$ curl -Ftitle="some title text" -Ftext="some body text content" http://host/some/new/content
---
> <pre><code>$ curl -Ftitle=&quot;some title text&quot; -Ftext=&quot;some body text content&quot; http://host/some/new/content
113,114c113,114
< <pre><code>$ curl -F"jcr:primaryType=nt:unstructured" -Ftitle="some title text" \    
<     -Ftext="some body text content" http://host/some/new/content
---
> <pre><code>$ curl -F&quot;jcr:primaryType=nt:unstructured&quot; -Ftitle=&quot;some title text&quot; \    
>     -Ftext=&quot;some body text content&quot; http://host/some/new/content
117,118c117,118
< <pre><code>$ curl -F"sling:resourceType=sling:sample" -Ftitle="some title text" \    
<     -Ftext="some body text content" http://host/some/new/content
---
> <pre><code>$ curl -F&quot;sling:resourceType=sling:sample&quot; -Ftitle=&quot;some title text&quot; \    
>     -Ftext=&quot;some body text content&quot; http://host/some/new/content
120c120
< <h2><a href="#preface-multipartform-data-posts" id="preface-multipartform-data-posts">Preface: multipart/form-data POSTs</a></h2> 
---
> <h2><a href="#preface-multipart-form-data-posts" name="preface-multipart-form-data-posts">Preface: multipart/form-data POSTs</a></h2>
122c122
< <p>In this case, ensure you are submitting the POST request using <code>multipart/form-data</code> encoding. This preserves the order of parameter application according to the original HTML form. To this avail, ensure to always include the <code>enctype="multipart/form-data"</code> attribute with the <code>&lt;form&gt;</code> tag.</p> 
---
> <p>In this case, ensure you are submitting the POST request using <code>multipart/form-data</code> encoding. This preserves the order of parameter application according to the original HTML form. To this avail, ensure to always include the <code>enctype=&quot;multipart/form-data&quot;</code> attribute with the <code>&lt;form&gt;</code> tag.</p>
124c124
< <h2><a href="#slingpostservlet-operations" id="slingpostservlet-operations">SlingPostServlet Operations</a></h2> 
---
> <h2><a href="#slingpostservlet-operations" name="slingpostservlet-operations">SlingPostServlet Operations</a></h2>
139,140c139,140
<  <b>Automated tests</b>: Note that the launchpad test services module contains a number of 
<  <a href="https://github.com/apache/sling-org-apache-sling-launchpad-test-services/tree/master/src/main/java/org/apache/sling/launchpad/testservices/post">integration tests</a> for the SlingPostServlet. Most of these tests are fairly readable, and can be used to find out more details about the servlet's behavior. 
---
> <b>Automated tests</b>:
> Note that the launchpad test services module contains a number of <a href="https://github.com/apache/sling-org-apache-sling-launchpad-test-services/tree/master/src/main/java/org/apache/sling/launchpad/testservices/post">integration tests</a> for the SlingPostServlet. Most of these tests are fairly readable, and can be used to find out more details about the servlet's behavior.
143c143,145
<  <b>Trailing star in the :applyTo parameter</b>: This applies to operations that use this parameter, since version 2.1.2 of the *org.apache.sling.servlets.post* bundle: If the last segment of the `:applyTo` value is '*' then the operation applies to all the children of the resolved parent resource. This can be used to act on all the children of a resource without having to specify the path of each individual child resource. 
---
> <b>Trailing star in the :applyTo parameter</b>:
> This applies to operations that use this parameter, since version 2.1.2 of the *org.apache.sling.servlets.post* bundle: If the last segment of the `:applyTo` value is '*' then the operation applies to all the children of the resolved parent resource. This can be used to act on all the children 
> of a resource without having to specify the path of each individual child resource.
145c147
< <h3><a href="#content-creation-or-modification" id="content-creation-or-modification">Content Creation or Modification</a></h3> 
---
> <h3><a href="#content-creation-or-modification" name="content-creation-or-modification">Content Creation or Modification</a></h3>
158,159c160,161
<    <th> Resource Path </th>
<    <th> Item path </th>
---
>       <th>Resource Path </th>
>       <th>Item path </th>
164,165c166,167
<    <td> <code>/content/new</code> </td>
<    <td> <code>/content/new</code> </td>
---
>       <td><code>/content/new</code> </td>
>       <td><code>/content/new</code> </td>
168,169c170,171
<    <td> <code>/content/new.html</code> </td>
<    <td> <code>/content/new</code> </td>
---
>       <td><code>/content/new.html</code> </td>
>       <td><code>/content/new</code> </td>
172,173c174,175
<    <td> <code>/content/new.print.a4.html</code> </td>
<    <td> <code>/content/new</code> </td>
---
>       <td><code>/content/new.print.a4.html</code> </td>
>       <td><code>/content/new</code> </td>
176,177c178,179
<    <td> <code>/content/</code> </td>
<    <td> <code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
---
>       <td><code>/content/</code> </td>
>       <td><code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
180,181c182,183
<    <td> <code>/content/*</code></td>
<    <td> <code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
---
>       <td><code>/content/*</code></td>
>       <td><code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
184,185c186,187
<    <td> <code>/content/*.html</code></td>
<    <td> <code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
---
>       <td><code>/content/*.html</code></td>
>       <td><code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
188,189c190,191
<    <td> <code>/content/*.print.a4.html</code></td>
<    <td> <code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
---
>       <td><code>/content/*.print.a4.html</code></td>
>       <td><code>/content/xxx</code> where <code>xxx</code> is a generated name </td>
193c195
< <h5><a href="#setting-property-values" id="setting-property-values">Setting Property Values</a></h5> 
---
> <h5><a href="#setting-property-values" name="setting-property-values">Setting Property Values</a></h5>
196,199c198,201
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="text" name="title" /&gt;
<     &lt;input type="text" name="text" /&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;text&quot; name=&quot;title&quot; /&gt;
>     &lt;input type=&quot;text&quot; name=&quot;text&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
209c211
< <h5><a href="#automatic-property-values-last-modified-and-created-by" id="automatic-property-values-last-modified-and-created-by">Automatic property values: last modified and created by</a></h5> 
---
> <h5><a href="#automatic-property-values-last-modified-and-created-by" name="automatic-property-values-last-modified-and-created-by">Automatic property values: last modified and created by</a></h5>
212,215c214,221
<  <li> <p><code>created</code> and <code>jcr:created</code> are set to the node creation time, as a Date value.</p> </li> 
<  <li> <p><code>lastModified</code>, <code>jcr:lastModified</code> are set to the node modification time, as a Date value.</p> </li> 
<  <li> <p><code>createdBy</code> and <code>jcr:createdBy</code> are set to the name of the user who created the node.</p> </li> 
<  <li> <p><code>lastModifiedBy</code>, <code>jcr:lastModifiedBy</code> are set to the name of the user who modified the node.</p> </li> 
---
>   <li>
>   <p><code>created</code> and <code>jcr:created</code> are set to the node creation time, as a Date value.</p></li>
>   <li>
>   <p><code>lastModified</code>, <code>jcr:lastModified</code> are set to the node modification time, as a Date value.</p></li>
>   <li>
>   <p><code>createdBy</code> and <code>jcr:createdBy</code> are set to the name of the user who created the node.</p></li>
>   <li>
>   <p><code>lastModifiedBy</code>, <code>jcr:lastModifiedBy</code> are set to the name of the user who modified the node.</p></li>
218,219c224,225
< <h5><a href="#file-uploads" id="file-uploads">File Uploads</a></h5> 
< <p>File uploads are typically done using the <code>&lt;input type="file""/&gt;</code> element of an HTML form and ensuring the correct form encoding. The SlingPostServlet handles uploaded files specially, in that the file data is not simply written into a property, but a node is actually created with three properties:</p> 
---
> <h5><a href="#file-uploads" name="file-uploads">File Uploads</a></h5>
> <p>File uploads are typically done using the <code>&lt;input type=&quot;file&quot;&quot;/&gt;</code> element of an HTML form and ensuring the correct form encoding. The SlingPostServlet handles uploaded files specially, in that the file data is not simply written into a property, but a node is actually created with three properties:</p>
233,235c239,241
< <pre><code>&lt;form method="POST" action="/content/page" enctype="multipart/form-data"&gt;
<     &lt;input type="file" name="image" /&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;file&quot; name=&quot;image&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
239,242c245,248
< <pre><code>&lt;form method="POST" action="/content/page" enctype="multipart/form-data"&gt;
<     &lt;input type="file" name="*" /&gt;
<     &lt;input type="hidden" name="*@TypeHint" value="nt:file" /&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;file&quot; name=&quot;*&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;*@TypeHint&quot; value=&quot;nt:file&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
246c252
< <h5><a href="#date-properties" id="date-properties">Date properties</a></h5> 
---
> <h5><a href="#date-properties" name="date-properties">Date properties</a></h5>
260c266
< <h5><a href="#omitting-some-parameters" id="omitting-some-parameters">Omitting Some Parameters</a></h5> 
---
> <h5><a href="#omitting-some-parameters" name="omitting-some-parameters">Omitting Some Parameters</a></h5>
264,269c270,275
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="text" name="./title" /&gt;
<     &lt;input type="text" name="../first/text" /&gt;
<     &lt;input type="hidden" name="control0" /&gt;&lt;!-- ignored --&gt;
<     &lt;input type="hidden" name="control1" /&gt;&lt;!-- ignored --&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;text&quot; name=&quot;./title&quot; /&gt;
>     &lt;input type=&quot;text&quot; name=&quot;../first/text&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;control0&quot; /&gt;&lt;!-- ignored --&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;control1&quot; /&gt;&lt;!-- ignored --&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
280c286
< <h5><a href="#controlling-content-updates-with-suffixes" id="controlling-content-updates-with-suffixes">Controlling Content Updates with <code>@</code> Suffixes</a></h5> 
---
> <h5>Controlling Content Updates with <code>@</code> Suffixes</h5>
285c291
< <h6><a href="#typehint" id="typehint"><code>@TypeHint</code></a></h6> 
---
> <h6><a href="#typehint" name="typehint">@TypeHint</a></h6>
289,298c295,304
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="text" name="width" /&gt;
<     &lt;input type="hidden" name="width@TypeHint" value="Long" /&gt;
<     &lt;input type="checkbox" name="checked" /&gt;
<     &lt;input type="hidden" name="checked@TypeHint" value="Boolean" /&gt;
<     &lt;input type="text" name="hobbys"/&gt;
<     &lt;input type="text" name="hobbys"/&gt;
<     &lt;input type="text" name="hobbys"/&gt;
<     &lt;input type="hidden" name="hobbys@TypeHint" value="String[]" /&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;text&quot; name=&quot;width&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;width@TypeHint&quot; value=&quot;Long&quot; /&gt;
>     &lt;input type=&quot;checkbox&quot; name=&quot;checked&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;checked@TypeHint&quot; value=&quot;Boolean&quot; /&gt;
>     &lt;input type=&quot;text&quot; name=&quot;hobbys&quot;/&gt;
>     &lt;input type=&quot;text&quot; name=&quot;hobbys&quot;/&gt;
>     &lt;input type=&quot;text&quot; name=&quot;hobbys&quot;/&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;hobbys@TypeHint&quot; value=&quot;String[]&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
305c311
< <h6><a href="#defaultvalue" id="defaultvalue"><code>@DefaultValue</code></a></h6> 
---
> <h6><a href="#defaultvalue" name="defaultvalue">@DefaultValue</a></h6>
308,311c314,317
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="text" name="text" /&gt;
<     &lt;input type="hidden" name="text@DefaultValue" value="--- Default Value ---" /&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;text&quot; name=&quot;text&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;text@DefaultValue&quot; value=&quot;--- Default Value ---&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
314c320
< <h6><a href="#usedefaultwhenmissing" id="usedefaultwhenmissing"><code>@UseDefaultWhenMissing</code></a></h6> 
---
> <h6><a href="#usedefaultwhenmissing" name="usedefaultwhenmissing">@UseDefaultWhenMissing</a></h6>
316,319c322,325
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input name="queryIgnoreNoise" class="input" type="checkbox" value="true"/&gt;
<     &lt;input type="hidden" name="queryIgnoreNoise@DefaultValue" value="false"/&gt; 
<     &lt;input type="hidden" name="queryIgnoreNoise@UseDefaultWhenMissing" value="true"/&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input name=&quot;queryIgnoreNoise&quot; class=&quot;input&quot; type=&quot;checkbox&quot; value=&quot;true&quot;/&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;queryIgnoreNoise@DefaultValue&quot; value=&quot;false&quot;/&gt; 
>     &lt;input type=&quot;hidden&quot; name=&quot;queryIgnoreNoise@UseDefaultWhenMissing&quot; value=&quot;true&quot;/&gt;
322c328
< <h6><a href="#ignoreblanks" id="ignoreblanks"><code>@IgnoreBlanks</code></a></h6> 
---
> <h6><a href="#ignoreblanks" name="ignoreblanks">@IgnoreBlanks</a></h6>
324,328c330,334
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="hidden" name="stringProperty@TypeHint" value="String[]"/&gt;
<     &lt;input type="text" name="stringProperty" value="foo"/&gt;
<     &lt;input type="text" name="stringProperty" value="bar"/&gt;
<     &lt;input type="text" name="stringProperty" value=""/&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;stringProperty@TypeHint&quot; value=&quot;String[]&quot;/&gt;
>     &lt;input type=&quot;text&quot; name=&quot;stringProperty&quot; value=&quot;foo&quot;/&gt;
>     &lt;input type=&quot;text&quot; name=&quot;stringProperty&quot; value=&quot;bar&quot;/&gt;
>     &lt;input type=&quot;text&quot; name=&quot;stringProperty&quot; value=&quot;&quot;/&gt;
333,335c339,341
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="hidden" name="stringProperty@TypeHint" value="String"/&gt;
<     &lt;input type="text" name="stringProperty" value=""/&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;stringProperty@TypeHint&quot; value=&quot;String&quot;/&gt;
>     &lt;input type=&quot;text&quot; name=&quot;stringProperty&quot; value=&quot;&quot;/&gt;
341c347
< <pre><code>&lt;input type="hidden" name="stringProperty@IgnoreBlanks" value="true"/&gt;
---
> <pre><code>&lt;input type=&quot;hidden&quot; name=&quot;stringProperty@IgnoreBlanks&quot; value=&quot;true&quot;/&gt;
344c350
< <h6><a href="#valuefrom" id="valuefrom"><code>@ValueFrom</code></a></h6> 
---
> <h6><a href="#valuefrom" name="valuefrom">@ValueFrom</a></h6>
347,350c353,356
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="text" name="supplied_text" /&gt;
<     &lt;input type="hidden" name="./text@ValueFrom" value="supplied_text" /&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;text&quot; name=&quot;supplied_text&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;./text@ValueFrom&quot; value=&quot;supplied_text&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
356c362
< <h6><a href="#delete" id="delete"><code>@Delete</code></a></h6> 
---
> <h6><a href="#delete" name="delete">@Delete</a></h6>
360,365c366,371
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="checkbox" name="color" value="red" /&gt;
<     &lt;input type="checkbox" name="color" value="green" /&gt;
<     &lt;input type="checkbox" name="color" value="blue" /&gt;
<     &lt;input type="hidden" name="color@Delete" value="delete text" /&gt;&lt;!-- actual value is ignored --&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;checkbox&quot; name=&quot;color&quot; value=&quot;red&quot; /&gt;
>     &lt;input type=&quot;checkbox&quot; name=&quot;color&quot; value=&quot;green&quot; /&gt;
>     &lt;input type=&quot;checkbox&quot; name=&quot;color&quot; value=&quot;blue&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;color@Delete&quot; value=&quot;delete text&quot; /&gt;&lt;!-- actual value is ignored --&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
370c376
< <h6><a href="#movefrom" id="movefrom"><code>@MoveFrom</code></a></h6> 
---
> <h6><a href="#movefrom" name="movefrom">@MoveFrom</a></h6>
375,379c381,385
< &lt;form method="POST" action="/content/page/" enctype="multipart/form-data"&gt;
<     &lt;input type="hidden" name="image@MoveFrom" value="/tmp/upload/123" /&gt;
<     &lt;input type="text" name="title" /&gt;
<     &lt;input type="text" name="text" /&gt;
<     &lt;input type="Submit" /&gt;
---
> &lt;form method=&quot;POST&quot; action=&quot;/content/page/&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;image@MoveFrom&quot; value=&quot;/tmp/upload/123&quot; /&gt;
>     &lt;input type=&quot;text&quot; name=&quot;title&quot; /&gt;
>     &lt;input type=&quot;text&quot; name=&quot;text&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
386c392
< <h6><a href="#copyfrom" id="copyfrom"><code>@CopyFrom</code></a></h6> 
---
> <h6><a href="#copyfrom" name="copyfrom">@CopyFrom</a></h6>
390,394c396,400
< &lt;form method="POST" action="/content/page/" enctype="multipart/form-data"&gt;
<     &lt;input type="hidden" name="image@CopyFrom" value="/tmp/upload/123" /&gt;
<     &lt;input type="text" name="title" /&gt;
<     &lt;input type="text" name="text" /&gt;
<     &lt;input type="Submit" /&gt;
---
> &lt;form method=&quot;POST&quot; action=&quot;/content/page/&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;image@CopyFrom&quot; value=&quot;/tmp/upload/123&quot; /&gt;
>     &lt;input type=&quot;text&quot; name=&quot;title&quot; /&gt;
>     &lt;input type=&quot;text&quot; name=&quot;text&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
401c407
< <h6><a href="#patch" id="patch"><code>@Patch</code></a></h6> 
---
> <h6><a href="#patch" name="patch">@Patch</a></h6>
404,409c410,415
< <pre><code>&lt;form method="POST" action="/content/page/first" enctype="multipart/form-data"&gt;
<     &lt;input type="hidden" name="tags@TypeHint" value="String[]" /&gt;
<     &lt;input type="hidden" name="tags@Patch"    value="true" /&gt;
<     &lt;input type="text"   name="tags"          value="+cool"/&gt;
<     &lt;input type="text"   name="tags"          value="-boring"/&gt;
<     &lt;input type="Submit" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content/page/first&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;tags@TypeHint&quot; value=&quot;String[]&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;tags@Patch&quot;    value=&quot;true&quot; /&gt;
>     &lt;input type=&quot;text&quot;   name=&quot;tags&quot;          value=&quot;+cool&quot;/&gt;
>     &lt;input type=&quot;text&quot;   name=&quot;tags&quot;          value=&quot;-boring&quot;/&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
418c424
< <h5><a href="#algorithm-for-node-name-creation" id="algorithm-for-node-name-creation">Algorithm for Node Name Creation</a></h5> 
---
> <h5><a href="#algorithm-for-node-name-creation" name="algorithm-for-node-name-creation">Algorithm for Node Name Creation</a></h5>
435c441
< <h5><a href="#response-status" id="response-status">Response Status</a></h5> 
---
> <h5><a href="#response-status" name="response-status">Response Status</a></h5>
440,441c446,447
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
446,447c452,453
<    <td> 200/OK </td>
<    <td> An existing node has been updated with content </td>
---
>       <td>200/OK </td>
>       <td>An existing node has been updated with content </td>
450,451c456,457
<    <td> 201/CREATED </td>
<    <td> A new node has been created and filled with content </td>
---
>       <td>201/CREATED </td>
>       <td>A new node has been created and filled with content </td>
454,455c460,461
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
459c465
< <h3><a href="#content-removal" id="content-removal">Content Removal</a></h3> 
---
> <h3><a href="#content-removal" name="content-removal">Content Removal</a></h3>
461c467
< <pre><code>$ curl -F":operation=delete" http://host/content/sample
---
> <pre><code>$ curl -F&quot;:operation=delete&quot; http://host/content/sample
463c469
< <h5><a href="#response-status" id="response-status">Response Status</a></h5> 
---
> <h5><a href="#response-status" name="response-status">Response Status</a></h5>
468,469c474,475
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
474,475c480,481
<    <td> 200/OK </td>
<    <td> The resource (and all its descendants) has been removed </td>
---
>       <td>200/OK </td>
>       <td>The resource (and all its descendants) has been removed </td>
478,479c484,485
<    <td> 404/NOT FOUND </td>
<    <td> The request URL does not address an existing repository item </td>
---
>       <td>404/NOT FOUND </td>
>       <td>The request URL does not address an existing repository item </td>
482,483c488,489
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
487c493
< <h5><a href="#deleting-multiple-items" id="deleting-multiple-items">Deleting Multiple Items</a></h5> 
---
> <h5><a href="#deleting-multiple-items" name="deleting-multiple-items">Deleting Multiple Items</a></h5>
491,492c497,498
< <pre><code>$ curl -F":operation=delete" -F":applyTo=/content/page1" \    
<     -F":applyTo=/content/page2" http://host/content/sample
---
> <pre><code>$ curl -F&quot;:operation=delete&quot; -F&quot;:applyTo=/content/page1&quot; \    
>     -F&quot;:applyTo=/content/page2&quot; http://host/content/sample
495c501
< <pre><code>$ curl -F":operation=delete" -F":applyTo=/content/*" http://host/content/sample
---
> <pre><code>$ curl -F&quot;:operation=delete&quot; -F&quot;:applyTo=/content/*&quot; http://host/content/sample
498c504
< <h6><a href="#response-status" id="response-status">Response Status</a></h6> 
---
> <h6><a href="#response-status" name="response-status">Response Status</a></h6>
503,504c509,510
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
509,510c515,516
<    <td> 200/OK </td>
<    <td> All requested and existing resources have been removed </td>
---
>       <td>200/OK </td>
>       <td>All requested and existing resources have been removed </td>
513,514c519,520
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
518c524
< <h3><a href="#copying-content" id="copying-content">Copying Content</a></h3> 
---
> <h3><a href="#copying-content" name="copying-content">Copying Content</a></h3>
524,525c530,531
<    <th> <code>:dest</code> Parameter </th>
<    <th> Destination Absolute Path </th>
---
>       <th><code>:dest</code> Parameter </th>
>       <th>Destination Absolute Path </th>
530,531c536,537
<    <td> <code>/content/newSample</code> </td>
<    <td> <code>/content/newSample</code> </td>
---
>       <td><code>/content/newSample</code> </td>
>       <td><code>/content/newSample</code> </td>
534,535c540,541
<    <td> <code>different/newSample</code> </td>
<    <td> <code>/content/different/newSample</code> </td>
---
>       <td><code>different/newSample</code> </td>
>       <td><code>/content/different/newSample</code> </td>
538,539c544,545
<    <td> <code>/content/different/</code> </td>
<    <td> <code>/content/different/sample</code> </td>
---
>       <td><code>/content/different/</code> </td>
>       <td><code>/content/different/sample</code> </td>
542,543c548,549
<    <td> <code>different/</code> </td>
<    <td> <code>/content/different/sample</code> </td>
---
>       <td><code>different/</code> </td>
>       <td><code>/content/different/sample</code> </td>
548c554
< <h5><a href="#response-status" id="response-status">Response Status</a></h5> 
---
> <h5><a href="#response-status" name="response-status">Response Status</a></h5>
553,554c559,560
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
559,560c565,566
<    <td> 200/OK </td>
<    <td> The node has been copied to the new location replacing an existing item at the destination </td>
---
>       <td>200/OK </td>
>       <td>The node has been copied to the new location replacing an existing item at the destination </td>
563,564c569,570
<    <td> 201/CREATED </td>
<    <td> The node has been copied to the new location creating a new item at the destination </td>
---
>       <td>201/CREATED </td>
>       <td>The node has been copied to the new location creating a new item at the destination </td>
567,568c573,574
<    <td> 404/NOT FOUND </td>
<    <td> The request URL does not address an existing repository item </td>
---
>       <td>404/NOT FOUND </td>
>       <td>The request URL does not address an existing repository item </td>
571,572c577,578
<    <td> 412/PRECONDITION FAILED </td>
<    <td> An item already exists at the destination and the <code>:replace</code> parameter is not set to <code>true</code> </td>
---
>       <td>412/PRECONDITION FAILED </td>
>       <td>An item already exists at the destination and the <code>:replace</code> parameter is not set to <code>true</code> </td>
575,576c581,582
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
580c586
< <h5><a href="#copying-multiple-items" id="copying-multiple-items">Copying Multiple Items</a></h5> 
---
> <h5><a href="#copying-multiple-items" name="copying-multiple-items">Copying Multiple Items</a></h5>
584,585c590,591
< <pre><code>$ curl -F":operation=copy" -F":applyTo=/content/page1" -F":applyTo=/content/page2" \    
<     -F":dest=/content/target/" http://host/content/sample
---
> <pre><code>$ curl -F&quot;:operation=copy&quot; -F&quot;:applyTo=/content/page1&quot; -F&quot;:applyTo=/content/page2&quot; \    
>     -F&quot;:dest=/content/target/&quot; http://host/content/sample
589c595
< <pre><code>$ curl -F":operation=copy" -F":applyTo=/content/*" -F":dest=/content/target/" \    
---
> <pre><code>$ curl -F&quot;:operation=copy&quot; -F&quot;:applyTo=/content/*&quot; -F&quot;:dest=/content/target/&quot; \    
593c599
< <h6><a href="#response-status" id="response-status">Response Status</a></h6> 
---
> <h6><a href="#response-status" name="response-status">Response Status</a></h6>
598,599c604,605
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
604,605c610,611
<    <td> 200/OK </td>
<    <td> All requested and existing resources have been copied </td>
---
>       <td>200/OK </td>
>       <td>All requested and existing resources have been copied </td>
608,609c614,615
<    <td> 412/PRECONDITION FAILED </td>
<    <td> The node indicated by the <code>:dest</code> parameter does not exist </td>
---
>       <td>412/PRECONDITION FAILED </td>
>       <td>The node indicated by the <code>:dest</code> parameter does not exist </td>
612,613c618,619
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request. This status is also set if the <code>:dest</code> parameter value does not have a trailing slash character. </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request. This status is also set if the <code>:dest</code> parameter value does not have a trailing slash character. </td>
617c623
< <h3><a href="#moving-content" id="moving-content">Moving Content</a></h3> 
---
> <h3><a href="#moving-content" name="moving-content">Moving Content</a></h3>
623,624c629,630
<    <th> <code>:dest</code> Parameter </th>
<    <th> Destination Absolute Path </th>
---
>       <th><code>:dest</code> Parameter </th>
>       <th>Destination Absolute Path </th>
629,630c635,636
<    <td> <code>/content/newSample</code> </td>
<    <td> <code>/content/newSample</code> </td>
---
>       <td><code>/content/newSample</code> </td>
>       <td><code>/content/newSample</code> </td>
633,634c639,640
<    <td> <code>different/newSample</code> </td>
<    <td> <code>/content/different/newSample</code> </td>
---
>       <td><code>different/newSample</code> </td>
>       <td><code>/content/different/newSample</code> </td>
637,638c643,644
<    <td> <code>/content/different/</code> </td>
<    <td> <code>/content/different/sample</code> </td>
---
>       <td><code>/content/different/</code> </td>
>       <td><code>/content/different/sample</code> </td>
641,642c647,648
<    <td> <code>different/</code> </td>
<    <td> <code>/content/different/sample</code> </td>
---
>       <td><code>different/</code> </td>
>       <td><code>/content/different/sample</code> </td>
647c653
< <h5><a href="#response-status" id="response-status">Response Status</a></h5> 
---
> <h5><a href="#response-status" name="response-status">Response Status</a></h5>
652,653c658,659
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
658,659c664,665
<    <td> 200/OK </td>
<    <td> The node has been moved to the new location replacing an existing item at the destination </td>
---
>       <td>200/OK </td>
>       <td>The node has been moved to the new location replacing an existing item at the destination </td>
662,663c668,669
<    <td> 201/CREATED </td>
<    <td> The node has been moved to the new location creating a new item at the destination </td>
---
>       <td>201/CREATED </td>
>       <td>The node has been moved to the new location creating a new item at the destination </td>
666,667c672,673
<    <td> 404/NOT FOUND </td>
<    <td> The request URL does not address an existing repository item </td>
---
>       <td>404/NOT FOUND </td>
>       <td>The request URL does not address an existing repository item </td>
670,671c676,677
<    <td> 412/PRECONDITION FAILED </td>
<    <td> An item already exists at the destination and the <code>:replace</code> parameter is not set to <code>true</code> </td>
---
>       <td>412/PRECONDITION FAILED </td>
>       <td>An item already exists at the destination and the <code>:replace</code> parameter is not set to <code>true</code> </td>
674,675c680,681
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request </td>
679c685
< <h5><a href="#moving-multiple-items" id="moving-multiple-items">Moving Multiple Items</a></h5> 
---
> <h5><a href="#moving-multiple-items" name="moving-multiple-items">Moving Multiple Items</a></h5>
683,684c689,690
< <pre><code>$ curl -F":operation=move" -F":applyTo=/content/page1" -F":applyTo=/content/page2" \    
<      -F":dest=/content/target/" http://host/content/sample
---
> <pre><code>$ curl -F&quot;:operation=move&quot; -F&quot;:applyTo=/content/page1&quot; -F&quot;:applyTo=/content/page2&quot; \    
>      -F&quot;:dest=/content/target/&quot; http://host/content/sample
688c694
< <pre><code>$ curl -F":operation=move" -F":applyTo=/content/*" -F":dest=/content/target/" \    
---
> <pre><code>$ curl -F&quot;:operation=move&quot; -F&quot;:applyTo=/content/*&quot; -F&quot;:dest=/content/target/&quot; \    
692c698
< <h6><a href="#response-status" id="response-status">Response Status</a></h6> 
---
> <h6><a href="#response-status" name="response-status">Response Status</a></h6>
697,698c703,704
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
703,704c709,710
<    <td> 200/OK </td>
<    <td> All requested and existing resources have been moved </td>
---
>       <td>200/OK </td>
>       <td>All requested and existing resources have been moved </td>
707,708c713,714
<    <td> 412/PRECONDITION FAILED </td>
<    <td> The node indicated by the <code>:dest</code> parameter does not exist </td>
---
>       <td>412/PRECONDITION FAILED </td>
>       <td>The node indicated by the <code>:dest</code> parameter does not exist </td>
711,712c717,718
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request. This status is also set if the <code>:dest</code> parameter value does not have a trailing slash character. </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request. This status is also set if the <code>:dest</code> parameter value does not have a trailing slash character. </td>
716,717c722,723
< <h3><a href="#importing-content-structures" id="importing-content-structures">Importing Content Structures</a></h3> 
< <p>To import content structures just address the parent item to import into and set the <code>:operation</code> parameter to <code>import</code>.</p> 
---
> <h3><a href="#importing-content-structures" name="importing-content-structures">Importing Content Structures</a></h3>
> <p>To import content structures just address the parent item to import into and set the <code>:operation</code> parameter to <code>import</code>. </p>
723,726c729,732
<    <th> Parameter </th>
<    <th> Required </th>
<    <th> Default value </th>
<    <th> Description </th>
---
>       <th>Parameter </th>
>       <th>Required </th>
>       <th>Default value </th>
>       <th>Description </th>
731,732c737,738
<    <td> <code>:contentType</code> </td>
<    <td> <code>true</code> </td>
---
>       <td><code>:contentType</code> </td>
>       <td><code>true</code> </td>
734c740
<    <td> The <code>:contentType</code> value specifies the type of content being imported. Possible values are: xml, jcr.xml, json, jar, zip </td>
---
>       <td>The <code>:contentType</code> value specifies the type of content being imported. Possible values are: xml, jcr.xml, json, jar, zip </td>
737,738c743,744
<    <td> <code>:content</code> </td>
<    <td> <code>false</code> </td>
---
>       <td><code>:content</code> </td>
>       <td><code>false</code> </td>
740c746
<    <td> The <code>:content</code> value specifies content string to import. The format of the import content is the same as is used by the jcr.contentloader bundle. This parameter is required if the :contentFile parameter is not supplied. </td>
---
>       <td>The <code>:content</code> value specifies content string to import. The format of the import content is the same as is used by the jcr.contentloader bundle. This parameter is required if the :contentFile parameter is not supplied. </td>
743,744c749,750
<    <td> <code>:contentFile</code> </td>
<    <td> <code>false</code> </td>
---
>       <td><code>:contentFile</code> </td>
>       <td><code>false</code> </td>
746c752
<    <td> The <code>:contentFile</code> value specifies a file uploaded for import. The format of the import content is the same as is used by the jcr.contentloader bundle. This parameter is required if the :content parameter is not supplied. </td>
---
>       <td>The <code>:contentFile</code> value specifies a file uploaded for import. The format of the import content is the same as is used by the jcr.contentloader bundle. This parameter is required if the :content parameter is not supplied. </td>
749,752c755,758
<    <td> <code>:checkin</code> </td>
<    <td> <code>false</code> </td>
<    <td> false </td>
<    <td> The <code>:checkin</code> value specifies whether versionable nodes should be checked in during the import. </td>
---
>       <td><code>:checkin</code> </td>
>       <td><code>false</code> </td>
>       <td>false </td>
>       <td>The <code>:checkin</code> value specifies whether versionable nodes should be checked in during the import. </td>
755,758c761,764
<    <td> <code>:autoCheckout</code> </td>
<    <td> <code>false</code> </td>
<    <td> false </td>
<    <td> The <code>:autoCheckout</code> value specifies whether versionable nodes should be checked out when necessary during the import. </td>
---
>       <td><code>:autoCheckout</code> </td>
>       <td><code>false</code> </td>
>       <td>false </td>
>       <td>The <code>:autoCheckout</code> value specifies whether versionable nodes should be checked out when necessary during the import. </td>
761,764c767,770
<    <td> <code>:replace</code> </td>
<    <td> <code>false</code> </td>
<    <td> false </td>
<    <td> The <code>:replace</code> value specifies whether the import should replace any existing nodes at the same path. Note: When true, the existing nodes will be deleted and a new node is created in the same place. </td>
---
>       <td><code>:replace</code> </td>
>       <td><code>false</code> </td>
>       <td>false </td>
>       <td>The <code>:replace</code> value specifies whether the import should replace any existing nodes at the same path. Note: When true, the existing nodes will be deleted and a new node is created in the same place. </td>
767,770c773,776
<    <td> <code>:replaceProperties</code> </td>
<    <td> <code>false</code> </td>
<    <td> false </td>
<    <td> The <code>:replaceProperties</code> value specifies whether the import should replace properties if they already exist. </td>
---
>       <td><code>:replaceProperties</code> </td>
>       <td><code>false</code> </td>
>       <td>false </td>
>       <td>The <code>:replaceProperties</code> value specifies whether the import should replace properties if they already exist. </td>
775,776c781,782
< <pre><code>$ curl -F":operation=import" -F":contentType=json" -F":name=sample" \    
<    -F':content={ "jcr:primaryType": "nt:unstructured", "propOne" : "propOneValue", "childOne" : { "childPropOne" : true } }' \    
---
> <pre><code>$ curl -F&quot;:operation=import&quot; -F&quot;:contentType=json&quot; -F&quot;:name=sample&quot; \    
>    -F&#39;:content={ &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;, &quot;propOne&quot; : &quot;propOneValue&quot;, &quot;childOne&quot; : { &quot;childPropOne&quot; : true } }&#39; \    
780,781c786,787
< <pre><code>$ curl -F":operation=import" -F":contentType=json"
<    -F':content={ "sample" : {"propOne" : "propOneValue", "childOne" : { "childPropOne" : true } } }' \    
---
> <pre><code>$ curl -F&quot;:operation=import&quot; -F&quot;:contentType=json&quot;
>    -F&#39;:content={ &quot;sample&quot; : {&quot;propOne&quot; : &quot;propOneValue&quot;, &quot;childOne&quot; : { &quot;childPropOne&quot; : true } } }&#39; \    
785,788c791,794
< <pre><code>&lt;form method="POST" action="/content" enctype="multipart/form-data"&gt;
<     &lt;input type="hidden" name=":operation" value="import" /&gt;
<     &lt;input type="hidden" name=":contentType" value="json" /&gt;
<     &lt;input type="hidden" name=":nameHint" value="sample" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;:operation&quot; value=&quot;import&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;:contentType&quot; value=&quot;json&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;:nameHint&quot; value=&quot;sample&quot; /&gt;
790,791c796,797
<     &lt;input type="text" name=":content" value="{ &amp;quot;jcr:primaryType&amp;quot; : &amp;quot;nt:unstructured&amp;quot; , &amp;quot;propOne&amp;quot; : &amp;quot;propOneValue&amp;quot;, &amp;quot;childOne&amp;quot; : { &amp;quot;childPropOne&amp;quot; : true } }" /&gt;
<     &lt;input type="Submit" /&gt;
---
>     &lt;input type=&quot;text&quot; name=&quot;:content&quot; value=&quot;{ &amp;quot;jcr:primaryType&amp;quot; : &amp;quot;nt:unstructured&amp;quot; , &amp;quot;propOne&amp;quot; : &amp;quot;propOneValue&amp;quot;, &amp;quot;childOne&amp;quot; : { &amp;quot;childPropOne&amp;quot; : true } }&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
795,798c801,804
< <pre><code>&lt;form method="POST" action="/content" enctype="multipart/form-data"&gt;
<     &lt;input type="hidden" name=":operation" value="import" /&gt;
<     &lt;input type="hidden" name=":contentType" value="json" /&gt;
<     &lt;input type="hidden" name=":nameHint" value="sample" /&gt;
---
> <pre><code>&lt;form method=&quot;POST&quot; action=&quot;/content&quot; enctype=&quot;multipart/form-data&quot;&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;:operation&quot; value=&quot;import&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;:contentType&quot; value=&quot;json&quot; /&gt;
>     &lt;input type=&quot;hidden&quot; name=&quot;:nameHint&quot; value=&quot;sample&quot; /&gt;
800,801c806,807
<     &lt;input type="file" name=":contentFile" /&gt;
<     &lt;input type="Submit" /&gt;
---
>     &lt;input type=&quot;file&quot; name=&quot;:contentFile&quot; /&gt;
>     &lt;input type=&quot;Submit&quot; /&gt;
804c810
< <h6><a href="#response-status" id="response-status">Response Status</a></h6> 
---
> <h6><a href="#response-status" name="response-status">Response Status</a></h6>
809,810c815,816
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
815,816c821,822
<    <td> 200/OK </td>
<    <td> All requested content has been imported </td>
---
>       <td>200/OK </td>
>       <td>All requested content has been imported </td>
819,820c825,826
<    <td> 404/NOT FOUND </td>
<    <td> The target parent node does not exist </td>
---
>       <td>404/NOT FOUND </td>
>       <td>The target parent node does not exist </td>
823,824c829,830
<    <td> 412/PRECONDITION FAILED </td>
<    <td> One or more of the required parameters does not exist </td>
---
>       <td>412/PRECONDITION FAILED </td>
>       <td>One or more of the required parameters does not exist </td>
827,828c833,834
<    <td> 500/INTERNAL SERVER ERROR </td>
<    <td> Some exception, for example a <code>RepositoryException</code>, occurred while processing the request. This status is also set if the ContentImporter service is missing. </td>
---
>       <td>500/INTERNAL SERVER ERROR </td>
>       <td>Some exception, for example a <code>RepositoryException</code>, occurred while processing the request. This status is also set if the ContentImporter service is missing. </td>
832c838
< <h3><a href="#null-operation" id="null-operation">Null Operation</a></h3> 
---
> <h3><a href="#null-operation" name="null-operation">Null Operation</a></h3>
835c841
< <h6><a href="#response-status" id="response-status">Response Status</a></h6> 
---
> <h6><a href="#response-status" name="response-status">Response Status</a></h6>
840,841c846,847
<    <th> Status </th>
<    <th> Explanation </th>
---
>       <th>Status </th>
>       <th>Explanation </th>
846,847c852,853
<    <td> 200/OK </td>
<    <td> Default status set if <code>:nopstatus</code> parameter is not set or does not have a valid value </td>
---
>       <td>200/OK </td>
>       <td>Default status set if <code>:nopstatus</code> parameter is not set or does not have a valid value </td>
850,851c856,857
<    <td> {:nopstatus} </td>
<    <td> The status as requested by the <code>:nopstatus</code> parameter </td>
---
>       <td>{:nopstatus} </td>
>       <td>The status as requested by the <code>:nopstatus</code> parameter </td>
855c861
< <h2><a href="#special-parameters" id="special-parameters">Special Parameters</a></h2> 
---
> <h2><a href="#special-parameters" name="special-parameters">Special Parameters</a></h2>
857c863
< <h3><a href="#order" id="order"><code>:order</code></a></h3> 
---
> <h3><a href="#order" name="order">:order</a></h3>
863,864c869,870
<    <th> Value </th>
<    <th> Description </th>
---
>       <th>Value </th>
>       <th>Description </th>
869,870c875,876
<    <td> <code>first</code> </td>
<    <td> Place the target node as the first amongst its siblings </td>
---
>       <td><code>first</code> </td>
>       <td>Place the target node as the first amongst its siblings </td>
873,874c879,880
<    <td> <code>last</code> </td>
<    <td> Place the target node as the last amongst its siblings </td>
---
>       <td><code>last</code> </td>
>       <td>Place the target node as the last amongst its siblings </td>
877,878c883,884
<    <td> <code>before *xyz*</code> </td>
<    <td> Place the target node immediately before the sibling whose name is <em>xyz</em> </td>
---
>       <td><code>before *xyz*</code> </td>
>       <td>Place the target node immediately before the sibling whose name is <em>xyz</em> </td>
881,882c887,888
<    <td> <code>after *xyz*</code> </td>
<    <td> Place the target node immediately after the sibling whose name is <em>xyz</em> </td>
---
>       <td><code>after *xyz*</code> </td>
>       <td>Place the target node immediately after the sibling whose name is <em>xyz</em> </td>
885,886c891,892
<    <td> numeric </td>
<    <td> Place the target node at the indicated numeric place amongst its siblings where <em>0</em> is equivalent to <code>first</code> and <em>1</em> means the second place </td>
---
>       <td>numeric </td>
>       <td>Place the target node at the indicated numeric place amongst its siblings where <em>0</em> is equivalent to <code>first</code> and <em>1</em> means the second place </td>
891c897
< <pre><code>$ curl -F":order=before other" http://host/content/sample/page5
---
> <pre><code>$ curl -F&quot;:order=before other&quot; http://host/content/sample/page5
894c900
< <h3><a href="#redirect" id="redirect"><code>:redirect</code></a></h3> 
---
> <h3><a href="#redirect" name="redirect">:redirect</a></h3>
896c902
< <h3><a href="#status" id="status"><code>:status</code></a></h3> 
---
> <h3><a href="#status" name="status">:status</a></h3>
899c905
< <h2><a href="#response-format" id="response-format">Response format</a></h2> 
---
> <h2><a href="#response-format" name="response-format">Response format</a></h2>
904,905c910,911
<  <li>Accept: text/html,application/xhtml+xml,application/xml;q=0.9,<strong>/</strong>;q=0.8</li> 
<  <li>Accept: application/json,<strong>/</strong>;q=0.9</li> 
---
>   <li>Accept: text/html,application/xhtml+xml,application/xml;q=0.9,**/**;q=0.8</li>
>   <li>Accept: application/json,**/**;q=0.9</li>
909c915
< <h2><a href="#versionable-node-support" id="versionable-node-support">Versionable Node Support</a></h2> 
---
> <h2><a href="#versionable-node-support" name="versionable-node-support">Versionable Node Support</a></h2>
917c923
< <p><img src="http://sling.apache.org/2010-07-01_1036.png" alt=""></p> 
---
> <p><img src="2010-07-01_1036.png" /></p>
925,926c931,932
< <h2><a href="#extending-the-slingpostservlet" id="extending-the-slingpostservlet">Extending the SlingPostServlet</a></h2> 
< <h3><a href="#additional-post-operations" id="additional-post-operations">Additional POST operations</a></h3> 
---
> <h2><a href="#extending-the-slingpostservlet" name="extending-the-slingpostservlet">Extending the SlingPostServlet</a></h2>
> <h3><a href="#additional-post-operations" name="additional-post-operations">Additional POST operations</a></h3>
931c937
< <h3><a href="#slingpostprocessor" id="slingpostprocessor">SlingPostProcessor</a></h3> 
---
> <h3><a href="#slingpostprocessor" name="slingpostprocessor">SlingPostProcessor</a></h3>
diff -b -B -r ./documentation/bundles/metrics.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/metrics.html
94,95c94,95
< <div class="row"><div class="small-12 columns"><section class="wrap"><p>Sling Metrics bundle provides integration with <a href="http://metrics.dropwizard.io/">Dropwizard Metrics</a> library which provides a toolkit to capture runtime performance statistics in your application.</p> 
< <h2><a href="#features" id="features">Features</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><p>Sling Metrics bundle provides integration with <a href="http://metrics.dropwizard.io/">Dropwizard Metrics</a> library which provides a toolkit to capture runtime performance statistics in your application. </p>
> <h2><a href="#features" name="features">Features</a></h2>
101c101
< <h2><a href="#basic-usage" id="basic-usage">Basic Usage</a></h2> 
---
> <h2><a href="#basic-usage" name="basic-usage">Basic Usage</a></h2>
112c112
<     counter = metricsService.counter("sessionCounter");
---
>     counter = metricsService.counter(&quot;sessionCounter&quot;);
126c126
< <h2><a href="#best-practices" id="best-practices">Best Practices</a></h2> 
---
> <h2><a href="#best-practices" name="best-practices">Best Practices</a></h2>
131,132c131,132
< <h2><a href="#api" id="api">API</a></h2> 
< <p>Sling Metrics bundle provides its own Metric classes which are modelled on <a href="http://metrics.dropwizard.io/">Dropwizard Metrics</a> library. The metric interfaces defined by Sling bundle only provides methods related to data collection.</p> 
---
> <h2><a href="#api" name="api">API</a></h2>
> <p>Sling Metrics bundle provides its own Metric classes which are modelled on <a href="http://metrics.dropwizard.io/">Dropwizard Metrics</a> library. The metric interfaces defined by Sling bundle only provides methods related to data collection. </p>
140c140
< <h3><a href="#requirement-of-wrapper-interfaces" id="requirement-of-wrapper-interfaces">Requirement of wrapper interfaces</a></h3> 
---
> <h3><a href="#requirement-of-wrapper-interfaces" name="requirement-of-wrapper-interfaces">Requirement of wrapper interfaces</a></h3>
146c146
< <h3><a href="#access-to-dropwizard-metrics-api" id="access-to-dropwizard-metrics-api">Access to Dropwizard Metrics API</a></h3> 
---
> <h3><a href="#access-to-dropwizard-metrics-api" name="access-to-dropwizard-metrics-api">Access to Dropwizard Metrics API</a></h3>
148c148
< <pre><code><!-- TODO syntax marker (::java) disabled -->@Reference(target = "(name=sling)")
---
> <pre><code><!-- TODO syntax marker (::java) disabled -->@Reference(target = &quot;(name=sling)&quot;)
154c154
< Counter counter = metricService.counter("login");
---
> Counter counter = metricService.counter(&quot;login&quot;);
157,159c157,159
< <h2><a href="#webconsole-plugin" id="webconsole-plugin">WebConsole Plugin</a></h2> 
< <p>A Web Console plugin is also provided which is accessible at http://localhost:8080/system/console/slingmetrics. It lists down all registered Metric instances and their state.</p> 
< <p><img src="http://sling.apache.org/documentation/bundles/metric-web-console.png" alt="Metric Plugin"></p> 
---
> <h2><a href="#webconsole-plugin" name="webconsole-plugin">WebConsole Plugin</a></h2>
> <p>A Web Console plugin is also provided which is accessible at http://localhost:8080/system/console/slingmetrics. It lists down all registered Metric instances and their state. </p>
> <p><img src="/documentation/bundles/metric-web-console.png" alt="Metric Plugin" /></p>
161c161
< <h2><a href="#installation" id="installation">Installation</a></h2> 
---
> <h2><a href="#installation" name="installation">Installation</a></h2>
diff -b -B -r ./documentation/bundles/mime-type-support-commons-mime.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/mime-type-support-commons-mime.html
97c97
< <h2><a href="#servlet-api-support" id="servlet-api-support">Servlet API Support</a></h2> 
---
> <h2><a href="#servlet-api-support" name="servlet-api-support">Servlet API Support</a></h2>
103c103
< <h2><a href="#the-sling-mimetypeservice" id="the-sling-mimetypeservice">The Sling MimeTypeService</a></h2> 
---
> <h2><a href="#the-sling-mimetypeservice" name="the-sling-mimetypeservice">The Sling MimeTypeService</a></h2>
115c115
< <h2><a href="#the-sling-contentawaremimetypeservice" id="the-sling-contentawaremimetypeservice">The Sling ContentAwareMimeTypeService</a></h2> 
---
> <h2><a href="#the-sling-contentawaremimetypeservice" name="the-sling-contentawaremimetypeservice">The Sling ContentAwareMimeTypeService</a></h2>
120c120
< <h2><a href="#and-more" id="and-more">And More...</a></h2> 
---
> <h2><a href="#and-more-" name="and-more-">And More...</a></h2>
127c127
< <h2><a href="#configuring-mime-type-mappings" id="configuring-mime-type-mappings">Configuring MIME Type Mappings</a></h2> 
---
> <h2><a href="#configuring-mime-type-mappings" name="configuring-mime-type-mappings">Configuring MIME Type Mappings</a></h2>
145c145
< <h2><a href="#mime-type-mapping-file-format" id="mime-type-mapping-file-format">MIME Type Mapping File Format</a></h2> 
---
> <h2><a href="#mime-type-mapping-file-format" name="mime-type-mapping-file-format">MIME Type Mapping File Format</a></h2>
149c149,150
<  <li>The files consist of lines defining mappings where each line is terminated with either or both of a carriage return (CR, 0x0c) and line feed character (LF, 0x0a). There is no line continuation support *-la shell scripts or Java properties files.</li> 
---
>   <li>The files consist of lines defining mappings where each line is terminated with either or both of a carriage return (CR, 0x0c) and line feed character (LF, 0x0a). There is no line continuation support *-la shell scripts or Java properties files.
> </li>
154c155
< <h2><a href="#web-console-plugin" id="web-console-plugin">Web Console Plugin</a></h2> 
---
> <h2><a href="#web-console-plugin" name="web-console-plugin">Web Console Plugin</a></h2>
156c157
< <p><img src="http://sling.apache.org/documentation/bundles/mimetypes.png" alt="Mime Types Web Console Plugin"></p></section></div></div>            
---
> <p><img src="/documentation/bundles/mimetypes.png" alt="Mime Types Web Console Plugin" /></p></section></div></div>            
diff -b -B -r ./documentation/bundles/models.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/models.html
97c97
< <h1><a href="#design-goals" id="design-goals">Design Goals</a></h1> 
---
> <h1><a href="#design-goals" name="design-goals">Design Goals</a></h1>
108c108
< <h1><a href="#basic-usage" id="basic-usage">Basic Usage</a></h1> 
---
> <h1><a href="#basic-usage" name="basic-usage">Basic Usage</a></h1>
130c130
<     public MyModel(@Named("propertyName") String propertyName) {
---
>     public MyModel(@Named(&quot;propertyName&quot;) String propertyName) {
149,150c149,150
< <h1><a href="#client-code" id="client-code">Client Code</a></h1> 
< <h2><a href="#adaptto" id="adaptto">adaptTo()</a></h2> 
---
> <h1><a href="#client-code" name="client-code">Client Code</a></h1>
> <h2><a href="#adaptto-" name="adaptto-">adaptTo()</a></h2>
155c155
< <pre><code><!-- TODO syntax marker (::jsp) disabled -->&lt;sling:adaptTo adaptable="${resource}" adaptTo="org.apache.sling.models.it.models.MyModel" var="model"/&gt;
---
> <pre><code><!-- TODO syntax marker (::jsp) disabled -->&lt;sling:adaptTo adaptable=&quot;${resource}&quot; adaptTo=&quot;org.apache.sling.models.it.models.MyModel&quot; var=&quot;model&quot;/&gt;
158c158
< <pre><code><!-- TODO syntax marker (::jsp) disabled -->${sling:adaptTo(resource, 'org.apache.sling.models.it.models.MyModel')}
---
> <pre><code><!-- TODO syntax marker (::jsp) disabled -->${sling:adaptTo(resource, &#39;org.apache.sling.models.it.models.MyModel&#39;)}
161c161
< <h2><a href="#modelfactory-since-120" id="modelfactory-since-120">ModelFactory (since 1.2.0)</a></h2> 
---
> <h2><a href="#modelfactory-since-1-2-0-" name="modelfactory-since-1-2-0-">ModelFactory (since 1.2.0)</a></h2>
173,174c173,174
< <h1><a href="#other-options" id="other-options">Other Options</a></h1> 
< <h2><a href="#names" id="names">Names</a></h2> 
---
> <h1><a href="#other-options" name="other-options">Other Options</a></h1>
> <h2><a href="#names" name="names">Names</a></h2>
179c179
<     @Inject @Named("secondPropertyName")
---
>     @Inject @Named(&quot;secondPropertyName&quot;)
183c183
< <h2><a href="#optional-and-required" id="optional-and-required">Optional and Required</a></h2> 
---
> <h2><a href="#optional-and-required" name="optional-and-required">Optional and Required</a></h2>
202c202
< <h2><a href="#defaults" id="defaults">Defaults</a></h2> 
---
> <h2><a href="#defaults" name="defaults">Defaults</a></h2>
207c207
<     @Inject @Default(values="defaultValue")
---
>     @Inject @Default(values=&quot;defaultValue&quot;)
228c228
< <h2><a href="#collections" id="collections">Collections</a></h2> 
---
> <h2><a href="#collections" name="collections">Collections</a></h2>
255c255
< <h2><a href="#osgi-service-filters" id="osgi-service-filters">OSGi Service Filters</a></h2> 
---
> <h2><a href="#osgi-service-filters" name="osgi-service-filters">OSGi Service Filters</a></h2>
264c264
<     @Named("log")
---
>     @Named(&quot;log&quot;)
268c268
<     @Filter("(paths=/bin/something)")
---
>     @Filter(&quot;(paths=/bin/something)&quot;)
272c272
< <h2><a href="#postconstruct-methods" id="postconstruct-methods">PostConstruct Methods</a></h2> 
---
> <h2><a href="#postconstruct-methods" name="postconstruct-methods">PostConstruct Methods</a></h2>
281c281
<     @Named("log")
---
>     @Named(&quot;log&quot;)
286c286
<          logger.info("hello");
---
>          logger.info(&quot;hello&quot;);
292c292
< <h2><a href="#via" id="via">Via</a></h2> 
---
> <h2><a href="#via" name="via">Via</a></h2>
297,298c297,298
<     // will return request.getResource().getValueMap().get("propertyName", String.class)
<     @Inject @Via("resource")
---
>     // will return request.getResource().getValueMap().get(&quot;propertyName&quot;, String.class)
>     @Inject @Via(&quot;resource&quot;)
306,307c306,307
< 	// will return resource.getChild("jcr:content").getValueMap().get("propertyName", String.class)
<     @Inject @Via(value = "jcr:content", type = ChildResource.class)
---
>     // will return resource.getChild(&quot;jcr:content&quot;).getValueMap().get(&quot;propertyName&quot;, String.class)
>     @Inject @Via(value = &quot;jcr:content&quot;, type = ChildResource.class)
313c313
< <h2><a href="#source" id="source">Source</a></h2> 
---
> <h2><a href="#source" name="source">Source</a></h2>
318,319c318,319
<     // Ensure that "resource" is retrived from the bindings, not a request attribute 
<     @Inject @Source("script-bindings")
---
>     // Ensure that &quot;resource&quot; is retrived from the bindings, not a request attribute 
>     @Inject @Source(&quot;script-bindings&quot;)
323c323
< <h2><a href="#adaptations" id="adaptations">Adaptations</a></h2> 
---
> <h2><a href="#adaptations" name="adaptations">Adaptations</a></h2>
354,355c354,356
< <h2><a href="#sling-validation-since-120" id="sling-validation-since-120">Sling Validation (since 1.2.0)</a></h2> 
< <p><a name="validation"></a> <em>See also <a href="https://issues.apache.org/jira/browse/SLING-4161">SLING-4161</a></em></p> 
---
> <h2><a href="#sling-validation-since-1-2-0-" name="sling-validation-since-1-2-0-">Sling Validation (since 1.2.0)</a></h2>
> <a name="validation" />
> <p><em>See also <a href="https://issues.apache.org/jira/browse/SLING-4161">SLING-4161</a></em></p>
361,364c362,365
<    <th> Description </th>
<    <th> Invalid validation model </th>
<    <th> No validation model found </th>
<    <th> Resource invalid according to model</th>
---
>       <th>Description </th>
>       <th>Invalid validation model </th>
>       <th>No validation model found </th>
>       <th>Resource invalid according to model</th>
370,373c371,374
<    <td> don't validate the resource bound to the Model </td>
<    <td> Model instantiated </td>
<    <td> Model instantiated </td>
<    <td> Model instantiated</td>
---
>       <td>don't validate the resource bound to the Model </td>
>       <td>Model instantiated </td>
>       <td>Model instantiated </td>
>       <td>Model instantiated</td>
377,380c378,381
<    <td> enforce validation of the resource bound to the Model </td>
<    <td> Model not instantiated </td>
<    <td> Model not instantiated </td>
<    <td> Model not instantiated</td>
---
>       <td>enforce validation of the resource bound to the Model </td>
>       <td>Model not instantiated </td>
>       <td>Model not instantiated </td>
>       <td>Model not instantiated</td>
384,387c385,388
<    <td> validate the resource bound to the Model (if a validation model is found) </td>
<    <td> Model not instantiated </td>
<    <td> Model instantiated </td>
<    <td> Model not instantiated</td>
---
>       <td>validate the resource bound to the Model (if a validation model is found) </td>
>       <td>Model not instantiated </td>
>       <td>Model instantiated </td>
>       <td>Model not instantiated</td>
393c394
< <h1><a href="#custom-injectors" id="custom-injectors">Custom Injectors</a></h1> 
---
> <h1><a href="#custom-injectors" name="custom-injectors">Custom Injectors</a></h1>
396c397
< <h1><a href="#annotation-reference" id="annotation-reference">Annotation Reference</a></h1> 
---
> <h1><a href="#annotation-reference" name="annotation-reference">Annotation Reference</a></h1>
409c410
< <h1><a href="#available-injectors" id="available-injectors">Available Injectors</a></h1> 
---
> <h1><a href="#available-injectors" name="available-injectors">Available Injectors</a></h1>
414,421c415,422
<    <th> Name (for <code>@Source</code>) </th>
<    <th> Service Ranking </th>
<    <th> Available Since (Implementation Version) </th>
<    <th> Description </th>
<    <th> Applicable To (including using <code>@Via</code>) </th>
<    <th> Accepts Null Name? </th>
<    <th> Array Support </th>
<    <th> Parameterized Type Support</th>
---
>       <th>Name (for <code>@Source</code>) </th>
>       <th>Service Ranking </th>
>       <th>Available Since (Implementation Version) </th>
>       <th>Description </th>
>       <th>Applicable To (including using <code>@Via</code>) </th>
>       <th>Accepts Null Name? </th>
>       <th>Array Support </th>
>       <th>Parameterized Type Support</th>
427,434c428,435
<    <td> <code>script-bindings</code> </td>
<    <td> 1000 </td>
<    <td> 1.0.0 </td>
<    <td> Lookup objects in the script bindings object by name. </td>
<    <td> A ServletRequest object which has the <code>Sling Bindings</code> attribute defined </td>
<    <td> no </td>
<    <td> no conversion is done </td>
<    <td> If a parameterized type is passed, the bindings value must be of a compatible type of the parameterized type.</td>
---
>       <td><code>script-bindings</code> </td>
>       <td>1000 </td>
>       <td>1.0.0 </td>
>       <td>Lookup objects in the script bindings object by name. </td>
>       <td>A ServletRequest object which has the <code>Sling Bindings</code> attribute defined </td>
>       <td>no </td>
>       <td>no conversion is done </td>
>       <td>If a parameterized type is passed, the bindings value must be of a compatible type of the parameterized type.</td>
438,445c439,446
<    <td> <code>valuemap</code> </td>
<    <td> 2000 </td>
<    <td> 1.0.0 </td>
<    <td> Gets a property from a <code>ValueMap</code> by name. </td>
<    <td> Any object which is or can be adapted to a <code>ValueMap</code></td>
<    <td> no </td>
<    <td> Primitive arrays wrapped/unwrapped as necessary. Wrapper object arrays are unwrapped/wrapped as necessary. </td>
<    <td> Parameterized <code>List</code> and <code>Collection</code> injection points are injected by getting an array of the component type and creating an unmodifiable <code>List</code> from the array.</td>
---
>       <td><code>valuemap</code> </td>
>       <td>2000 </td>
>       <td>1.0.0 </td>
>       <td>Gets a property from a <code>ValueMap</code> by name. </td>
>       <td>Any object which is or can be adapted to a <code>ValueMap</code></td>
>       <td>no </td>
>       <td>Primitive arrays wrapped/unwrapped as necessary. Wrapper object arrays are unwrapped/wrapped as necessary. </td>
>       <td>Parameterized <code>List</code> and <code>Collection</code> injection points are injected by getting an array of the component type and creating an unmodifiable <code>List</code> from the array.</td>
449,456c450,457
<    <td> <code>child-resources</code> </td>
<    <td> 3000 </td>
<    <td> 1.0.0 </td>
<    <td> Gets a child resource by name. </td>
<    <td> <code>Resource</code> objects </td>
<    <td> no </td>
<    <td> none </td>
<    <td> if a parameterized type <code>List</code> or <code>Collection</code> is passed, a <code>List&lt;Resource&gt;</code> is returned (the contents of which may be adapted to the target type) filled with all child resources of the resource looked up by the given name.</td>
---
>       <td><code>child-resources</code> </td>
>       <td>3000 </td>
>       <td>1.0.0 </td>
>       <td>Gets a child resource by name. </td>
>       <td><code>Resource</code> objects </td>
>       <td>no </td>
>       <td>none </td>
>       <td>if a parameterized type <code>List</code> or <code>Collection</code> is passed, a <code>List&lt;Resource&gt;</code> is returned (the contents of which may be adapted to the target type) filled with all child resources of the resource looked up by the given name.</td>
460,467c461,468
<    <td> <code>request-attributes</code> </td>
<    <td> 4000 </td>
<    <td> 1.0.0 </td>
<    <td> Get a request attribute by name. </td>
<    <td> <code>ServletRequest</code> objects </td>
<    <td> no </td>
<    <td> no conversion is done </td>
<    <td> If a parameterized type is passed, the request attribute must be of a compatible type of the parameterized type.</td>
---
>       <td><code>request-attributes</code> </td>
>       <td>4000 </td>
>       <td>1.0.0 </td>
>       <td>Get a request attribute by name. </td>
>       <td><code>ServletRequest</code> objects </td>
>       <td>no </td>
>       <td>no conversion is done </td>
>       <td>If a parameterized type is passed, the request attribute must be of a compatible type of the parameterized type.</td>
471,478c472,479
<    <td> <code>osgi-services</code> </td>
<    <td> 5000 </td>
<    <td> 1.0.0 </td>
<    <td> Lookup services based on class name. Since Sling Models Impl 1.2.8 (<a href="https://issues.apache.org/jira/browse/SLING-5664">SLING-5664</a>) the service with the highest service ranking is returned. In case multiple services are returned, they are ordered descending by their service ranking (i.e. the one with the highest ranking first). </td>
<    <td> Any object </td>
<    <td> yes </td>
<    <td> yes </td>
<    <td> Parameterized <code>List</code> and <code>Collection</code> injection points are injected by getting an array of the services and creating an unmodifiable <code>List</code> from the array.</td>
---
>       <td><code>osgi-services</code> </td>
>       <td>5000 </td>
>       <td>1.0.0 </td>
>       <td>Lookup services based on class name. Since Sling Models Impl 1.2.8 (<a href="https://issues.apache.org/jira/browse/SLING-5664">SLING-5664</a>) the service with the highest service ranking is returned. In case multiple services are returned, they are ordered descending by their service ranking (i.e. the one with the highest ranking first). </td>
>       <td>Any object </td>
>       <td>yes </td>
>       <td>yes </td>
>       <td>Parameterized <code>List</code> and <code>Collection</code> injection points are injected by getting an array of the services and creating an unmodifiable <code>List</code> from the array.</td>
482,489c483,490
<    <td> <code>resource-path</code> </td>
<    <td> 2500 </td>
<    <td> 1.1.0 </td>
<    <td> Injects one or multiple resources. The resource paths are either given by <code>@Path</code> annotations, the element <code>path</code> or <code>paths</code> of the annotation <code>@ResourcePath</code> or by paths given through a resource property being referenced by either <code>@Named</code> or element <code>name</code> of the annotation <code>@ResourcePath</code>. </td>
<    <td> <code>Resource</code> or <code>SlingHttpServletRequest</code> objects </td>
<    <td> yes </td>
<    <td> yes </td>
<    <td> none</td>
---
>       <td><code>resource-path</code> </td>
>       <td>2500 </td>
>       <td>1.1.0 </td>
>       <td>Injects one or multiple resources. The resource paths are either given by <code>@Path</code> annotations, the element <code>path</code> or <code>paths</code> of the annotation <code>@ResourcePath</code> or by paths given through a resource property being referenced by either <code>@Named</code> or element <code>name</code> of the annotation <code>@ResourcePath</code>. </td>
>       <td><code>Resource</code> or <code>SlingHttpServletRequest</code> objects </td>
>       <td>yes </td>
>       <td>yes </td>
>       <td>none</td>
493,500c494,501
<    <td> <code>self</code> </td>
<    <td> <code>Integer.MAX_VALUE</code> </td>
<    <td> 1.1.0 </td>
<    <td> Injects the adaptable object itself (if the class of the field matches or is a supertype). If the @Self annotation is present it is tried to adapt the adaptable to the field type. </td>
<    <td> Any object </td>
<    <td> yes </td>
<    <td> none </td>
<    <td> none</td>
---
>       <td><code>self</code> </td>
>       <td><code>Integer.MAX_VALUE</code> </td>
>       <td>1.1.0 </td>
>       <td>Injects the adaptable object itself (if the class of the field matches or is a supertype). If the @Self annotation is present it is tried to adapt the adaptable to the field type. </td>
>       <td>Any object </td>
>       <td>yes </td>
>       <td>none </td>
>       <td>none</td>
504,511c505,512
<    <td> <code>sling-object</code> </td>
<    <td> <code>Integer.MAX_VALUE</code> </td>
<    <td> 1.1.0 </td>
<    <td> Injects commonly used sling objects if the field matches with the class: request, response, resource resolver, current resource, SlingScriptHelper. This works only if the adaptable can get the according information, i.e. all objects are available via <code>SlingHttpServletRequest</code> while <code>ResourceResolver</code> can only resolve the <code>ResourceResolver</code> object and nothing else. A discussion around this limitation can be found at <a href="https://issues.apache.org/jira/browse/SLING-4083">SLING-4083</a>. Also <code>Resource</code>s can only be injected if the according injector-specific annotation is used (<code>@SlingObject</code>). </td>
<    <td> <code>Resource</code>, <code>ResourceResolver</code> or <code>SlingHttpServletRequest</code> objects (not all objects can be resolved by all adaptables). </td>
<    <td> yes </td>
<    <td> none </td>
<    <td> none</td>
---
>       <td><code>sling-object</code> </td>
>       <td><code>Integer.MAX_VALUE</code> </td>
>       <td>1.1.0 </td>
>       <td>Injects commonly used sling objects if the field matches with the class: request, response, resource resolver, current resource, SlingScriptHelper. This works only if the adaptable can get the according information, i.e. all objects are available via <code>SlingHttpServletRequest</code> while <code>ResourceResolver</code> can only resolve the <code>ResourceResolver</code> object and nothing else. A discussion around this limitation can be found at <a href="https://issues.apache.org/jira/browse/SLING-4083">SLING-4083</a>. Also <code>Resource</code>s can only be injected if the according injector-specific annotation is used (<code>@SlingObject</code>). </td>
>       <td><code>Resource</code>, <code>ResourceResolver</code> or <code>SlingHttpServletRequest</code> objects (not all objects can be resolved by all adaptables). </td>
>       <td>yes </td>
>       <td>none </td>
>       <td>none</td>
515c516
< <h1><a href="#injector-specific-annotations" id="injector-specific-annotations">Injector-specific Annotations</a></h1> 
---
> <h1><a href="#injector-specific-annotations" name="injector-specific-annotations">Injector-specific Annotations</a></h1>
528,530c529,531
<    <th> Supported Optional Elements </th>
<    <th> Injector </th>
<    <th> Description</th>
---
>       <th>Supported Optional Elements </th>
>       <th>Injector </th>
>       <th>Description</th>
536,538c537,539
<    <td> <code>injectionStrategy</code> and <code>name</code> </td>
<    <td> <code>script-bindings</code> </td>
<    <td> Injects the script variable defined via <a href="https://cwiki.apache.org/confluence/display/SLING/Scripting+variables">Sling Bindings</a>. If <code>name</code> is not set the name is derived from the method/field name.</td>
---
>       <td><code>injectionStrategy</code> and <code>name</code> </td>
>       <td><code>script-bindings</code> </td>
>       <td>Injects the script variable defined via <a href="https://cwiki.apache.org/confluence/display/SLING/Scripting+variables">Sling Bindings</a>. If <code>name</code> is not set the name is derived from the method/field name.</td>
542,544c543,545
<    <td> <code>injectionStrategy</code>, <code>name</code> and <code>via</code> </td>
<    <td> <code>valuemap</code> </td>
<    <td> Injects a <code>ValueMap</code> value. If <code>via</code> is not set, it will automatically take <code>resource</code> if the adaptable is the <code>SlingHttpServletRequest</code>. If <code>name</code> is not set the name is derived from the method/field name.</td>
---
>       <td><code>injectionStrategy</code>, <code>name</code> and <code>via</code> </td>
>       <td><code>valuemap</code> </td>
>       <td>Injects a <code>ValueMap</code> value. If <code>via</code> is not set, it will automatically take <code>resource</code> if the adaptable is the <code>SlingHttpServletRequest</code>. If <code>name</code> is not set the name is derived from the method/field name.</td>
548,550c549,551
<    <td> <code>injectionStrategy</code>, <code>name</code> and <code>via</code> </td>
<    <td> <code>child-resources</code> </td>
<    <td> Injects a child resource by name. If <code>via</code> is not set, it will automatically take <code>resource</code> if the adaptable is the <code>SlingHttpServletRequest</code>. If <code>name</code> is not set the name is derived from the method/field name.</td>
---
>       <td><code>injectionStrategy</code>, <code>name</code> and <code>via</code> </td>
>       <td><code>child-resources</code> </td>
>       <td>Injects a child resource by name. If <code>via</code> is not set, it will automatically take <code>resource</code> if the adaptable is the <code>SlingHttpServletRequest</code>. If <code>name</code> is not set the name is derived from the method/field name.</td>
554,556c555,557
<    <td> <code>injectionStrategy</code>, <code>name</code> and <code>via</code> </td>
<    <td> <code>request-attributes</code> </td>
<    <td> Injects a request attribute by name. If <code>name</code> is not set the name is derived from the method/field name.</td>
---
>       <td><code>injectionStrategy</code>, <code>name</code> and <code>via</code> </td>
>       <td><code>request-attributes</code> </td>
>       <td>Injects a request attribute by name. If <code>name</code> is not set the name is derived from the method/field name.</td>
560,562c561,563
<    <td> <code>injectionStrategy</code>, <code>path</code>, and <code>name</code> </td>
<    <td> <code>resource-path</code> </td>
<    <td> Injects a resource either by path or by reading a property with the given name.</td>
---
>       <td><code>injectionStrategy</code>, <code>path</code>, and <code>name</code> </td>
>       <td><code>resource-path</code> </td>
>       <td>Injects a resource either by path or by reading a property with the given name.</td>
566,568c567,569
<    <td> <code>injectionStrategy</code>, <code>filter</code> </td>
<    <td> <code>osgi-services</code> </td>
<    <td> Injects an OSGi service by type. The <code>filter</code> can be used give an OSGi service filter.</td>
---
>       <td><code>injectionStrategy</code>, <code>filter</code> </td>
>       <td><code>osgi-services</code> </td>
>       <td>Injects an OSGi service by type. The <code>filter</code> can be used give an OSGi service filter.</td>
572,574c573,575
<    <td> <code>injectionStrategy</code> </td>
<    <td> <code>self</code> </td>
<    <td> Injects the adaptable itself. If the field type does not match with the adaptable it is tried to adapt the adaptable to the requested type.</td>
---
>       <td><code>injectionStrategy</code> </td>
>       <td><code>self</code> </td>
>       <td>Injects the adaptable itself. If the field type does not match with the adaptable it is tried to adapt the adaptable to the requested type.</td>
578,579c579,580
<    <td> <code>injectionStrategy</code> </td>
<    <td> <code>sling-object</code> </td>
---
>       <td><code>injectionStrategy</code> </td>
>       <td><code>sling-object</code> </td>
584c585
< <h2><a href="#hints" id="hints">Hints</a></h2> 
---
> <h2><a href="#hints" name="hints">Hints</a></h2>
586c587
< <h2><a href="#custom-annotations" id="custom-annotations">Custom Annotations</a></h2> 
---
> <h2><a href="#custom-annotations" name="custom-annotations">Custom Annotations</a></h2>
588c589
< <h1><a href="#specifying-an-alternate-adapter-class-since-110" id="specifying-an-alternate-adapter-class-since-110">Specifying an Alternate Adapter Class (since 1.1.0)</a></h1> 
---
> <h1><a href="#specifying-an-alternate-adapter-class-since-1-1-0-" name="specifying-an-alternate-adapter-class-since-1-1-0-">Specifying an Alternate Adapter Class (since 1.1.0)</a></h1>
599c600
< <h1><a href="#associating-a-model-class-with-a-resource-type-since-130" id="associating-a-model-class-with-a-resource-type-since-130">Associating a Model Class with a Resource Type (since 1.3.0)</a></h1> 
---
> <h1><a href="#associating-a-model-class-with-a-resource-type-since-1-3-0-" name="associating-a-model-class-with-a-resource-type-since-1-3-0-">Associating a Model Class with a Resource Type (since 1.3.0)</a></h1>
604c605
< <h1><a href="#exporter-framework-since-130" id="exporter-framework-since-130">Exporter Framework (since 1.3.0)</a></h1> 
---
> <h1><a href="#exporter-framework-since-1-3-0-" name="exporter-framework-since-1-3-0-">Exporter Framework (since 1.3.0)</a></h1>
614,615c615,616
< <pre><code><!-- TODO syntax marker (::java) disabled -->@Model(adaptable = Resource.class, resourceType = "myco/components/foo")
< @Exporter(name = "jackson", extensions = "json")
---
> <pre><code><!-- TODO syntax marker (::java) disabled -->@Model(adaptable = Resource.class, resourceType = &quot;myco/components/foo&quot;)
> @Exporter(name = &quot;jackson&quot;, extensions = &quot;json&quot;)
618c619
< <h1><a href="#registration-of-sling-models-classes-via-bnd-plugin" id="registration-of-sling-models-classes-via-bnd-plugin">Registration of Sling Models classes via bnd plugin</a></h1> 
---
> <h1><a href="#registration-of-sling-models-classes-via-bnd-plugin" name="registration-of-sling-models-classes-via-bnd-plugin">Registration of Sling Models classes via bnd plugin</a></h1>
647c648
< <h1><a href="#caching" id="caching">Caching</a></h1> 
---
> <h1><a href="#caching" name="caching">Caching</a></h1>
682c683
< <h1><a href="#via-types-since-api-134implementation-140" id="via-types-since-api-134implementation-140">Via Types (Since API 1.3.4/Implementation 1.4.0)</a></h1> 
---
> <h1><a href="#via-types-since-api-1-3-4-implementation-1-4-0-" name="via-types-since-api-1-3-4-implementation-1-4-0-">Via Types (Since API 1.3.4/Implementation 1.4.0)</a></h1>
688c689
<    <th> Description</th>
---
>       <th>Description</th>
694c695
<    <td> Uses a JavaBean property from the adaptable.</td>
---
>       <td>Uses a JavaBean property from the adaptable.</td>
698c699
<    <td> Uses a child resource from the adaptable, assuming the adaptable is a <code>Resource</code>. In case the adaptable is a <code>SlingHttpServletRequest</code> uses a wrapper overwriting the <code>getResource()</code> to point to the given child resource (<a href="https://issues.apache.org/jira/browse/SLING-7321">SLING-7321</a>).</td>
---
>       <td>Uses a child resource from the adaptable, assuming the adaptable is a <code>Resource</code>. In case the adaptable is a <code>SlingHttpServletRequest</code> uses a wrapper overwriting the <code>getResource()</code> to point to the given child resource (<a href="https://issues.apache.org/jira/browse/SLING-7321">SLING-7321</a>).</td>
702c703
<    <td> Creates a wrapped resource with the provided resource type. If the adaptable is a <code>SlingHttpServletRequest</code>, a wrapped request is created as well to contain the wrapped resource.</td>
---
>       <td>Creates a wrapped resource with the provided resource type. If the adaptable is a <code>SlingHttpServletRequest</code>, a wrapped request is created as well to contain the wrapped resource.</td>
706c707
<    <td> Creates a wrapped resource with the resource type set to the adaptable's resource super type. If the adaptable is a <code>SlingHttpServletRequest</code>, a wrapped request is created as well to contain the wrapped resource.</td>
---
>       <td>Creates a wrapped resource with the resource type set to the adaptable's resource super type. If the adaptable is a <code>SlingHttpServletRequest</code>, a wrapped request is created as well to contain the wrapped resource.</td>
710c711
< <h2><a href="#custom-via-type" id="custom-via-type">Custom Via Type</a></h2> 
---
> <h2><a href="#custom-via-type" name="custom-via-type">Custom Via Type</a></h2>
diff -b -B -r ./documentation/bundles/nosql-resource-providers.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/nosql-resource-providers.html
98c98
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
111c111
< <h2><a href="#mongodb-nosql-resource-provider" id="mongodb-nosql-resource-provider">MongoDB NoSQL Resource Provider</a></h2> 
---
> <h2><a href="#mongodb-nosql-resource-provider" name="mongodb-nosql-resource-provider">MongoDB NoSQL Resource Provider</a></h2>
116,119c116,119
<     provider.roots=["/"]
<     connectionString="localhost:27017"
<     database="sling"
<     collection="resources"
---
>     provider.roots=[&quot;/&quot;]
>     connectionString=&quot;localhost:27017&quot;
>     database=&quot;sling&quot;
>     collection=&quot;resources&quot;
124c124
< <h2><a href="#couchbase-nosql-resource-provider" id="couchbase-nosql-resource-provider">Couchbase NoSQL Resource Provider</a></h2> 
---
> <h2><a href="#couchbase-nosql-resource-provider" name="couchbase-nosql-resource-provider">Couchbase NoSQL Resource Provider</a></h2>
129c129
<     provider.roots=["/"]
---
>     provider.roots=[&quot;/&quot;]
132,135c132,135
<     clientId="sling-resourceprovider-couchbase"
<     couchbaseHosts="localhost:8091"
<     bucketName="sling"
<     enabled=B"true"
---
>     clientId=&quot;sling-resourceprovider-couchbase&quot;
>     couchbaseHosts=&quot;localhost:8091&quot;
>     bucketName=&quot;sling&quot;
>     enabled=B&quot;true&quot;
140c140
< <h2><a href="#example-launchpad" id="example-launchpad">Example Launchpad</a></h2> 
---
> <h2><a href="#example-launchpad" name="example-launchpad">Example Launchpad</a></h2>
diff -b -B -r ./documentation/bundles/org-apache-sling-junit-bundles.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/org-apache-sling-junit-bundles.html
94c94
< <div class="row"><div class="small-12 columns"><section class="wrap"><p>This is an overview of the Sling bundles that provide support for server-side JUnit tests.</p> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><p>This is an overview of the Sling bundles that provide support for server-side JUnit tests. </p>
96,97c96,97
< <h2><a href="#orgapacheslingjunitcore-server-side-junit-tests-support" id="orgapacheslingjunitcore-server-side-junit-tests-support">org.apache.sling.junit.core: server-side JUnit tests support</a></h2> 
< <p>This bundle provides a <code>JUnitServlet</code> that runs JUnit tests found in bundles.</p> 
---
> <h2><a href="#org-apache-sling-junit-core-server-side-junit-tests-support" name="org-apache-sling-junit-core-server-side-junit-tests-support">org.apache.sling.junit.core: server-side JUnit tests support</a></h2>
> <p>This bundle provides a <code>JUnitServlet</code> that runs JUnit tests found in bundles. </p>
99c99
<   Note that the JUnitServlet does not require authentication, so it would allow any client to run tests. The servlet can be disabled by configuration if needed, but in general the `/system` path should not be accessible to website visitors anyway. 
---
> Note that the JUnitServlet does not require authentication, so it would allow any client to run tests. The servlet can be disabled by configuration if needed, but in general the `/system` path should not be accessible to website visitors anyway.
102c102
<   For tighter integration with Sling, the alternate `SlingJUnitServlet` is registered with the `sling/junit/testing` resource type and `.junit` selector, if the bundle is running in a Sling system. Using this servlet instead of the plain JUnitServlet also allows Sling authentication to be used for running the tests, and the standard Sling request processing is used, including servlet filters for example. 
---
> For tighter integration with Sling, the alternate `SlingJUnitServlet` is registered with the `sling/junit/testing` resource type and `.junit` selector, if the bundle is running in a Sling system. Using this servlet instead of the plain JUnitServlet also allows Sling authentication to be used for running the tests, and the standard Sling request processing is used, including servlet filters for example.
107,108c107,108
< <h3><a href="#the-teleporterrule" id="the-teleporterrule">The TeleporterRule</a></h3> 
< <p>The <code>TeleporterRule</code> supplied by this bundle (since V1.0.12) makes it easy to write such tests, as it takes care of all the mechanics of</p> 
---
> <h3><a href="#the-teleporterrule" name="the-teleporterrule">The TeleporterRule</a></h3>
> <p>The <code>TeleporterRule</code> supplied by this bundle (since V1.0.12) makes it easy to write such tests, as it takes care of all the mechanics of </p>
117c117
< <p>Using this rule the server-side tests can be mixed with other tests in the source code if that's convenient, it just requires the <code>junit.core</code> and <code>junit.teleporter</code> modules described on this page to create such tests.</p> 
---
> <p>Using this rule the server-side tests can be mixed with other tests in the source code if that's convenient, it just requires the <code>junit.core</code> and <code>junit.teleporter</code> modules described on this page to create such tests. </p>
122c122
<     public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "Launchpad");
---
>     public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), &quot;Launchpad&quot;);
126c126
<         final String pid = "TEST_" + getClass().getName() + UUID.randomUUID();
---
>         final String pid = &quot;TEST_&quot; + getClass().getName() + UUID.randomUUID();
129c129
<         assertNotNull("Teleporter should provide a ConfigurationAdmin", ca);
---
>         assertNotNull(&quot;Teleporter should provide a ConfigurationAdmin&quot;, ca);
132,133c132,133
<         assertNotNull("Expecting to get a Configuration", cfg);
<         assertEquals("Expecting the correct pid", pid, cfg.getPid());
---
>         assertNotNull(&quot;Expecting to get a Configuration&quot;, cfg);
>         assertEquals(&quot;Expecting the correct pid&quot;, pid, cfg.getPid());
137c137
< <p>That's all there is to it, the <code>TeleporterRule</code> takes care of the rest.</p> 
---
> <p>That's all there is to it, the <code>TeleporterRule</code> takes care of the rest. </p>
140c140
< <pre><code>final StringTransformer t = teleporter.getService(StringTransformer.class, "(mode=uppercase)");
---
> <pre><code>final StringTransformer t = teleporter.getService(StringTransformer.class, &quot;(mode=uppercase)&quot;);
146,147c146,147
<   TeleporterRule.forClass(getClass(), "Launchpad")
<   .withResources("/foo/", "/some/other/resource.txt");
---
>   TeleporterRule.forClass(getClass(), &quot;Launchpad&quot;)
>   .withResources(&quot;/foo/&quot;, &quot;/some/other/resource.txt&quot;);
150c150
< <p>This teleporter mechanism is used in our integration tests, search for <code>TeleporterRule</code> in there for examples or look at the <a href="https://github.com/apache/sling-org-apache-sling-launchpad-integration-tests/tree/master/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter"><code>integrationtest.teleporter</code></a> package.</p> 
---
> <p>This teleporter mechanism is used in our integration tests, search for <code>TeleporterRule</code> in there for examples or look at the <a href="https://github.com/apache/sling-org-apache-sling-launchpad-integration-tests/tree/master/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter"><code>integrationtest.teleporter</code></a> package. </p>
152c152
< <h3><a href="#more-details-on-the-junitservlet" id="more-details-on-the-junitservlet">More details on the JUnitServlet</a></h3> 
---
> <h3><a href="#more-details-on-the-junitservlet" name="more-details-on-the-junitservlet">More details on the JUnitServlet</a></h3>
157c157
< <h2><a href="#orgapacheslingjunitteleporter-client-side-teleporterrule-support" id="orgapacheslingjunitteleporter-client-side-teleporterrule-support">org.apache.sling.junit.teleporter: client-side TeleporterRule support</a></h2> 
---
> <h2><a href="#org-apache-sling-junit-teleporter-client-side-teleporterrule-support" name="org-apache-sling-junit-teleporter-client-side-teleporterrule-support">org.apache.sling.junit.teleporter: client-side TeleporterRule support</a></h2>
160c160
< <h3><a href="#teleporterrulecustomizer" id="teleporterrulecustomizer">TeleporterRule.Customizer</a></h3> 
---
> <h3><a href="#teleporterrule-customizer" name="teleporterrule-customizer">TeleporterRule.Customizer</a></h3>
162c162
< <pre><code>TeleporterRule.forClass(getClass(), "Launchpad:author");
---
> <pre><code>TeleporterRule.forClass(getClass(), &quot;Launchpad:author&quot;);
166,167c166,167
< <p>Using Strings for customization reduces the coupling with the <code>junit.core</code> bundle, as it does not need to know those classes which are used only on the client side when running tests.</p> 
< <p>If <code>TeleporterRule.forClass(getClass())</code> is used (the method without an additional 2nd parameter) the default customizer is used (<a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a>, since version 1.0.8).</p> 
---
> <p>Using Strings for customization reduces the coupling with the <code>junit.core</code> bundle, as it does not need to know those classes which are used only on the client side when running tests. </p>
> <p>If <code>TeleporterRule.forClass(getClass())</code> is used (the method without an additional 2nd parameter) the default customizer is used (<a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a>, since version 1.0.8). </p>
169c169
< <h3><a href="#default-customizer" id="default-customizer">Default Customizer</a></h3> 
---
> <h3><a href="#default-customizer" name="default-customizer">Default Customizer</a></h3>
174,179c174,179
<    <th> Property Name </th>
<    <th> Description </th>
<    <th> Mandatory to set </th>
<    <th> Default value </th>
<    <th> Since version </th>
<    <th> Related JIRA </th>
---
>       <th>Property Name </th>
>       <th>Description </th>
>       <th>Mandatory to set </th>
>       <th>Default value </th>
>       <th>Since version </th>
>       <th>Related JIRA </th>
184,277c184,277
<    <td> <code>ClientSideTeleporter.baseUrl</code> </td>
<    <td> base url of the Sling Server to which to deploy. </td>
<    <td> yes </td>
<    <td> (-) </td>
<    <td> 1.0.8 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.includeDependencyPrefixes</code> </td>
<    <td> comma-separated list of package prefixes for classes referenced from the IT. Only the classes having one of the given package prefix are included in the bundle being deployed to the given Sling instance together with the IT class itself. They are only included though in case they are referenced! If this is not set, no referenced classes will be included. </td>
<    <td> no </td>
<    <td> (-) </td>
<    <td> 1.0.8 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.excludeDependencyPrefixes</code> </td>
<    <td> comma-separated list of package prefixes for classes referenced from the IT. Classes having one of the given package prefix will not be included in the bundle being deployed to the given Sling instance together with the IT class itself. This takes precedence over the <code>ClientSideTeleporter.includeDependencyPrefixes</code>. </td>
<    <td> no </td>
<    <td> (-) </td>
<    <td> 1.0.8 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.embedClasses</code> </td>
<    <td> comma-separated list of fully qualified class names which should be embedded in the test bundle. Use this only for classes which are not detected automatically by the Maven Dependency Analyzer but still should be embedded in the test bundle </td>
<    <td> no </td>
<    <td> (-) </td>
<    <td> 1.0.8 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.embedClassesDirectories</code> </td>
<    <td> comma-separated list directories containing class files which should be embedded in the test bundle. Use this only for classes which are not detected automatically by the Maven Dependency Analyzer but still should be embedded in the test bundle </td>
<    <td> no </td>
<    <td> (-) </td>
<    <td> 1.0.12 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-6551">SLING-6551</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.additionalBundleHeaders</code> </td>
<    <td> comma-separated list of entries in the format <code>&lt;name&gt;:&lt;value&gt;</code> which should be added to the test bundle as additional headers </td>
<    <td> no </td>
<    <td> (-) </td>
<    <td> 1.0.12 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-6558">SLING-6558</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.testReadyTimeoutSeconds</code> </td>
<    <td> how long to wait for our test to be ready on the server-side in seconds, after installing the test bundle. </td>
<    <td> no </td>
<    <td> <code>12</code> </td>
<    <td> 1.0.8 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.serverUsername</code> </td>
<    <td> the username with which to send requests to the Sling server. </td>
<    <td> no </td>
<    <td> <code>admin</code> </td>
<    <td> 1.0.8 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.serverPassword</code> </td>
<    <td> the password with which to send requests to the Sling server. </td>
<    <td> no </td>
<    <td> <code>admin</code> </td>
<    <td> 1.0.8 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.enableLogging</code> </td>
<    <td> set to <code>true</code> to log the tasks being performed by the teleporter. Useful for debugging. </td>
<    <td> no </td>
<    <td> <code>false</code> </td>
<    <td> 1.0.12 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-6546">SLING-6546</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.preventToUninstallBundle</code> </td>
<    <td> set to <code>true</code> to not automatically uninstall the test bundle after test execution. Useful for debugging. </td>
<    <td> no </td>
<    <td> <code>false</code> </td>
<    <td> 1.0.12 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-6546">SLING-6546</a> </td>
<   </tr> 
<   <tr>
<    <td> <code>ClientSideTeleporter.testBundleDirectory</code> </td>
<    <td> if set the test bundles are being persisted (before being installed) within the given directory name. If the directory does not exist, it will be automatically created. Useful for debugging. Recommended value <code>${project.build.directory}/test-bundles</code>. </td>
<    <td> no </td>
<    <td> (-) </td>
<    <td> 1.0.12 </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-6546">SLING-6546</a> </td>
---
>       <td><code>ClientSideTeleporter.baseUrl</code> </td>
>       <td>base url of the Sling Server to which to deploy. </td>
>       <td>yes </td>
>       <td>(-) </td>
>       <td>1.0.8 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.includeDependencyPrefixes</code> </td>
>       <td>comma-separated list of package prefixes for classes referenced from the IT. Only the classes having one of the given package prefix are included in the bundle being deployed to the given Sling instance together with the IT class itself. They are only included though in case they are referenced! If this is not set, no referenced classes will be included. </td>
>       <td>no </td>
>       <td>(-) </td>
>       <td>1.0.8 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.excludeDependencyPrefixes</code> </td>
>       <td>comma-separated list of package prefixes for classes referenced from the IT. Classes having one of the given package prefix will not be included in the bundle being deployed to the given Sling instance together with the IT class itself. This takes precedence over the <code>ClientSideTeleporter.includeDependencyPrefixes</code>. </td>
>       <td>no </td>
>       <td>(-) </td>
>       <td>1.0.8 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.embedClasses</code> </td>
>       <td>comma-separated list of fully qualified class names which should be embedded in the test bundle. Use this only for classes which are not detected automatically by the Maven Dependency Analyzer but still should be embedded in the test bundle </td>
>       <td>no </td>
>       <td>(-) </td>
>       <td>1.0.8 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.embedClassesDirectories</code> </td>
>       <td>comma-separated list directories containing class files which should be embedded in the test bundle. Use this only for classes which are not detected automatically by the Maven Dependency Analyzer but still should be embedded in the test bundle </td>
>       <td>no </td>
>       <td>(-) </td>
>       <td>1.0.12 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-6551">SLING-6551</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.additionalBundleHeaders</code> </td>
>       <td>comma-separated list of entries in the format <code>&lt;name&gt;:&lt;value&gt;</code> which should be added to the test bundle as additional headers </td>
>       <td>no </td>
>       <td>(-) </td>
>       <td>1.0.12 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-6558">SLING-6558</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.testReadyTimeoutSeconds</code> </td>
>       <td>how long to wait for our test to be ready on the server-side in seconds, after installing the test bundle. </td>
>       <td>no </td>
>       <td><code>12</code> </td>
>       <td>1.0.8 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.serverUsername</code> </td>
>       <td>the username with which to send requests to the Sling server. </td>
>       <td>no </td>
>       <td><code>admin</code> </td>
>       <td>1.0.8 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.serverPassword</code> </td>
>       <td>the password with which to send requests to the Sling server. </td>
>       <td>no </td>
>       <td><code>admin</code> </td>
>       <td>1.0.8 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5677">SLING-5677</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.enableLogging</code> </td>
>       <td>set to <code>true</code> to log the tasks being performed by the teleporter. Useful for debugging. </td>
>       <td>no </td>
>       <td><code>false</code> </td>
>       <td>1.0.12 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-6546">SLING-6546</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.preventToUninstallBundle</code> </td>
>       <td>set to <code>true</code> to not automatically uninstall the test bundle after test execution. Useful for debugging. </td>
>       <td>no </td>
>       <td><code>false</code> </td>
>       <td>1.0.12 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-6546">SLING-6546</a> </td>
>     </tr>
>     <tr>
>       <td><code>ClientSideTeleporter.testBundleDirectory</code> </td>
>       <td>if set the test bundles are being persisted (before being installed) within the given directory name. If the directory does not exist, it will be automatically created. Useful for debugging. Recommended value <code>${project.build.directory}/test-bundles</code>. </td>
>       <td>no </td>
>       <td>(-) </td>
>       <td>1.0.12 </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-6546">SLING-6546</a> </td>
282c282
< <h4><a href="#launchpadcustomizer" id="launchpadcustomizer">LaunchpadCustomizer</a></h4> 
---
> <h4><a href="#launchpadcustomizer" name="launchpadcustomizer">LaunchpadCustomizer</a></h4>
284c284
< <h4><a href="#bwit-teleportercustomizer" id="bwit-teleportercustomizer">BWIT_TeleporterCustomizer</a></h4> 
---
> <h4>BWIT_TeleporterCustomizer</h4>
287c287
< <h2><a href="#orgapacheslingjunithealthcheck-run-junit-tests-as-sling-health-checks" id="orgapacheslingjunithealthcheck-run-junit-tests-as-sling-health-checks">org.apache.sling.junit.healthcheck: run JUnit tests as Sling Health Checks</a></h2> 
---
> <h2><a href="#org-apache-sling-junit-healthcheck-run-junit-tests-as-sling-health-checks" name="org-apache-sling-junit-healthcheck-run-junit-tests-as-sling-health-checks">org.apache.sling.junit.healthcheck: run JUnit tests as Sling Health Checks</a></h2>
289,290c289,290
< <p>See the <code>JUnitHealthCheck</code> class for details.</p> 
< <h2><a href="#orgapacheslingjunitscriptable-scriptable-server-side-tests" id="orgapacheslingjunitscriptable-scriptable-server-side-tests">org.apache.sling.junit.scriptable: scriptable server-side tests</a></h2> 
---
> <p>See the <code>JUnitHealthCheck</code> class for details. </p>
> <h2><a href="#org-apache-sling-junit-scriptable-scriptable-server-side-tests" name="org-apache-sling-junit-scriptable-scriptable-server-side-tests">org.apache.sling.junit.scriptable: scriptable server-side tests</a></h2>
309,312c309,312
<     "INFO_TYPE": "test",
<     "description": "verifyContent[0](org.apache.sling.junit.scriptable.TestAllPaths)",
<     "test_metadata": {
<       "test_execution_time_msec": 2
---
>     &quot;INFO_TYPE&quot;: &quot;test&quot;,
>     &quot;description&quot;: &quot;verifyContent[0](org.apache.sling.junit.scriptable.TestAllPaths)&quot;,
>     &quot;test_metadata&quot;: {
>       &quot;test_execution_time_msec&quot;: 2
317,319c317,319
< <p>Test failures would be included in this JSON representation - you can test that by modifying the script to fail and making the same request again.</p> 
< <h2><a href="#orgapacheslingjunitremote-obsolete" id="orgapacheslingjunitremote-obsolete">org.apache.sling.junit.remote: obsolete</a></h2> 
< <p>The <code>org.apache.sling.junit.remote</code> bundle provides utilities to run server-side JUnit tests, but using the newer <code>TeleporterRule</code> described above is much simpler. As a result, this bundle should only be needed for existing tests that were written using its mechanisms.</p></section></div></div>            
---
> <p>Test failures would be included in this JSON representation - you can test that by modifying the script to fail and making the same request again. </p>
> <h2><a href="#org-apache-sling-junit-remote-obsolete" name="org-apache-sling-junit-remote-obsolete">org.apache.sling.junit.remote: obsolete</a></h2>
> <p>The <code>org.apache.sling.junit.remote</code> bundle provides utilities to run server-side JUnit tests, but using the newer <code>TeleporterRule</code> described above is much simpler. As a result, this bundle should only be needed for existing tests that were written using its mechanisms. </p></section></div></div>            
diff -b -B -r ./documentation/bundles/osgi-installer.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/osgi-installer.html
94c94
< <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#overview" id="overview">Overview</a></h1> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#overview" name="overview">Overview</a></h1>
96c96
< <p><img src="http://sling.apache.org/documentation/bundles/Slide14.jpg" alt="Apache Sling OSGI Installer Diagram"></p> 
---
> <p><img src="/documentation/bundles/Slide14.jpg" alt="Apache Sling OSGI Installer Diagram" /></p>
101c101
< <h2><a href="#api" id="api">API</a></h2> 
---
> <h2><a href="#api" name="api">API</a></h2>
104c104
< <h2><a href="#artifact-handling" id="artifact-handling">Artifact Handling</a></h2> 
---
> <h2><a href="#artifact-handling" name="artifact-handling">Artifact Handling</a></h2>
107c107
< <h2><a href="#bundle-handling" id="bundle-handling">Bundle Handling</a></h2> 
---
> <h2><a href="#bundle-handling" name="bundle-handling">Bundle Handling</a></h2>
111c111
< <h3><a href="#versions-and-snapshots" id="versions-and-snapshots">Versions and Snapshots</a></h3> 
---
> <h3><a href="#versions-and-snapshots" name="versions-and-snapshots">Versions and Snapshots</a></h3>
114c114
< <h2><a href="#start-level-handling" id="start-level-handling">Start Level Handling</a></h2> 
---
> <h2><a href="#start-level-handling" name="start-level-handling">Start Level Handling</a></h2>
124,125c124,125
< <h2><a href="#plugins" id="plugins">Plugins</a></h2> 
< <h3><a href="#factories" id="factories">Factories</a></h3> 
---
> <h2><a href="#plugins" name="plugins">Plugins</a></h2>
> <h3><a href="#factories" name="factories">Factories</a></h3>
131c131
< <h3><a href="#providers" id="providers">Providers</a></h3> 
---
> <h3><a href="#providers" name="providers">Providers</a></h3>
137c137
< <h2><a href="#health-check" id="health-check">Health Check</a></h2> 
---
> <h2><a href="#health-check" name="health-check">Health Check</a></h2>
139c139
< <h3><a href="#bundles-installation-failure" id="bundles-installation-failure">Bundles Installation Failure</a></h3> 
---
> <h3><a href="#bundles-installation-failure" name="bundles-installation-failure">Bundles Installation Failure</a></h3>
141c141
< <h3><a href="#configuration-installation-failure" id="configuration-installation-failure">Configuration Installation Failure</a></h3> 
---
> <h3><a href="#configuration-installation-failure" name="configuration-installation-failure">Configuration Installation Failure</a></h3>
143,144c143,144
< <p>Due to <a href="https://issues.apache.org/jira/browse/SLING-7735">SLING-7735</a>, there might be false positives being reported by the health check, in case the configuration has already been deployed with exactly the same values in the system previously. In that case the OSGi Installer might also mark the resource as <code>IGNORED</code>. If you run into such an issue, you can fix it by removing the manually overwritten configurations: Just go to <code>/system/console/configMgr</code> and delete the according configuration. That way the OSGi installer should automatically create a new configuration for the same PID based on the configuration provided by some provider with the highest prio.</p> 
< <h3><a href="#limitations-of-the-health-check" id="limitations-of-the-health-check">Limitations of the health check</a></h3> 
---
> <p>Due to <a href="https://issues.apache.org/jira/browse/SLING-7735">SLING-7735</a>, there might be false positives being reported by the health check, in case the configuration has already been deployed with exactly the same values in the system previously. In that case the OSGi Installer might also mark the resource as <code>IGNORED</code>. If you run into such an issue, you can fix it by removing the manually overwritten configurations: Just go to <code>/system/console/configMgr</code> and delete the according configuration. That way the OSGi installer should automatically create a new configuration for the same PID based on the configuration provided by some provider with the highest prio. </p>
> <h3><a href="#limitations-of-the-health-check" name="limitations-of-the-health-check">Limitations of the health check</a></h3>
diff -b -B -r ./documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
96c96
< <h2><a href="#sax-pipelines" id="sax-pipelines">SAX Pipelines</a></h2> 
---
> <h2><a href="#sax-pipelines" name="sax-pipelines">SAX Pipelines</a></h2>
101c101
< <p>Sling contains a default pipeline which is executed for all HTML responses: it starts with an HTML generator, parsing the HTML output and sending events into the pipeline. An HTML serializer collects all events and serializes the output.</p> 
---
> <p>Sling contains a default pipeline which is executed for all HTML responses: it starts with an HTML generator, parsing the HTML output and sending events into the pipeline. An HTML serializer collects all events and serializes the output. </p>
103c103
< <h3><a href="#default-pipeline" id="default-pipeline">Default Pipeline</a></h3> 
---
> <h3><a href="#default-pipeline" name="default-pipeline">Default Pipeline</a></h3>
105c105
< <h2><a href="#implementing-pipeline-components" id="implementing-pipeline-components">Implementing Pipeline Components</a></h2> 
---
> <h2><a href="#implementing-pipeline-components" name="implementing-pipeline-components">Implementing Pipeline Components</a></h2>
107,109c107,109
< <pre><code><!-- TODO syntax marker (::java) disabled -->@scr.component metatype="no" 
< @scr.service interface="TransformerFactory"
< @scr.property value="pipeline.type" value="validator"
---
> <pre><code><!-- TODO syntax marker (::java) disabled -->@scr.component metatype=&quot;no&quot; 
> @scr.service interface=&quot;TransformerFactory&quot;
> @scr.property value=&quot;pipeline.type&quot; value=&quot;validator&quot;
112c112
< <h2><a href="#extending-the-pipeline" id="extending-the-pipeline">Extending the Pipeline</a></h2> 
---
> <h2><a href="#extending-the-pipeline" name="extending-the-pipeline">Extending the Pipeline</a></h2>
115,118c115,118
< <pre><code><!-- TODO syntax marker (::java) disabled -->@scr.component metatype="no"
< @scr.service interface="TransformerFactory"
< @scr.property name="pipeline.mode" value="global"
< @scr.property name="service.ranking" value="RANKING" type="Integer"
---
> <pre><code><!-- TODO syntax marker (::java) disabled -->@scr.component metatype=&quot;no&quot;
> @scr.service interface=&quot;TransformerFactory&quot;
> @scr.property name=&quot;pipeline.mode&quot; value=&quot;global&quot;
> @scr.property name=&quot;service.ranking&quot; value=&quot;RANKING&quot; type=&quot;Integer&quot;
123c123
< <h2><a href="#implementing-a-processor" id="implementing-a-processor">Implementing a Processor</a></h2> 
---
> <h2><a href="#implementing-a-processor" name="implementing-a-processor">Implementing a Processor</a></h2>
126,128c126,128
< <pre><code><!-- TODO syntax marker (::java) disabled -->@scr.component metatype="no" 
< @scr.service interface="ProcessorFactory"
< @scr.property value="pipeline.type" value="uniqueName"
---
> <pre><code><!-- TODO syntax marker (::java) disabled -->@scr.component metatype=&quot;no&quot; 
> @scr.service interface=&quot;ProcessorFactory&quot;
> @scr.property value=&quot;pipeline.type&quot; value=&quot;uniqueName&quot;
130c130
< <h2><a href="#configuring-a-processor" id="configuring-a-processor">Configuring a Processor</a></h2> 
---
> <h2><a href="#configuring-a-processor" name="configuring-a-processor">Configuring a Processor</a></h2>
136,139c136,139
<    <th> Type </th>
<    <th> Description </th>
<    <th> Example Value </th>
<    <th> Mandatory</th>
---
>       <th>Type </th>
>       <th>Description </th>
>       <th>Example Value </th>
>       <th>Mandatory</th>
145,148c145,148
<    <td> String </td>
<    <td> The type of the generator. Identifies the generator being registered via service property <code>pipeline.type</code> of a service implementing a <code>GeneratorFactory</code> </td>
<    <td> <code>html-generator</code> </td>
<    <td> yes</td>
---
>       <td>String </td>
>       <td>The type of the generator. Identifies the generator being registered via service property <code>pipeline.type</code> of a service implementing a <code>GeneratorFactory</code> </td>
>       <td><code>html-generator</code> </td>
>       <td>yes</td>
152,155c152,155
<    <td> String[] </td>
<    <td> The types of the transformers. Identifies the transformers being registered via service property <code>pipeline.type</code> of a service implementing a <code>TransformerFactory</code> </td>
<    <td> <code>link-rewriter</code> (Sling itself does not contain any TransformerFactories) </td>
<    <td> no</td>
---
>       <td>String[] </td>
>       <td>The types of the transformers. Identifies the transformers being registered via service property <code>pipeline.type</code> of a service implementing a <code>TransformerFactory</code> </td>
>       <td><code>link-rewriter</code> (Sling itself does not contain any TransformerFactories) </td>
>       <td>no</td>
159,162c159,162
<    <td> String </td>
<    <td> The type of the serializer. Identifies the serializer being registered via service property <code>pipeline.type</code> of a service implementing a <code>SerializerFactory</code> </td>
<    <td> <code>html-serializer</code> </td>
<    <td> yes</td>
---
>       <td>String </td>
>       <td>The type of the serializer. Identifies the serializer being registered via service property <code>pipeline.type</code> of a service implementing a <code>SerializerFactory</code> </td>
>       <td><code>html-serializer</code> </td>
>       <td>yes</td>
166,169c166,169
<    <td> String[] </td>
<    <td> The paths this pipeline should run on (content paths). Only if the request's resource path starts with one of the given <code>paths</code> or one of the given paths is <code>*</code> the pipeline configuration is considered. </td>
<    <td> <code>/content/</code> </td>
<    <td> no</td>
---
>       <td>String[] </td>
>       <td>The paths this pipeline should run on (content paths). Only if the request's resource path starts with one of the given <code>paths</code> or one of the given paths is <code>*</code> the pipeline configuration is considered. </td>
>       <td><code>/content/</code> </td>
>       <td>no</td>
173,176c173,176
<    <td> String[] </td>
<    <td> The content types this pipeline should be used for . If no explicit content type is set on the response yet, <code>text/html</code> is assumed. May contain <code>*</code> values which match for all content types. Only if the response has one of the given content types the pipeline configuration is considered. </td>
<    <td> <code>text/html</code> </td>
<    <td> no</td>
---
>       <td>String[] </td>
>       <td>The content types this pipeline should be used for . If no explicit content type is set on the response yet, <code>text/html</code> is assumed. May contain <code>*</code> values which match for all content types. Only if the response has one of the given content types the pipeline configuration is considered. </td>
>       <td><code>text/html</code> </td>
>       <td>no</td>
180,183c180,183
<    <td> String </td>
<    <td> The extensions this pipeline should be used for. Only if the request's extension is equal to one of the given extensions the pipeline configuration is considered. </td>
<    <td> <code>html</code> </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The extensions this pipeline should be used for. Only if the request's extension is equal to one of the given extensions the pipeline configuration is considered. </td>
>       <td><code>html</code> </td>
>       <td>no</td>
187,190c187,190
<    <td> String[] </td>
<    <td> The resource types this pipeline should be used for. Only if the request's resource type is equal (via <code>ResourceResolver.isResourceType(&lt;request's resource&gt;, &lt;given resource type&gt;</code>) to one of the given resourceTypes the pipeline configuration is considered. </td>
<    <td> <code>myapp/customresourcetype</code> </td>
<    <td> no</td>
---
>       <td>String[] </td>
>       <td>The resource types this pipeline should be used for. Only if the request's resource type is equal (via <code>ResourceResolver.isResourceType(&lt;request&#39;s resource&gt;, &lt;given resource type&gt;</code>) to one of the given resourceTypes the pipeline configuration is considered. </td>
>       <td><code>myapp/customresourcetype</code> </td>
>       <td>no</td>
194,197c194,197
<    <td> Boolean </td>
<    <td> Check resource types of unwrapped resources as well if this is set to <code>true</code>. Available since 1.1.0 (<a href="https://issues.apache.org/jira/browse/SLING-5012">SLING-5012</a>). </td>
<    <td> <code>false</code> </td>
<    <td> no</td>
---
>       <td>Boolean </td>
>       <td>Check resource types of unwrapped resources as well if this is set to <code>true</code>. Available since 1.1.0 (<a href="https://issues.apache.org/jira/browse/SLING-5012">SLING-5012</a>). </td>
>       <td><code>false</code> </td>
>       <td>no</td>
201,204c201,204
<    <td> String[] </td>
<    <td> A set of selectors the pipeline should be used for. Each value is a single selector (i.e. must not contain <code>.</code>). Only if the request contains at least one selector which is equal to one of the given selectors, this pipeline configuration is considered. Available since 1.1.0 (<a href="https://issues.apache.org/jira/browse/SLING-3511">SLING-3511</a>) </td>
<    <td> <code>myselector</code> </td>
<    <td> no</td>
---
>       <td>String[] </td>
>       <td>A set of selectors the pipeline should be used for. Each value is a single selector (i.e. must not contain <code>.</code>). Only if the request contains at least one selector which is equal to one of the given selectors, this pipeline configuration is considered. Available since 1.1.0 (<a href="https://issues.apache.org/jira/browse/SLING-3511">SLING-3511</a>) </td>
>       <td><code>myselector</code> </td>
>       <td>no</td>
208,211c208,211
<    <td> Long </td>
<    <td> The configurations are sorted by this order, order must be higher or equal to 0. The configuration with the highest order is tried first. Default value (if not set): 0 </td>
<    <td> 100 </td>
<    <td> no</td>
---
>       <td>Long </td>
>       <td>The configurations are sorted by this order, order must be higher or equal to 0. The configuration with the highest order is tried first. Default value (if not set): 0 </td>
>       <td>100 </td>
>       <td>no</td>
215,218c215,218
<    <td> Boolean </td>
<    <td> Is this configuration active? (default yes) </td>
<    <td> <code>false</code> </td>
<    <td> no</td>
---
>       <td>Boolean </td>
>       <td>Is this configuration active? (default yes) </td>
>       <td><code>false</code> </td>
>       <td>no</td>
222,225c222,225
<    <td> Boolean </td>
<    <td> Only if this is set to <code>true</code> also error responses are processed by this pipeline configuration. Default <code>true</code> </td>
<    <td> <code>true</code> </td>
<    <td> no</td>
---
>       <td>Boolean </td>
>       <td>Only if this is set to <code>true</code> also error responses are processed by this pipeline configuration. Default <code>true</code> </td>
>       <td><code>true</code> </td>
>       <td>no</td>
diff -b -B -r ./documentation/bundles/rendering-content-default-get-servlets.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/rendering-content-default-get-servlets.html
97,98c97,98
<   Not all features of the 
<  <b>org.apache.sling.servlets.get</b> bundle are described below - this page needs more work. 
---
> Not all features of the <b>org.apache.sling.servlets.get</b> bundle are described below - this
> page needs more work.
100c100
< <h1><a href="#default-get-and-head-servlets" id="default-get-and-head-servlets">Default GET and HEAD servlets</a></h1> 
---
> <h1><a href="#default-get-and-head-servlets" name="default-get-and-head-servlets">Default GET and HEAD servlets</a></h1>
104,106c104,106
< <p>Currently, only the <code>DefaultGetServlet</code> has configuration parameters. Those are found at <code>/system/console/configMgr/org.apache.sling.servlets.get.DefaultGetServlet</code> on a standard Sling setup, and should be self-explaining. One common use is to disable some of the default renderings listed below, as they might not be useful or desired on production systems.</p> 
< <h1><a href="#default-renderings" id="default-renderings">Default renderings</a></h1> 
< <h2><a href="#default-json-rendering" id="default-json-rendering">Default JSON rendering</a></h2> 
---
> <p>Currently, only the <code>DefaultGetServlet</code> has configuration parameters. Those are found at <code>/system/console/configMgr/org.apache.sling.servlets.get.DefaultGetServlet</code> on a standard Sling setup, and should be self-explaining. One common use is to disable some of the default renderings listed below, as they might not be useful or desired on production systems. </p>
> <h1><a href="#default-renderings" name="default-renderings">Default renderings</a></h1>
> <h2><a href="#default-json-rendering" name="default-json-rendering">Default JSON rendering</a></h2>
115c115
< <h2><a href="#default-html-rendering" id="default-html-rendering">Default HTML rendering</a></h2> 
---
> <h2><a href="#default-html-rendering" name="default-html-rendering">Default HTML rendering</a></h2>
117c117
< <h2><a href="#default-text-rendering" id="default-text-rendering">Default text rendering</a></h2> 
---
> <h2><a href="#default-text-rendering" name="default-text-rendering">Default text rendering</a></h2>
119c119
< <h2><a href="#default-xml-rendering" id="default-xml-rendering">Default XML rendering</a></h2> 
---
> <h2><a href="#default-xml-rendering" name="default-xml-rendering">Default XML rendering</a></h2>
122c122
< <h2><a href="#streamrendererservlet" id="streamrendererservlet">StreamRendererServlet</a></h2> 
---
> <h2><a href="#streamrendererservlet" name="streamrendererservlet">StreamRendererServlet</a></h2>
124c124
< <h2><a href="#redirectservlet" id="redirectservlet">RedirectServlet</a></h2> 
---
> <h2><a href="#redirectservlet" name="redirectservlet">RedirectServlet</a></h2>
127c127
< <h2><a href="#slinginfoservlet" id="slinginfoservlet">SlingInfoServlet</a></h2> 
---
> <h2><a href="#slinginfoservlet" name="slinginfoservlet">SlingInfoServlet</a></h2>
129,130c129,130
< <p>It is available at <code>/system/sling/info.sessionInfo</code> by default, and supports <code>.json</code> and <code>.txt</code> extensions.</p> 
< <h2><a href="#jcr-versions-support" id="jcr-versions-support">JCR Versions Support</a></h2> 
---
> <p>It is available at <code>/system/sling/info.sessionInfo</code> by default, and supports <code>.json</code> and <code>.txt</code> extensions. </p>
> <h2><a href="#jcr-versions-support" name="jcr-versions-support">JCR Versions Support</a></h2>
141,145c141,145
<   "versions": {
<     "jcr:rootVersion": {
<       "created": "Tue Jan 23 2018 14:08:09 GMT+0100",
<       "successors": [
<         "1.0"
---
>   &quot;versions&quot;: {
>     &quot;jcr:rootVersion&quot;: {
>       &quot;created&quot;: &quot;Tue Jan 23 2018 14:08:09 GMT+0100&quot;,
>       &quot;successors&quot;: [
>         &quot;1.0&quot;
147,149c147,149
<       "predecessors": [],
<       "labels": [],
<       "baseVersion": "false"
---
>       &quot;predecessors&quot;: [],
>       &quot;labels&quot;: [],
>       &quot;baseVersion&quot;: &quot;false&quot;
151,155c151,155
<     "1.0": {
<       "created": "Tue Jan 23 2018 14:08:35 GMT+0100",
<       "successors": [],
<       "predecessors": [
<         "jcr:rootVersion"
---
>     &quot;1.0&quot;: {
>       &quot;created&quot;: &quot;Tue Jan 23 2018 14:08:35 GMT+0100&quot;,
>       &quot;successors&quot;: [],
>       &quot;predecessors&quot;: [
>         &quot;jcr:rootVersion&quot;
157,158c157,158
<       "labels": [],
<       "baseVersion": "true"
---
>       &quot;labels&quot;: [],
>       &quot;baseVersion&quot;: &quot;true&quot;
170,173c170,173
<   "versions": {
<     "jcr:rootVersion": {
<       "successors": [
<         "1.0"
---
>   &quot;versions&quot;: {
>     &quot;jcr:rootVersion&quot;: {
>       &quot;successors&quot;: [
>         &quot;1.0&quot;
175c175
<       "predecessors": []
---
>       &quot;predecessors&quot;: []
177,179c177,179
<     "1.0": {
<       "successors": [
<         "1.1"
---
>     &quot;1.0&quot;: {
>       &quot;successors&quot;: [
>         &quot;1.1&quot;
181,182c181,182
<       "predecessors": [
<         "jcr:rootVersion"
---
>       &quot;predecessors&quot;: [
>         &quot;jcr:rootVersion&quot;
185,187c185,187
<     "1.1": {
<       "successors": [
<         "1.2"
---
>     &quot;1.1&quot;: {
>       &quot;successors&quot;: [
>         &quot;1.2&quot;
189,190c189,190
<       "predecessors": [
<         "1.0"
---
>       &quot;predecessors&quot;: [
>         &quot;1.0&quot;
193,196c193,196
<     "1.2": {
<       "successors": [],
<       "predecessors": [
<         "1.1"
---
>     &quot;1.2&quot;: {
>       &quot;successors&quot;: [],
>       &quot;predecessors&quot;: [
>         &quot;1.1&quot;
203c203
< <pre><code>curl -s "http://localhost:8080/vtest.tidy.json;v=1.0"
---
> <pre><code>curl -s &quot;http://localhost:8080/vtest.tidy.json;v=1.0&quot;
205,207c205,207
<   "marker": "A",
<   "jcr:frozenUuid": "a6fd966d-917d-49e2-ba32-e7f942ff3a0f",
<   "jcr:uuid": "74291bc8-e7cb-4a71-ab3a-224ba234be0a"
---
>   &quot;marker&quot;: &quot;A&quot;,
>   &quot;jcr:frozenUuid&quot;: &quot;a6fd966d-917d-49e2-ba32-e7f942ff3a0f&quot;,
>   &quot;jcr:uuid&quot;: &quot;74291bc8-e7cb-4a71-ab3a-224ba234be0a&quot;
210c210
< curl -s "http://localhost:8080/vtest.tidy.json;v=1.1"
---
> curl -s &quot;http://localhost:8080/vtest.tidy.json;v=1.1&quot;
212,214c212,214
<   "marker": "B",
<   "jcr:frozenUuid": "a6fd966d-917d-49e2-ba32-e7f942ff3a0f",
<   "jcr:uuid": "18b38479-a3fc-4a21-9cd4-89c44daf917d"
---
>   &quot;marker&quot;: &quot;B&quot;,
>   &quot;jcr:frozenUuid&quot;: &quot;a6fd966d-917d-49e2-ba32-e7f942ff3a0f&quot;,
>   &quot;jcr:uuid&quot;: &quot;18b38479-a3fc-4a21-9cd4-89c44daf917d&quot;
217c217
< curl -s "http://localhost:8080/vtest.tidy.json;v=1.2"
---
> curl -s &quot;http://localhost:8080/vtest.tidy.json;v=1.2&quot;
219,221c219,221
<   "marker": "C",
<   "jcr:frozenUuid": "a6fd966d-917d-49e2-ba32-e7f942ff3a0f",
<   "jcr:uuid": "3d55430b-2fa6-4562-b415-638fb6608c0e"
---
>   &quot;marker&quot;: &quot;C&quot;,
>   &quot;jcr:frozenUuid&quot;: &quot;a6fd966d-917d-49e2-ba32-e7f942ff3a0f&quot;,
>   &quot;jcr:uuid&quot;: &quot;3d55430b-2fa6-4562-b415-638fb6608c0e&quot;
diff -b -B -r ./documentation/bundles/repository-initialization.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/repository-initialization.html
101c101
< <h2><a href="#slingrepositoryinitializer" id="slingrepositoryinitializer">SlingRepositoryInitializer</a></h2> 
---
> <h2><a href="#slingrepositoryinitializer" name="slingrepositoryinitializer">SlingRepositoryInitializer</a></h2>
110c110
< <h2><a href="#the-repoinit-repository-initialization-language" id="the-repoinit-repository-initialization-language">The 'repoinit' Repository Initialization Language</a></h2> 
---
> <h2><a href="#the-repoinit-repository-initialization-language" name="the-repoinit-repository-initialization-language">The 'repoinit' Repository Initialization Language</a></h2>
114c114
< <p>Here's a current example from the test cases mentioned above, that uses all language features as of version 1.0.2 of the parser module.</p> 
---
> <p>Here's a current example from the test cases mentioned above, that uses all language features as of version 1.0.2 of the parser module. </p>
160c160
<     # empty rep:glob means "apply to this node but not its children"
---
>     # empty rep:glob means &quot;apply to this node but not its children&quot;
189c189
< &lt;&lt;  &lt;slingevent='http://sling.apache.org/jcr/event/1.0'&gt;
---
> &lt;&lt;  &lt;slingevent=&#39;http://sling.apache.org/jcr/event/1.0&#39;&gt;
200c200
< disable service user deprecated_service_user : "Disabled user to make an example"
---
> disable service user deprecated_service_user : &quot;Disabled user to make an example&quot;
204c204
< <h2><a href="#providing-repoinit-statements-from-the-sling-provisioning-model-or-other-urls" id="providing-repoinit-statements-from-the-sling-provisioning-model-or-other-urls">Providing repoinit statements from the Sling provisioning model or other URLs</a></h2> 
---
> <h2><a href="#providing-repoinit-statements-from-the-sling-provisioning-model-or-other-urls" name="providing-repoinit-statements-from-the-sling-provisioning-model-or-other-urls">Providing repoinit statements from the Sling provisioning model or other URLs</a></h2>
208c208
<   references=["model:context:/resources/provisioning/model.txt","model@repoinitTwo:context:/resources/provisioning/model.txt"]
---
>   references=[&quot;model:context:/resources/provisioning/model.txt&quot;,&quot;model@repoinitTwo:context:/resources/provisioning/model.txt&quot;]
212,213c212,213
< <p>Note that previous versions of the <code>org.apache.sling.jcr.repoinit</code> bundle used different configuration parameters. From version 1.0.2 on, warnings are logged if those old parameters (<em>text.url,text.format,model.section.name</em>) are used.</p> 
< <h3><a href="#references-to-sling-provisioning-model-additional-sections" id="references-to-sling-provisioning-model-additional-sections">References to Sling Provisioning Model additional sections</a></h3> 
---
> <p>Note that previous versions of the <code>org.apache.sling.jcr.repoinit</code> bundle used different configuration parameters. From version 1.0.2 on, warnings are logged if those old parameters (_text.url,text.format,model.section.name_) are used.</p>
> <h3><a href="#references-to-sling-provisioning-model-additional-sections" name="references-to-sling-provisioning-model-additional-sections">References to Sling Provisioning Model additional sections</a></h3>
228c228
< <h3><a href="#references-to-urls-providing-raw-repoinit-statements" id="references-to-urls-providing-raw-repoinit-statements">References to URLs providing raw repoinit statements</a></h3> 
---
> <h3><a href="#references-to-urls-providing-raw-repoinit-statements" name="references-to-urls-providing-raw-repoinit-statements">References to URLs providing raw repoinit statements</a></h3>
233c233
< <h2><a href="#providing-repoinit-statements-from-osgi-factory-configurations" id="providing-repoinit-statements-from-osgi-factory-configurations">Providing repoinit statements from OSGi factory configurations</a></h2> 
---
> <h2><a href="#providing-repoinit-statements-from-osgi-factory-configurations" name="providing-repoinit-statements-from-osgi-factory-configurations">Providing repoinit statements from OSGi factory configurations</a></h2>
diff -b -B -r ./documentation/bundles/request-analysis.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/request-analysis.html
96c96
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
111c111
< <h2><a href="#web-console-integration" id="web-console-integration">Web Console Integration</a></h2> 
---
> <h2><a href="#web-console-integration" name="web-console-integration">Web Console Integration</a></h2>
118c118
< <h2><a href="#analyzing-the-requesttrackertxt-file" id="analyzing-the-requesttrackertxt-file">Analyzing the <code>requesttracker.txt</code> file</a></h2> 
---
> <h2>Analyzing the <code>requesttracker.txt</code> file</h2>
128c128
< <p><img src="http://sling.apache.org/requesttracker.png" alt="Recorded Requests"></p> 
---
> <p><img src="requesttracker.png" alt="Recorded Requests" /></p>
130c130
< <p><img src="http://sling.apache.org/requesttracker-details.png" alt="Details of a recorded Request"></p> 
---
> <p><img src="requesttracker-details.png" alt="Details of a recorded Request" /></p>
diff -b -B -r ./documentation/bundles/resource-access-security.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/resource-access-security.html
95c95
< <h2><a href="#summary" id="summary">Summary</a></h2> 
---
> <h2><a href="#summary" name="summary">Summary</a></h2>
97,101c97,101
< <p>The ResourceAccessSecurity defines a service API which is used in two different context: for securing resource providers which have no own access control and on the application level to further restrict the access to resources in general.</p> 
< <p>A resource access security service is registered with the service property “context”. Allowed values are “application” and “provider”. If the value is missing or invalid, the service will be ignored.</p> 
< <p>In the context of resource providers, this service might be used for implementations of resource providers where the underlying persistence layer does not implement access control. The goal is to make it easy to implement a lightweight access control for such providers. For example, a JCR resource providers should not use the provider context resource access security - in a JCR context, security is fully delegated to the underlying repository, and mixing security models would be a bad idea.</p> 
< <p>In the context of the application, this service might be used to add additional or temporary constraints across the whole resource tree.</p> 
< <h2><a href="#how-to-use-resourceaccesssecurity" id="how-to-use-resourceaccesssecurity">How to use ResourceAccessSecurity</a></h2> 
---
> <p>The ResourceAccessSecurity defines a service API which is used in two different context: for securing resource providers which have no own access control and on the application level to further restrict the access to resources in general. </p>
> <p>A resource access security service is registered with the service property “context”. Allowed values are “application” and “provider”. If the value is missing or invalid, the service will be ignored. </p>
> <p>In the context of resource providers, this service might be used for implementations of resource providers where the underlying persistence layer does not implement access control. The goal is to make it easy to implement a lightweight access control for such providers. For example, a JCR resource providers should not use the provider context resource access security - in a JCR context, security is fully delegated to the underlying repository, and mixing security models would be a bad idea. </p>
> <p>In the context of the application, this service might be used to add additional or temporary constraints across the whole resource tree. </p>
> <h2><a href="#how-to-use-resourceaccesssecurity" name="how-to-use-resourceaccesssecurity">How to use ResourceAccessSecurity</a></h2>
105c105
< <h3><a href="#service-properties" id="service-properties">Service properties</a></h3> 
---
> <h3><a href="#service-properties" name="service-properties">Service properties</a></h3>
110c110
<    <th> description</th>
---
>       <th>description</th>
116c116
<    <td> regexp to define on which paths the service should be called (default .*)</td>
---
>       <td>regexp to define on which paths the service should be called (default .*)</td>
120c120
<    <td> set of operations on which the service should be called ("read,create,update,delete,execute", default all of them)</td>
---
>       <td>set of operations on which the service should be called ("read,create,update,delete,execute", default all of them)</td>
124c124
<    <td> set of operations on which the service answer is final and no further service should be called (default none of them), except the GateResult is GateResult.CANT_DECIDE</td>
---
>       <td>set of operations on which the service answer is final and no further service should be called (default none of them), except the GateResult is GateResult.CANT_DECIDE</td>
128c128
<    <td> “provider” or “application”. The resource access gate can either have the context “provider”, in this case the gate is only applied to resource providers requesting the security checks. Or the context can be “application”. In this case the access gate is invoked for the whole resource tree. This is indicated by the required service property “context”. If the property is missing or invalid, the service is ignored.</td>
---
>       <td>“provider” or “application”. The resource access gate can either have the context “provider”, in this case the gate is only applied to resource providers requesting the security checks. Or the context can be “application”. In this case the access gate is invoked for the whole resource tree. This is indicated by the required service property “context”. If the property is missing or invalid, the service is ignored.</td>
132c132
< <h3><a href="#how-to-implement-resourceaccessgate" id="how-to-implement-resourceaccessgate">How to implement ResourceAccessGate</a></h3> 
---
> <h3><a href="#how-to-implement-resourceaccessgate" name="how-to-implement-resourceaccessgate">How to implement ResourceAccessGate</a></h3>
154c154
< <h3><a href="#gateresult" id="gateresult">GateResult</a></h3> 
---
> <h3><a href="#gateresult" name="gateresult">GateResult</a></h3>
162c162
< <h2><a href="#actual-state-of-resourceaccesssecurity" id="actual-state-of-resourceaccesssecurity">Actual state of ResourceAccessSecurity</a></h2> 
---
> <h2><a href="#actual-state-of-resourceaccesssecurity" name="actual-state-of-resourceaccesssecurity">Actual state of ResourceAccessSecurity</a></h2>
diff -b -B -r ./documentation/bundles/resource-editor.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/resource-editor.html
95,96c95,96
< <p><img src="http://sling.apache.org/documentation/bundles/resource-editor-screenshot.png" alt="alt text"></p> 
< <h1><a href="#features" id="features">Features</a></h1> 
---
> <p><img src="http://sling.apache.org/documentation/bundles/resource-editor-screenshot.png" alt="alt text" /></p>
> <h1><a href="#features" name="features">Features</a></h1>
105c105
< <h1><a href="#status" id="status">Status</a></h1> 
---
> <h1><a href="#status" name="status">Status</a></h1>
107c107
< <h1><a href="#installation" id="installation">Installation</a></h1> 
---
> <h1><a href="#installation" name="installation">Installation</a></h1>
diff -b -B -r ./documentation/bundles/resource-merger.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/resource-merger.html
96c96
< <h1><a href="#introduction" id="introduction">Introduction</a></h1> 
---
> <h1><a href="#introduction" name="introduction">Introduction</a></h1>
104c104
< <p>Each <code>MergedResourcePicker</code> service implementation in the system provides one unique mount point/root path (usually starting with <code>/mnt</code>) exposing a view on merged resources from at least two different locations.</p> 
---
> <p>Each <code>MergedResourcePicker</code> service implementation in the system provides one unique mount point/root path (usually starting with <code>/mnt</code>) exposing a view on merged resources from at least two different locations. </p>
111c111
< <p>You may use any of the merge properties described below to influence the merging behaviour. All those special properties are not exposed below the mount point.</p> 
---
> <p>You may use any of the merge properties described below to influence the merging behaviour. All those special properties are not exposed below the mount point. </p>
113c113
< <h1><a href="#merge-properties" id="merge-properties">Merge Properties</a></h1> 
---
> <h1><a href="#merge-properties" name="merge-properties">Merge Properties</a></h1>
118,119c118,119
<    <th> Type </th>
<    <th> Description</th>
---
>       <th>Type </th>
>       <th>Description</th>
125,126c125,126
<    <td> String[] </td>
<    <td> Hides the properties with the given names. <code>*</code> hides all properties (since version 1.3.2 the wildcard only affects underlying properties and no longer local ones, see also <a href="https://issues.apache.org/jira/browse/SLING-5468">SLING-5468</a>).</td>
---
>       <td>String[] </td>
>       <td>Hides the properties with the given names. <code>*</code> hides all properties (since version 1.3.2 the wildcard only affects underlying properties and no longer local ones, see also <a href="https://issues.apache.org/jira/browse/SLING-5468">SLING-5468</a>).</td>
130,131c130,131
<    <td> String[] </td>
<    <td> Hides the child resources with the given names. <code>*</code> hides all child resources (since version 1.3.2 the wildcard only affects underlying child resources and no longer local ones, see also <a href="https://issues.apache.org/jira/browse/SLING-5468">SLING-5468</a>). 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>
---
>       <td>String[] </td>
>       <td>Hides the child resources with the given names. <code>*</code> hides all child resources (since version 1.3.2 the wildcard only affects underlying child resources and no longer local ones, see also <a href="https://issues.apache.org/jira/browse/SLING-5468">SLING-5468</a>). 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>
135,136c135,136
<    <td> Boolean </td>
<    <td> If <code>true</code> then the resource with the name which contains this property should not be exposed!</td>
---
>       <td>Boolean </td>
>       <td>If <code>true</code> then the resource with the name which contains this property should not be exposed!</td>
140,141c140,141
<    <td> String </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>
---
>       <td>String </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>
145c145
< <h1><a href="#child-resource-order" id="child-resource-order">Child Resource Order</a></h1> 
---
> <h1><a href="#child-resource-order" name="child-resource-order">Child Resource Order</a></h1>
161,162c161,162
< <h1><a href="#resource-pickers" id="resource-pickers">Resource Pickers</a></h1> 
< <h2><a href="#merging-resource-picker-overlay-approach" id="merging-resource-picker-overlay-approach">Merging Resource Picker (Overlay approach)</a></h2> 
---
> <h1><a href="#resource-pickers" name="resource-pickers">Resource Pickers</a></h1>
> <h2><a href="#merging-resource-picker-overlay-approach-" name="merging-resource-picker-overlay-approach-">Merging Resource Picker (Overlay approach)</a></h2>
167,170c167,170
<    <th> Merged Resource Path </th>
<    <th> Merging Order </th>
<    <th> Read-Only </th>
<    <th> Related Ticket</th>
---
>       <th>Merged Resource Path </th>
>       <th>Merging Order </th>
>       <th>Read-Only </th>
>       <th>Related Ticket</th>
176,179c176,179
<    <td> <code>/mnt/overlay/&lt;relative resource path&gt;</code> </td>
<    <td> Last resource resolver search path first (Order = Descending search paths). </td>
<    <td> <code>true</code> </td>
<    <td> <a href="http://issues.apache.org/jira/browse/SLING-2986">SLING-2986</a></td>
---
>       <td><code>/mnt/overlay/&lt;relative resource path&gt;</code> </td>
>       <td>Last resource resolver search path first (Order = Descending search paths). </td>
>       <td><code>true</code> </td>
>       <td><a href="http://issues.apache.org/jira/browse/SLING-2986">SLING-2986</a></td>
184c184
< <h3><a href="#example" id="example">Example</a></h3> 
---
> <h3><a href="#example" name="example">Example</a></h3>
186c186
<      +-- sling:resourceType = "some/resource/type"
---
>      +-- sling:resourceType = &quot;some/resource/type&quot;
188c188
<      |   +-- property1 = "property from /libs/sling/example/child1"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child1&quot;
190c190
<      |   +-- property1 = "property from /libs/sling/example/child2"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child2&quot;
192c192
<      |   +-- property1 = "property from /libs/sling/example/child3"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child3&quot;
196c196
<      +-- property1 = "property added in apps"
---
>      +-- property1 = &quot;property added in apps&quot;
200c200
<      |   +-- property1 = "property from /apps/sling/example/child2"
---
>      |   +-- property1 = &quot;property from /apps/sling/example/child2&quot;
202c202
<      |   +-- property2 = "property from /apps/sling/example/child3"
---
>      |   +-- property2 = &quot;property from /apps/sling/example/child3&quot;
206,207c206,207
<      +-- sling:resourceType = "some/resource/type"
<      +-- property1 = "property added in apps"
---
>      +-- sling:resourceType = &quot;some/resource/type&quot;
>      +-- property1 = &quot;property added in apps&quot;
209c209
<      |   +-- property1 = "property from /apps/sling/example/child2"
---
>      |   +-- property1 = &quot;property from /apps/sling/example/child2&quot;
211,212c211,212
<      |   +-- property1 = "property from /libs/sling/example/child3"
<      |   +-- property2 = "property from /apps/sling/example/child3"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child3&quot;
>      |   +-- property2 = &quot;property from /apps/sling/example/child3&quot;
214c214
< <h2><a href="#overriding-resource-picker-override-approach" id="overriding-resource-picker-override-approach">Overriding Resource Picker (Override approach)</a></h2> 
---
> <h2><a href="#overriding-resource-picker-override-approach-" name="overriding-resource-picker-override-approach-">Overriding Resource Picker (Override approach)</a></h2>
219,222c219,222
<    <th> Merged Resource Path </th>
<    <th> Merging Order </th>
<    <th> Read-Only </th>
<    <th> Related Ticket</th>
---
>       <th>Merged Resource Path </th>
>       <th>Merging Order </th>
>       <th>Read-Only </th>
>       <th>Related Ticket</th>
228,231c228,231
<    <td> <code>/mnt/override/&lt;absolute resource type&gt;</code> </td>
<    <td> The topmost resource type (having itself no <code>sling:resourceSuperType</code> defined) is the base. The resources are overlaid in the order from the most generic one to the most specific one (which is the one having the most inheritance levels). </td>
<    <td> <code>true</code> </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-3657">SLING-3675</a></td>
---
>       <td><code>/mnt/override/&lt;absolute resource type&gt;</code> </td>
>       <td>The topmost resource type (having itself no <code>sling:resourceSuperType</code> defined) is the base. The resources are overlaid in the order from the most generic one to the most specific one (which is the one having the most inheritance levels). </td>
>       <td><code>true</code> </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-3657">SLING-3675</a></td>
236c236
< <h3><a href="#example" id="example">Example</a></h3> 
---
> <h3><a href="#example" name="example">Example</a></h3>
239c239
<      |   +-- property1 = "property from /libs/sling/example/child1"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child1&quot;
241c241
<      |   +-- property1 = "property from /libs/sling/example/child2"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child2&quot;
243c243
<      |   +-- property1 = "property from /libs/sling/example/child3"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child3&quot;
247,248c247,248
< 	 +-- sling:resourceSuperType = "/apps/sling/base"
<      +-- property1 = "property added in /apps/sling/example"
---
>      +-- sling:resourceSuperType = &quot;/apps/sling/base&quot;
>      +-- property1 = &quot;property added in /apps/sling/example&quot;
252c252
<      |   +-- property1 = "property from /apps/sling/example/child2"
---
>      |   +-- property1 = &quot;property from /apps/sling/example/child2&quot;
254c254
<      |   +-- property2 = "property from /apps/sling/example/child3"
---
>      |   +-- property2 = &quot;property from /apps/sling/example/child3&quot;
258,259c258,259
<      +-- sling:resourceSuperType = "/apps/sling/base"
<      +-- property1 = "property added in /apps/sling/example"
---
>      +-- sling:resourceSuperType = &quot;/apps/sling/base&quot;
>      +-- property1 = &quot;property added in /apps/sling/example&quot;
261c261
<      |   +-- property1 = "property from /apps/sling/example/child2"
---
>      |   +-- property1 = &quot;property from /apps/sling/example/child2&quot;
263,264c263,264
<      |   +-- property1 = "property from /libs/sling/example/child3"
<      |   +-- property2 = "property from /apps/sling/example/child3"
---
>      |   +-- property1 = &quot;property from /libs/sling/example/child3&quot;
>      |   +-- property2 = &quot;property from /apps/sling/example/child3&quot;
diff -b -B -r ./documentation/bundles/scheduler-service-commons-scheduler.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/scheduler-service-commons-scheduler.html
96,97c96
<   The notion of Job used in this context is a different one than the one used for 
<  <a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Sling Jobs</a>. The main difference is that a scheduler's job is not persisted. 
---
> The notion of Job used in this context is a different one than the one used for <a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Sling Jobs</a>. The main difference is that a scheduler's job is not persisted.
99c98
< <h2><a href="#examples-of-jobs-that-are-scheduled-by-leveraging-the-whiteboard-pattern" id="examples-of-jobs-that-are-scheduled-by-leveraging-the-whiteboard-pattern">Examples of jobs that are scheduled by leveraging the whiteboard pattern</a></h2> 
---
> <h2><a href="#examples-of-jobs-that-are-scheduled-by-leveraging-the-whiteboard-pattern" name="examples-of-jobs-that-are-scheduled-by-leveraging-the-whiteboard-pattern">Examples of jobs that are scheduled by leveraging the whiteboard pattern</a></h2>
101,102c100,101
< <h3><a href="#scheduling-with-a-cron-expression" id="scheduling-with-a-cron-expression">Scheduling with a cron expression</a></h3> 
< <p>The cron expression format is described in the <a href="http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/crontrigger.html#format">Quartz Cron Documentation</a> and requires either 6 or 7 fields separated by white space. The first field always indicates the second (not the minute).</p> 
---
> <h3><a href="#scheduling-with-a-cron-expression" name="scheduling-with-a-cron-expression">Scheduling with a cron expression</a></h3>
> <p>The cron expression format is described in the <a href="http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/crontrigger.html#format">Quartz Cron Documentation</a> and requires either 6 or 7 fields separated by white space. The first field always indicates the second (not the minute). </p>
114c113
< @Property( name = "scheduler.expression", value = "0 * * * * ?")
---
> @Property( name = &quot;scheduler.expression&quot;, value = &quot;0 * * * * ?&quot;)
121c120
<     	log.info("Executing a cron job (job#1) through the whiteboard pattern");
---
>         log.info(&quot;Executing a cron job (job#1) through the whiteboard pattern&quot;);
126c125
< <h3><a href="#scheduling-at-periodic-times" id="scheduling-at-periodic-times">Scheduling at periodic times</a></h3> 
---
> <h3><a href="#scheduling-at-periodic-times" name="scheduling-at-periodic-times">Scheduling at periodic times</a></h3>
138c137
< @Property( name = "scheduler.period", longValue = 10)
---
> @Property( name = &quot;scheduler.period&quot;, longValue = 10)
145c144
<     	log.info("Executing a perodic job (job#2) through the whiteboard pattern");
---
>         log.info(&quot;Executing a perodic job (job#2) through the whiteboard pattern&quot;);
150c149
< <h3><a href="#preventing-concurrent-execution" id="preventing-concurrent-execution">Preventing concurrent execution</a></h3> 
---
> <h3><a href="#preventing-concurrent-execution" name="preventing-concurrent-execution">Preventing concurrent execution</a></h3>
152c151
< <pre><code>@Property(name="scheduler.concurrent", boolValue=false)
---
> <pre><code>@Property(name=&quot;scheduler.concurrent&quot;, boolValue=false)
154c153
< <h3><a href="#scheduling-the-job-just-once-in-a-cluster" id="scheduling-the-job-just-once-in-a-cluster">Scheduling the job just once in a cluster</a></h3> 
---
> <h3><a href="#scheduling-the-job-just-once-in-a-cluster" name="scheduling-the-job-just-once-in-a-cluster">Scheduling the job just once in a cluster</a></h3>
156c155
< <pre><code>@Property(name="scheduler.runOn", value="LEADER");
---
> <pre><code>@Property(name=&quot;scheduler.runOn&quot;, value=&quot;LEADER&quot;);
159c158
< <pre><code>@Property(name="scheduler.runOn", value="SINGLE");
---
> <pre><code>@Property(name=&quot;scheduler.runOn&quot;, value=&quot;SINGLE&quot;);
162c161
< <h2><a href="#the-scheduler-api" id="the-scheduler-api">The Scheduler API</a></h2> 
---
> <h2><a href="#the-scheduler-api" name="the-scheduler-api">The Scheduler API</a></h2>
164c163
< <h2><a href="#examples-of-scheduled-jobs-registered-through-the-scheduler-api" id="examples-of-scheduled-jobs-registered-through-the-scheduler-api">Examples of scheduled jobs registered through the scheduler API</a></h2> 
---
> <h2><a href="#examples-of-scheduled-jobs-registered-through-the-scheduler-api" name="examples-of-scheduled-jobs-registered-through-the-scheduler-api">Examples of scheduled jobs registered through the scheduler API</a></h2>
166c165
< <h3><a href="#defining-the-job" id="defining-the-job">Defining the job</a></h3> 
---
> <h3><a href="#defining-the-job" name="defining-the-job">Defining the job</a></h3>
170c169
< 		log.info("Executing the job");
---
>        log.info(&quot;Executing the job&quot;);
174c173
< <h3><a href="#scheduling-with-a-cron-expression" id="scheduling-with-a-cron-expression">Scheduling with a cron expression</a></h3> 
---
> <h3><a href="#scheduling-with-a-cron-expression" name="scheduling-with-a-cron-expression">Scheduling with a cron expression</a></h3>
176,177c175,176
< <pre><code>String schedulingExpression = "0 15 10 ? * MON-FRI";
< this.scheduler.addJob("myJob", job, null, schedulingExpression, true);
---
> <pre><code>String schedulingExpression = &quot;0 15 10 ? * MON-FRI&quot;;
> this.scheduler.addJob(&quot;myJob&quot;, job, null, schedulingExpression, true);
180c179
< <h3><a href="#scheduling-at-periodic-times" id="scheduling-at-periodic-times">Scheduling at periodic times</a></h3> 
---
> <h3><a href="#scheduling-at-periodic-times" name="scheduling-at-periodic-times">Scheduling at periodic times</a></h3>
183c182
< this.scheduler.addPeriodicJob("myJob", job, null, period, true);
---
> this.scheduler.addPeriodicJob(&quot;myJob&quot;, job, null, period, true);
185c184
< <h3><a href="#scheduling-at-a-given-time" id="scheduling-at-a-given-time">Scheduling at a given time</a></h3> 
---
> <h3><a href="#scheduling-at-a-given-time" name="scheduling-at-a-given-time">Scheduling at a given time</a></h3>
187,188c186,187
< <pre><code>SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");
< String date = "2020/01/10";
---
> <pre><code>SimpleDateFormat formatter = new SimpleDateFormat(&quot;yyyy/MM/dd&quot;);
> String date = &quot;2020/01/10&quot;;
190c189
< this.scheduler.fireJobAt("myJob", job, null, fireDate);
---
> this.scheduler.fireJobAt(&quot;myJob&quot;, job, null, fireDate);
192c191
< <h3><a href="#a-service-scheduling-the-job-based-on-3-different-kinds-of-scheduling" id="a-service-scheduling-the-job-based-on-3-different-kinds-of-scheduling">A service scheduling the job based on 3 different kinds of scheduling</a></h3> 
---
> <h3><a href="#a-service-scheduling-the-job-based-on-3-different-kinds-of-scheduling" name="a-service-scheduling-the-job-based-on-3-different-kinds-of-scheduling">A service scheduling the job based on 3 different kinds of scheduling</a></h3>
225,226c224,225
<     	String schedulingExpression = "0 * * * * ?";
<     	String jobName1 = "case1";
---
>         String schedulingExpression = &quot;0 * * * * ?&quot;;
>         String jobName1 = &quot;case1&quot;;
231c230
<             	log.info("Executing job1");
---
>                 log.info(&quot;Executing job1&quot;);
241c240
<         String jobName2 = "case2";
---
>         String jobName2 = &quot;case2&quot;;
246c245
<             	log.info("Executing job2");
---
>                 log.info(&quot;Executing job2&quot;);
256c255
<         String jobName3 = "case3";
---
>         String jobName3 = &quot;case3&quot;;
263c262
<             	log.info("Executing job3 at date: {} with a delay of: {} seconds", fireDate, delay/1000);
---
>                 log.info(&quot;Executing job3 at date: {} with a delay of: {} seconds&quot;, fireDate, delay/1000);
274c273
<         log.info("Deactivated, goodbye!");
---
>         log.info(&quot;Deactivated, goodbye!&quot;);
diff -b -B -r ./documentation/bundles/scripting/scripting-htl.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/scripting/scripting-htl.html
101c101
< <h1><a href="#modules" id="modules">Modules</a></h1> 
---
> <h1><a href="#modules" name="modules">Modules</a></h1>
112c112
< <h1><a href="#the-use-api" id="the-use-api">The Use-API</a></h1> 
---
> <h1><a href="#the-use-api" name="the-use-api">The Use-API</a></h1>
115c115,117
<  <li> <p>Java Use-API, through POJOs, that may optionally implement an <code>init</code> method:</p> <pre><code>/**
---
>   <li>
>     <p>Java Use-API, through POJOs, that may optionally implement an <code>init</code> method:</p>
>     <pre><code>/**
121,124c123,129
< </code></pre> </li> 
<  <li> <p>JavaScript Use-API, by using a standardised use function</p> <pre><code>/**
<  * In the following example '/libs/dep1.js' and 'dep2.js' are optional
<  * dependencies needed for this script's execution. Dependencies can
---
> </code></pre>
>   </li>
>   <li>
>     <p>JavaScript Use-API, by using a standardised use function</p>
>     <pre><code>/**
>  * In the following example &#39;/libs/dep1.js&#39; and &#39;dep2.js&#39; are optional
>  * dependencies needed for this script&#39;s execution. Dependencies can
126c131
<  * script's own path.
---
>  * script&#39;s own path.
130c135
< use(['dep1.js', 'dep2.js'], function (Dep1, Dep2) {
---
> use([&#39;dep1.js&#39;, &#39;dep2.js&#39;], function (Dep1, Dep2) {
133c138
<     // define this Use object's behaviour
---
>     // define this Use object&#39;s behaviour
139c144,145
< </code></pre> </li> 
---
> </code></pre>
>   </li>
143c149
< <h2><a href="#sling-specific-use-api-extensions" id="sling-specific-use-api-extensions">Sling-specific Use-API Extensions</a></h2> 
---
> <h2><a href="#sling-specific-use-api-extensions" name="sling-specific-use-api-extensions">Sling-specific Use-API Extensions</a></h2>
149,151c155,157
<    <th> Use Provider </th>
<    <th> Bundle </th>
<    <th> Functionality </th>
---
>       <th>Use Provider </th>
>       <th>Bundle </th>
>       <th>Functionality </th>
172,177c178
<    <td>support for loading Java objects such as: 
<     <ol>
<      <li>OSGi services</li>
<      <li>POJOs adaptable from <code>SlingHttpServletRequest</code> or <code>Resource</code></li>
<      <li>POJOs that implement <code>Use</code></li>
<     </ol></td>
---
>       <td>support for loading Java objects such as: <ol><li>OSGi services</li><li>POJOs adaptable from <code>SlingHttpServletRequest</code> or <code>Resource</code></li><li>POJOs that implement <code>Use</code></li></ol></td>
196c197
< <h3><a href="#global-objects" id="global-objects">Global Objects</a></h3> 
---
> <h3><a href="#global-objects" name="global-objects">Global Objects</a></h3>
210c211
< <h3><a href="#sling-models-use-provider" id="sling-models-use-provider">Sling Models Use Provider</a></h3> 
---
> <h3><a href="#sling-models-use-provider" name="sling-models-use-provider">Sling Models Use Provider</a></h3>
212c213
< <pre><code>    &lt;div data-sly-use.model3="org.example.models.Model3"&gt;
---
> <pre><code>    &lt;div data-sly-use.model3=&quot;org.example.models.Model3&quot;&gt;
218c219
< <h4><a href="#passing-parameters" id="passing-parameters">Passing parameters</a></h4> 
---
> <h4><a href="#passing-parameters" name="passing-parameters">Passing parameters</a></h4>
220c221
< <pre><code>    &lt;div data-sly-use.model3="${'org.example.models.Model3' @ colour='red', path=resource.path}"&gt;
---
> <pre><code>    &lt;div data-sly-use.model3=&quot;${&#39;org.example.models.Model3&#39; @ colour=&#39;red&#39;, path=resource.path}&quot;&gt;
235c236
< <h3><a href="#java-use-provider" id="java-use-provider">Java Use Provider</a></h3> 
---
> <h3><a href="#java-use-provider" name="java-use-provider">Java Use Provider</a></h3>
237c238
< <h4><a href="#resource-backed-java-classes" id="resource-backed-java-classes">Resource-backed Java classes</a></h4> 
---
> <h4><a href="#resource-backed-java-classes" name="resource-backed-java-classes">Resource-backed Java classes</a></h4>
249c250
<     &lt;html data-sly-use.page="apps.my_project.components.page.PageBean"&gt;
---
>     &lt;html data-sly-use.page=&quot;apps.my_project.components.page.PageBean&quot;&gt;
255c256
<     &lt;html data-sly-use.page="PageBean"&gt;
---
>     &lt;html data-sly-use.page=&quot;PageBean&quot;&gt;
259,260c260,261
< <p>The advantage of loading a bean using just the simple class name (e.g. <code>data-sly-use.page="PageBean"</code>) is that an inheriting component can overlay the <code>PageBean.java</code> file and provide a different logic. In this case the package name of the <code>PageBean</code> class will automatically be derived from the calling script's parent path (e.g. <code>apps.my_project.components.page</code>) - the bean doesn't even have to specify it. However, keep in mind that loading a bean this way is slower than providing the fully qualified class name, since the provider has to check if there is a backing resource. At the same time, loading an object using its fully qualified class name will not allow overriding it by inheriting components.</p> 
< <h4><a href="#passing-parameters" id="passing-parameters">Passing parameters</a></h4> 
---
> <p>The advantage of loading a bean using just the simple class name (e.g. <code>data-sly-use.page=&quot;PageBean&quot;</code>) is that an inheriting component can overlay the <code>PageBean.java</code> file and provide a different logic. In this case the package name of the <code>PageBean</code> class will automatically be derived from the calling script's parent path (e.g. <code>apps.my_project.components.page</code>) - the bean doesn't even have to specify it. However, keep in mind that loading a bean this way is slower than providing the fully qualified class name, since the provider has to check if there is a backing resource. At the same time, loading an object using its fully qualified class name will not allow overriding it by inheriting components.</p>
> <h4><a href="#passing-parameters" name="passing-parameters">Passing parameters</a></h4>
262c263
< <pre><code>    &lt;div data-sly-use.useObject="${'org.example.use.MyUseObject' @ colour='red', year=2016}"&gt;
---
> <pre><code>    &lt;div data-sly-use.useObject=&quot;${&#39;org.example.use.MyUseObject&#39; @ colour=&#39;red&#39;, year=2016}&quot;&gt;
280,281c281,282
<             colour = PropertiesUtil.toString(bindings.get("colour"), "");
<             year = PropertiesUtil.toInteger(bindings.get("year"), Calendar.getInstance().get(Calendar.YEAR));
---
>             colour = PropertiesUtil.toString(bindings.get(&quot;colour&quot;), &quot;&quot;);
>             year = PropertiesUtil.toInteger(bindings.get(&quot;year&quot;), Calendar.getInstance().get(Calendar.YEAR));
301c302
<                         "org.apache.sling.api.SlingHttpServletRequest"
---
>                         &quot;org.apache.sling.api.SlingHttpServletRequest&quot;
307c308
<                         "org.example.use.MyUseObject"
---
>                         &quot;org.example.use.MyUseObject&quot;
317,318c318,319
<             String colour = PropertiesUtil.toString(request.getAttribute("colour"), "");
<             Integer year = PropertiesUtil.toInteger(request.getAttribute("year"), Calendar.getInstance().get(Calendar.YEAR));
---
>             String colour = PropertiesUtil.toString(request.getAttribute(&quot;colour&quot;), &quot;&quot;);
>             Integer year = PropertiesUtil.toInteger(request.getAttribute(&quot;year&quot;), Calendar.getInstance().get(Calendar.YEAR));
328c329
< <h3><a href="#javascript-use-provider" id="javascript-use-provider">JavaScript Use Provider</a></h3> 
---
> <h3><a href="#javascript-use-provider" name="javascript-use-provider">JavaScript Use Provider</a></h3>
340c341
<     &lt;html data-sly-use.page="/apps/my-project/components/page/page.js"&gt;
---
>     &lt;html data-sly-use.page=&quot;/apps/my-project/components/page/page.js&quot;&gt;
346c347
<     &lt;html data-sly-use.page="page.js"&gt;
---
>     &lt;html data-sly-use.page=&quot;page.js&quot;&gt;
351c352
< <h4><a href="#global-objects" id="global-objects">Global Objects</a></h4> 
---
> <h4><a href="#global-objects" name="global-objects">Global Objects</a></h4>
363c364
< <h4><a href="#passing-parameters" id="passing-parameters">Passing parameters</a></h4> 
---
> <h4><a href="#passing-parameters" name="passing-parameters">Passing parameters</a></h4>
365,366c366,367
< <pre><code>    &lt;div data-sly-use.logic="${'logic.js' @ colour='red', year=2017}"&gt;
<         My colour is ${logic.colour ? logic.colour : 'not important'} and I'm from ${logic.year}
---
> <pre><code>    &lt;div data-sly-use.logic=&quot;${&#39;logic.js&#39; @ colour=&#39;red&#39;, year=2017}&quot;&gt;
>         My colour is ${logic.colour ? logic.colour : &#39;not important&#39;} and I&#39;m from ${logic.year}
371c372
<         'use strict';
---
>         &#39;use strict&#39;;
373c374
<         var colour = this.colour || '';
---
>         var colour = this.colour || &#39;&#39;;
382c383
< <h4><a href="#caveats" id="caveats">Caveats</a></h4> 
---
> <h4><a href="#caveats" name="caveats">Caveats</a></h4>
385c386
< <pre><code>    &lt;ol data-sly-use.obj="logic.js" data-sly-list="${obj}"&gt;
---
> <pre><code>    &lt;ol data-sly-use.obj=&quot;logic.js&quot; data-sly-list=&quot;${obj}&quot;&gt;
396,397c397,398
<                 code: 'new java.lang.String("apples") === "apples"',
<                 result: new java.lang.String("apples") === "apples"
---
>                 code: &#39;new java.lang.String(&quot;apples&quot;) === &quot;apples&quot;&#39;,
>                 result: new java.lang.String(&quot;apples&quot;) === &quot;apples&quot;
400,401c401,402
<                 code: 'new java.lang.String("apples") == "apples"',
<                 result: new java.lang.String("apples") == "apples"
---
>                 code: &#39;new java.lang.String(&quot;apples&quot;) == &quot;apples&quot;&#39;,
>                 result: new java.lang.String(&quot;apples&quot;) == &quot;apples&quot;
404,405c405,406
<                 code: 'new java.lang.String("apples") !== "apples"',
<                 result: new java.lang.String("apples") !== "apples"
---
>                 code: &#39;new java.lang.String(&quot;apples&quot;) !== &quot;apples&quot;&#39;,
>                 result: new java.lang.String(&quot;apples&quot;) !== &quot;apples&quot;
408,409c409,410
<                 code: 'new java.lang.String("apples") != "apples"',
<                 result: new java.lang.String("apples") != "apples"
---
>                 code: &#39;new java.lang.String(&quot;apples&quot;) != &quot;apples&quot;&#39;,
>                 result: new java.lang.String(&quot;apples&quot;) != &quot;apples&quot;
412c413
<                 code: 'new java.lang.Integer(1) === 1',
---
>                 code: &#39;new java.lang.Integer(1) === 1&#39;,
416c417
<                 code: 'new java.lang.Integer(1) == 1',
---
>                 code: &#39;new java.lang.Integer(1) == 1&#39;,
420c421
<                 code: 'new java.lang.Integer(1) !== 1',
---
>                 code: &#39;new java.lang.Integer(1) !== 1&#39;,
424c425
<                 code: 'new java.lang.Integer(1) != 1',
---
>                 code: &#39;new java.lang.Integer(1) != 1&#39;,
428c429
<                 code: 'java.lang.Boolean.TRUE === true',
---
>                 code: &#39;java.lang.Boolean.TRUE === true&#39;,
432c433
<                 code: 'java.lang.Boolean.TRUE == true',
---
>                 code: &#39;java.lang.Boolean.TRUE == true&#39;,
436c437
<                 code: 'java.lang.Boolean.TRUE !== true',
---
>                 code: &#39;java.lang.Boolean.TRUE !== true&#39;,
440c441
<                 code: 'java.lang.Boolean.TRUE != true',
---
>                 code: &#39;java.lang.Boolean.TRUE != true&#39;,
447,450c448,451
< <pre><code>     1. Code new java.lang.String("apples") === "apples" evaluates to false
<      2. Code new java.lang.String("apples") == "apples" evaluates to true
<      3. Code new java.lang.String("apples") !== "apples" evaluates to true
<      4. Code new java.lang.String("apples") != "apples" evaluates to false
---
> <pre><code>     1. Code new java.lang.String(&quot;apples&quot;) === &quot;apples&quot; evaluates to false
>      2. Code new java.lang.String(&quot;apples&quot;) == &quot;apples&quot; evaluates to true
>      3. Code new java.lang.String(&quot;apples&quot;) !== &quot;apples&quot; evaluates to true
>      4. Code new java.lang.String(&quot;apples&quot;) != &quot;apples&quot; evaluates to false
469c470
<     myObject ? 'this' : 'that'
---
>     myObject ? &#39;this&#39; : &#39;that&#39;
471c472
<     myObject != null ? 'this' : 'that'
---
>     myObject != null ? &#39;this&#39; : &#39;that&#39;
473c474
< <h3><a href="#script-use-provider" id="script-use-provider">Script Use Provider</a></h3> 
---
> <h3><a href="#script-use-provider" name="script-use-provider">Script Use Provider</a></h3>
475c476
< <h3><a href="#picking-the-best-use-provider-for-a-project" id="picking-the-best-use-provider-for-a-project">Picking the best Use Provider for a project</a></h3> 
---
> <h3><a href="#picking-the-best-use-provider-for-a-project" name="picking-the-best-use-provider-for-a-project">Picking the best Use Provider for a project</a></h3>
478d478
<  <tbody>
486,495c486,487
<    <td>
<     <ul>
<      <li>convenient injection annotations for data retrieval</li>
<      <li>easy to extend from other Sling Models</li>
<      <li>simple setup for unit testing</li>
<     </ul></td> 
<    <td>
<     <ul>
<      <li>lacks flexibility in terms of component overlaying, relying on <code>service.ranking</code> configurations; this was solved for Sling Models 1.3.0 by <a href="https://issues.apache.org/jira/browse/SLING-5992">SLING-5992</a></li>
<     </ul></td> 
---
>         <td><ul><li>convenient injection annotations for data retrieval</li><li>easy to extend from other Sling Models</li><li>simple setup for unit testing</li></ul></td>
>         <td><ul><li>lacks flexibility in terms of component overlaying, relying on <code>service.ranking</code> configurations; this was solved for Sling Models 1.3.0 by <a href="https://issues.apache.org/jira/browse/SLING-5992">SLING-5992</a></li></ul></td>
499c491,492
<    <td> <p>Use-objects provided through bundles:</p> 
---
>         <td>
>             <p>Use-objects provided through bundles:</p>
504c497,498
<     </ul> <p>Use-objects backed by <code>Resources</code>:</p> 
---
>             </ul>
>             <p>Use-objects backed by <code>Resources</code>:</p>
509,510c503,506
<     </ul> </td> 
<    <td> <p>Use-objects provided through bundles:</p> 
---
>             </ul>
>         </td>
>         <td>
>             <p>Use-objects provided through bundles:</p>
513,548c509,544
<     </ul> <pre><code>        &lt;p&gt;Use-objects backed by &lt;code&gt;Resources&lt;/code&gt;:&lt;/p&gt;
<         &lt;ul&gt;
<             &lt;li&gt;cannot extend other Java objects&lt;/li&gt;
<             &lt;li&gt;the Java project might need a different setup to allow running unit tests, since the objects will be deployed like content&lt;/li&gt;
<         &lt;/ul&gt;
<     &lt;/td&gt;
< &lt;/tr&gt;
< &lt;tr&gt;
<     &lt;td&gt;JavaScript Use Provider&lt;/td&gt;
<     &lt;td&gt;
<         &lt;ul&gt;
<             &lt;li&gt;allows JavaScript developers to develop component logic&lt;/li&gt;
<             &lt;li&gt;can be reused through the dependency mechanism provided by the &lt;code&gt;use&lt;/code&gt; function&lt;/li&gt;
<         &lt;/ul&gt;
<     &lt;/td&gt;
<     &lt;td&gt;
<         &lt;ul&gt;
<             &lt;li&gt;harder to test and debug, relying mostly on end-to-end testing and console logging&lt;/li&gt;
<             &lt;li&gt;slower to execute than both Sling Models and Java Use-API objects&lt;/li&gt;
<         &lt;/ul&gt;
<     &lt;/td&gt;
< &lt;/tr&gt;
< &lt;tr&gt;
<     &lt;td&gt;Script Use Provider&lt;/td&gt;
<     &lt;td&gt;
<         &lt;ul&gt;
<             &lt;li&gt;allows the usage of Use objects evaluated by other Script Engines available in the platform&lt;/li&gt;
<         &lt;/ul&gt;
<     &lt;/td&gt;
<     &lt;td&gt;
<         &lt;ul&gt;
<             &lt;li&gt;like in the case of the JavaScript Use Provider, the performance is influenced by the Script Engine's implementation&lt;/li&gt;
<         &lt;/ul&gt;
<     &lt;/td&gt;
< &lt;/tr&gt;
< </code></pre> </td>
---
>             </ul>
> 
>             <p>Use-objects backed by <code>Resources</code>:</p>
>             <ul>
>                 <li>cannot extend other Java objects</li>
>                 <li>the Java project might need a different setup to allow running unit tests, since the objects will be deployed like content</li>
>             </ul>
>         </td>
>     </tr>
>     <tr>
>         <td>JavaScript Use Provider</td>
>         <td>
>             <ul>
>                 <li>allows JavaScript developers to develop component logic</li>
>                 <li>can be reused through the dependency mechanism provided by the <code>use</code> function</li>
>             </ul>
>         </td>
>         <td>
>             <ul>
>                 <li>harder to test and debug, relying mostly on end-to-end testing and console logging</li>
>                 <li>slower to execute than both Sling Models and Java Use-API objects</li>
>             </ul>
>         </td>
>     </tr>
>     <tr>
>         <td>Script Use Provider</td>
>         <td>
>             <ul>
>                 <li>allows the usage of Use objects evaluated by other Script Engines available in the platform</li>
>             </ul>
>         </td>
>         <td>
>             <ul>
>                 <li>like in the case of the JavaScript Use Provider, the performance is influenced by the Script Engine's implementation</li>
>             </ul>
>         </td>
550d545
<  </tbody>
diff -b -B -r ./documentation/bundles/scripting/scripting-jsp.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/scripting/scripting-jsp.html
101c101
< <h2><a href="#use" id="use">Use</a></h2> 
---
> <h2><a href="#use" name="use">Use</a></h2>
103c103
< <pre><code>&lt;%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling" %&gt;
---
> <pre><code>&lt;%@taglib prefix=&quot;sling&quot; uri=&quot;http://sling.apache.org/taglibs/sling&quot; %&gt;
107c107
< <h2><a href="#taglib-versions" id="taglib-versions">Taglib Versions</a></h2> 
---
> <h2><a href="#taglib-versions" name="taglib-versions">Taglib Versions</a></h2>
112,114c112,114
<    <th> Taglib Version </th>
<    <th> Bundle Version </th>
<    <th> URI </th>
---
>       <th>Taglib Version </th>
>       <th>Bundle Version </th>
>       <th>URI </th>
119,121c119,121
<    <td> 1.0 </td>
<    <td> 2.0.6 </td>
<    <td> http://sling.apache.org/taglibs/sling/1.0 </td>
---
>       <td>1.0 </td>
>       <td>2.0.6 </td>
>       <td>http://sling.apache.org/taglibs/sling/1.0 </td>
124,126c124,126
<    <td> 1.1 </td>
<    <td> 2.1.0 </td>
<    <td> http://sling.apache.org/taglibs/sling/1.1 </td>
---
>       <td>1.1 </td>
>       <td>2.1.0 </td>
>       <td>http://sling.apache.org/taglibs/sling/1.1 </td>
129,131c129,131
<    <td> 1.2 </td>
<    <td> 2.1.8 </td>
<    <td> http://sling.apache.org/taglibs/sling/1.2 </td>
---
>       <td>1.2 </td>
>       <td>2.1.8 </td>
>       <td>http://sling.apache.org/taglibs/sling/1.2 </td>
134,136c134,136
<    <td> 1.3 </td>
<    <td> 2.2.0 </td>
<    <td> http://sling.apache.org/taglibs/sling </td>
---
>       <td>1.3 </td>
>       <td>2.2.0 </td>
>       <td>http://sling.apache.org/taglibs/sling </td>
141c141
< <h2><a href="#expression-language-functions" id="expression-language-functions">Expression Language Functions</a></h2> 
---
> <h2><a href="#expression-language-functions" name="expression-language-functions">Expression Language Functions</a></h2>
143c143
< <h3><a href="#adaptto" id="adaptto">adaptTo</a></h3> 
---
> <h3><a href="#adaptto" name="adaptto">adaptTo</a></h3>
151c151,152
<   </ul> </li> 
---
>     </ul>
>   </li>
155c156
< <pre><code>&lt;c:set var="myProperties" value="${sling:adaptTo(resource,'org.apache.sling.api.resource.ValueMap')}" /&gt;
---
> <pre><code>&lt;c:set var=&quot;myProperties&quot; value=&quot;${sling:adaptTo(resource,&#39;org.apache.sling.api.resource.ValueMap&#39;)}&quot; /&gt;
157c158
< <h3><a href="#encode" id="encode">encode</a></h3> 
---
> <h3><a href="#encode" name="encode">encode</a></h3>
165c166,167
<   </ul> </li> 
---
>     </ul>
>   </li>
169c171
< <pre><code>${sling:encode('&lt;script&gt;alert("Bad Stuff!");&lt;/script&gt;','HTML')}
---
> <pre><code>${sling:encode(&#39;&lt;script&gt;alert(&quot;Bad Stuff!&quot;);&lt;/script&gt;&#39;,&#39;HTML&#39;)}
171c173
< <h3><a href="#findresources" id="findresources">findResources</a></h3> 
---
> <h3><a href="#findresources" name="findresources">findResources</a></h3>
180c182,183
<   </ul> </li> 
---
>     </ul>
>   </li>
184c187
< <pre><code>&lt;c:forEach var="found" items="${sling:findResources(resourceResolver,'/jcr:root//*[jcr:contains(., 'Sling')] order by @jcr:score','xpath')"&gt;
---
> <pre><code>&lt;c:forEach var=&quot;found&quot; items=&quot;${sling:findResources(resourceResolver,&#39;/jcr:root//*[jcr:contains(., &#39;Sling&#39;)] order by @jcr:score&#39;,&#39;xpath&#39;)&quot;&gt;
188c191
< <h3><a href="#getabsoluteparent" id="getabsoluteparent">getAbsoluteParent</a></h3> 
---
> <h3><a href="#getabsoluteparent" name="getabsoluteparent">getAbsoluteParent</a></h3>
196c199,200
<   </ul> </li> 
---
>     </ul>
>   </li>
200c204
< <pre><code>&lt;c:set var="content" value="${sling:getAbsoluteParent(resource,'2')}" /&gt;
---
> <pre><code>&lt;c:set var=&quot;content&quot; value=&quot;${sling:getAbsoluteParent(resource,&#39;2&#39;)}&quot; /&gt;
202c206
< <h3><a href="#getparents" id="getparents">getParents</a></h3> 
---
> <h3><a href="#getparents" name="getparents">getParents</a></h3>
210c214,215
<   </ul> </li> 
---
>     </ul>
>   </li>
214,215c219,220
< <pre><code>&lt;c:set var="parents" value="${sling:getParents(resource,'2')}" /&gt;
< &lt;c:forEach var="parent" items="${parents}"&gt;
---
> <pre><code>&lt;c:set var=&quot;parents&quot; value=&quot;${sling:getParents(resource,&#39;2&#39;)}&quot; /&gt;
> &lt;c:forEach var=&quot;parent&quot; items=&quot;${parents}&quot;&gt;
219c224
< <h3><a href="#getrelativeresource" id="getrelativeresource">getRelativeResource</a></h3> 
---
> <h3><a href="#getrelativeresource" name="getrelativeresource">getRelativeResource</a></h3>
227c232,233
<   </ul> </li> 
---
>     </ul>
>   </li>
231c237
< <pre><code>&lt;c:set var="content" value="${sling:getRelativeResource(resource,'jcr:content')}" /&gt;
---
> <pre><code>&lt;c:set var=&quot;content&quot; value=&quot;${sling:getRelativeResource(resource,&#39;jcr:content&#39;)}&quot; /&gt;
233c239
< <h3><a href="#getresource" id="getresource">getResource</a></h3> 
---
> <h3><a href="#getresource" name="getresource">getResource</a></h3>
241c247,248
<   </ul> </li> 
---
>     </ul>
>   </li>
245c252
< <pre><code>&lt;c:set var="content" value="${sling:getResource(resourceResolver,'/content')}" /&gt;
---
> <pre><code>&lt;c:set var=&quot;content&quot; value=&quot;${sling:getResource(resourceResolver,&#39;/content&#39;)}&quot; /&gt;
247c254
< <h3><a href="#getvalue" id="getvalue">getValue</a></h3> 
---
> <h3><a href="#getvalue" name="getvalue">getValue</a></h3>
257c264,265
<   </ul> </li> 
---
>     </ul>
>   </li>
261c269
< <pre><code>&lt;c:set var="content" value="${sling:getValue(properties,'jcr:title',resource.name)}" /&gt;
---
> <pre><code>&lt;c:set var=&quot;content&quot; value=&quot;${sling:getValue(properties,&#39;jcr:title&#39;,resource.name)}&quot; /&gt;
263c271
< <h3><a href="#haschildren" id="haschildren">hasChildren</a></h3> 
---
> <h3><a href="#haschildren" name="haschildren">hasChildren</a></h3>
270c278,279
<   </ul> </li> 
---
>     </ul>
>   </li>
274c283
< <pre><code>&lt;c:if test="${sling:hasChildren(resource)"&gt;
---
> <pre><code>&lt;c:if test=&quot;${sling:hasChildren(resource)&quot;&gt;
278c287
< <h3><a href="#listchildren" id="listchildren">listChildren</a></h3> 
---
> <h3><a href="#listchildren" name="listchildren">listChildren</a></h3>
285c294,295
<   </ul> </li> 
---
>     </ul>
>   </li>
289c299
< <pre><code>&lt;c:forEach var="child" items="${sling:listChildren(resource)"&gt;
---
> <pre><code>&lt;c:forEach var=&quot;child&quot; items=&quot;${sling:listChildren(resource)&quot;&gt;
293c303
< <h2><a href="#tags" id="tags">Tags</a></h2> 
---
> <h2><a href="#tags" name="tags">Tags</a></h2>
295c305
< <h3><a href="#adaptto" id="adaptto">adaptTo</a></h3> 
---
> <h3><a href="#adaptto" name="adaptto">adaptTo</a></h3>
303c313,314
<   </ul> </li> 
---
>     </ul>
>   </li>
307c318
< <pre><code>&lt;sling:adaptTo adaptable="${resource}" adaptTo="org.apache.sling.api.resource.ValueMap" var="myProps" /&gt;
---
> <pre><code>&lt;sling:adaptTo adaptable=&quot;${resource}&quot; adaptTo=&quot;org.apache.sling.api.resource.ValueMap&quot; var=&quot;myProps&quot; /&gt;
309c320
< <h3><a href="#call" id="call">call</a></h3> 
---
> <h3><a href="#call" name="call">call</a></h3>
317c328,329
<   </ul> </li> 
---
>     </ul>
>   </li>
321c333
< <pre><code>&lt;sling:call script="myscript.jsp" /&gt;
---
> <pre><code>&lt;sling:call script=&quot;myscript.jsp&quot; /&gt;
323c335
< <h3><a href="#defineobjects" id="defineobjects">defineObjects</a></h3> 
---
> <h3><a href="#defineobjects" name="defineobjects">defineObjects</a></h3>
346c358,359
<   </ul> </li> 
---
>     </ul>
>   </li>
352c365
< <h3><a href="#encode" id="encode">encode</a></h3> 
---
> <h3><a href="#encode" name="encode">encode</a></h3>
360c373,374
<   </ul> </li> 
---
>     </ul>
>   </li>
364c378
< <pre><code>&lt;sling:encode value="&lt;script&gt;alert('Bad Stuff!');&lt;/script&gt;" mode="HTML" /&gt;
---
> <pre><code>&lt;sling:encode value=&quot;&lt;script&gt;alert(&#39;Bad Stuff!&#39;);&lt;/script&gt;&quot; mode=&quot;HTML&quot; /&gt;
366c380
< <h3><a href="#eval" id="eval">eval</a></h3> 
---
> <h3><a href="#eval" name="eval">eval</a></h3>
376c390,391
<   </ul> </li> 
---
>     </ul>
>   </li>
380c395
< <pre><code>&lt;sling:eval script="myscript.jsp" /&gt;
---
> <pre><code>&lt;sling:eval script=&quot;myscript.jsp&quot; /&gt;
382c397
< <h3><a href="#findresources" id="findresources">findResources</a></h3> 
---
> <h3><a href="#findresources" name="findresources">findResources</a></h3>
390c405,406
<   </ul> </li> 
---
>     </ul>
>   </li>
394c410
< <pre><code>&lt;sling:findResources query="/jcr:root//*[jcr:contains(., 'Sling')] order by @jcr:score" language="xpath" var="resources" /&gt;
---
> <pre><code>&lt;sling:findResources query=&quot;/jcr:root//*[jcr:contains(., &#39;Sling&#39;)] order by @jcr:score&quot; language=&quot;xpath&quot; var=&quot;resources&quot; /&gt;
396c412
< <h3><a href="#forward" id="forward">forward</a></h3> 
---
> <h3><a href="#forward" name="forward">forward</a></h3>
407c423,424
<   </ul> </li> 
---
>     </ul>
>   </li>
411c428
< <pre><code>&lt;sling:forward path="/content/aresource" resourceType="myapp/components/display" /&gt;
---
> <pre><code>&lt;sling:forward path=&quot;/content/aresource&quot; resourceType=&quot;myapp/components/display&quot; /&gt;
413c430
< <h3><a href="#getcaconfigresource" id="getcaconfigresource">getCAConfigResource</a></h3> 
---
> <h3><a href="#getcaconfigresource" name="getcaconfigresource">getCAConfigResource</a></h3>
422c439,440
<   </ul> </li> 
---
>     </ul>
>   </li>
426c444
< <pre><code>&lt;sling:getCAConfigResource resource="${resource}" bucket="site" name="templates" var="config" /&gt;
---
> <pre><code>&lt;sling:getCAConfigResource resource=&quot;${resource}&quot; bucket=&quot;site&quot; name=&quot;templates&quot; var=&quot;config&quot; /&gt;
428c446
< <h3><a href="#getcaconfigresources" id="getcaconfigresources">getCAConfigResources</a></h3> 
---
> <h3><a href="#getcaconfigresources" name="getcaconfigresources">getCAConfigResources</a></h3>
437c455,456
<   </ul> </li> 
---
>     </ul>
>   </li>
441c460
< <pre><code>&lt;sling:getCAConfigResources resource="${resource}" bucket="site" name="templates" var="config" /&gt;
---
> <pre><code>&lt;sling:getCAConfigResources resource=&quot;${resource}&quot; bucket=&quot;site&quot; name=&quot;templates&quot; var=&quot;config&quot; /&gt;
443c462
< <h3><a href="#getparent" id="getparent">getParent</a></h3> 
---
> <h3><a href="#getparent" name="getparent">getParent</a></h3>
451c470,471
<   </ul> </li> 
---
>     </ul>
>   </li>
455c475
< <pre><code>&lt;sling:getParent resource="${resource}" level="2" var="parent" /&gt;
---
> <pre><code>&lt;sling:getParent resource=&quot;${resource}&quot; level=&quot;2&quot; var=&quot;parent&quot; /&gt;
457c477
< <h3><a href="#getparents" id="getparents">getParents</a></h3> 
---
> <h3><a href="#getparents" name="getparents">getParents</a></h3>
465c485,486
<   </ul> </li> 
---
>     </ul>
>   </li>
469c490
< <pre><code>&lt;sling:getProperties properties="${properties}" key="jcr:title" defaultValue="${resource.name}" var="title" /&gt;
---
> <pre><code>&lt;sling:getProperties properties=&quot;${properties}&quot; key=&quot;jcr:title&quot; defaultValue=&quot;${resource.name}&quot; var=&quot;title&quot; /&gt;
471c492
< <h3><a href="#getresource" id="getresource">getResource</a></h3> 
---
> <h3><a href="#getresource" name="getresource">getResource</a></h3>
479c500,501
<   </ul> </li> 
---
>     </ul>
>   </li>
483c505
< <pre><code>&lt;sling:getResource base="${resource}" path="jcr:content" var="content" /&gt;
---
> <pre><code>&lt;sling:getResource base=&quot;${resource}&quot; path=&quot;jcr:content&quot; var=&quot;content&quot; /&gt;
485c507
< <h3><a href="#include" id="include">include</a></h3> 
---
> <h3><a href="#include" name="include">include</a></h3>
499c521,522
<   </ul> </li> 
---
>     </ul>
>   </li>
503c526
< <pre><code>&lt;sling:include path="/content/aresource" resourceType="myapp/components/display" /&gt;
---
> <pre><code>&lt;sling:include path=&quot;/content/aresource&quot; resourceType=&quot;myapp/components/display&quot; /&gt;
505c528
< <h3><a href="#listchildren" id="listchildren">listChildren</a></h3> 
---
> <h3><a href="#listchildren" name="listchildren">listChildren</a></h3>
512c535,536
<   </ul> </li> 
---
>     </ul>
>   </li>
516c540
< <pre><code>&lt;sling:listChildren resource="${resource}" var="children" /&gt;
---
> <pre><code>&lt;sling:listChildren resource=&quot;${resource}&quot; var=&quot;children&quot; /&gt;
diff -b -B -r ./documentation/bundles/scripting/scripting-thymeleaf.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/scripting/scripting-thymeleaf.html
101c101
< <h1><a href="#features" id="features">Features</a></h1> 
---
> <h1><a href="#features" name="features">Features</a></h1>
103c103
<  <li>Supporting all of Thymeleaf's extension points: <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/templateresolver/ITemplateResolver.html"><em>TemplateResolver</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/messageresolver/IMessageResolver.html"><em>MessageResolver</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/dialect/IDialect.html">_Dialect_</a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/linkbuilder/ILinkBuilder.html"><em>LinkBuilder</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/templateparser/markup/decoupled/IDecoupledTemplateLogicResolver.html"><em>DecoupledTemplateLogicResolver</em></a>, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/cache/ICacheManager.html"><em>CacheManager</em></a> and <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/context/IEngineContext.html"><em>EngineContextFactory</em></a></li> 
---
>   <li>Supporting all of Thymeleaf's extension points: <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/templateresolver/ITemplateResolver.html"><em>TemplateResolver</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/messageresolver/IMessageResolver.html"><em>MessageResolver</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/dialect/IDialect.html"><em>Dialect</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/linkbuilder/ILinkBuilder.html"><em>LinkBuilder</em></a>s, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/templateparser/markup/decoupled/IDecoupledTemplateLogicResolver.html"><em>DecoupledTemplateLogicResolver</em></a>, <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/cache/ICacheManager.html"><em>CacheManager</em></a> and <a href="http://www.thymeleaf.org/apidocs/thymeleaf/3.0.0.RELEASE/org/thymeleaf/context/IEngineContext.html"><em>EngineContextFactory</em></a></li>
110c110
< <h1><a href="#installation" id="installation">Installation</a></h1> 
---
> <h1><a href="#installation" name="installation">Installation</a></h1>
121,122c121,122
< <h1><a href="#configuration" id="configuration">Configuration</a></h1> 
< <h2><a href="#apache-sling-scripting-thymeleaf-scriptenginefactory" id="apache-sling-scripting-thymeleaf-scriptenginefactory">Apache Sling Scripting Thymeleaf “ScriptEngineFactory”</a></h2> 
---
> <h1><a href="#configuration" name="configuration">Configuration</a></h1>
> <h2><a href="#apache-sling-scripting-thymeleaf-scriptenginefactory-" name="apache-sling-scripting-thymeleaf-scriptenginefactory-">Apache Sling Scripting Thymeleaf “ScriptEngineFactory”</a></h2>
124,125c124,125
< <p><img src="http://sling.apache.org/Scripting-Thymeleaf-ScriptEngineFactory.png" alt="Apache Sling Scripting Thymeleaf “ScriptEngineFactory”"></p> 
< <h2><a href="#apache-sling-scripting-thymeleaf-sling-resource-templateresolver" id="apache-sling-scripting-thymeleaf-sling-resource-templateresolver">Apache Sling Scripting Thymeleaf “Sling Resource TemplateResolver”</a></h2> 
---
> <p><img src="Scripting-Thymeleaf-ScriptEngineFactory.png" alt="Apache Sling Scripting Thymeleaf “ScriptEngineFactory”" /></p>
> <h2><a href="#apache-sling-scripting-thymeleaf-sling-resource-templateresolver-" name="apache-sling-scripting-thymeleaf-sling-resource-templateresolver-">Apache Sling Scripting Thymeleaf “Sling Resource TemplateResolver”</a></h2>
127,128c127,128
< <p><img src="http://sling.apache.org/Scripting-Thymeleaf-Sling-Resource-TemplateResolver.png" alt="Apache Sling Scripting Thymeleaf “Sling Resource TemplateResolver”"></p> 
< <h2><a href="#apache-sling-scripting-thymeleaf-pattern-templatemodeprovider" id="apache-sling-scripting-thymeleaf-pattern-templatemodeprovider">Apache Sling Scripting Thymeleaf “Pattern TemplateModeProvider”</a></h2> 
---
> <p><img src="Scripting-Thymeleaf-Sling-Resource-TemplateResolver.png" alt="Apache Sling Scripting Thymeleaf “Sling Resource TemplateResolver”" /></p>
> <h2><a href="#apache-sling-scripting-thymeleaf-pattern-templatemodeprovider-" name="apache-sling-scripting-thymeleaf-pattern-templatemodeprovider-">Apache Sling Scripting Thymeleaf “Pattern TemplateModeProvider”</a></h2>
130,131c130,131
< <p><img src="http://sling.apache.org/Scripting-Thymeleaf-Pattern-TemplateModeProvider.png" alt="Apache Sling Scripting Thymeleaf “Pattern TemplateModeProvider"></p> 
< <h2><a href="#apache-sling-scripting-thymeleaf-resourcebundle-messageresolver" id="apache-sling-scripting-thymeleaf-resourcebundle-messageresolver">Apache Sling Scripting Thymeleaf “ResourceBundle MessageResolver”</a></h2> 
---
> <p><img src="Scripting-Thymeleaf-Pattern-TemplateModeProvider.png" alt="Apache Sling Scripting Thymeleaf “Pattern TemplateModeProvider" /></p>
> <h2><a href="#apache-sling-scripting-thymeleaf-resourcebundle-messageresolver-" name="apache-sling-scripting-thymeleaf-resourcebundle-messageresolver-">Apache Sling Scripting Thymeleaf “ResourceBundle MessageResolver”</a></h2>
133,134c133,134
< <p><img src="http://sling.apache.org/Scripting-Thymeleaf-ResourceBundle-MessageResolver.png" alt="Apache Sling Scripting Thymeleaf “ResourceBundle MessageResolver”"></p> 
< <h1><a href="#sling-dialect" id="sling-dialect">Sling Dialect</a></h1> 
---
> <p><img src="Scripting-Thymeleaf-ResourceBundle-MessageResolver.png" alt="Apache Sling Scripting Thymeleaf “ResourceBundle MessageResolver”" /></p>
> <h1><a href="#sling-dialect" name="sling-dialect">Sling Dialect</a></h1>
136,137c136,137
< <h2><a href="#include" id="include">include</a></h2> 
< <p><code>&lt;header data-sling-include="${resource}" data-sling-resourceType="'example/page/header'" data-sling-unwrap="true"/&gt;</code></p> 
---
> <h2><a href="#include" name="include">include</a></h2>
> <p><code>&lt;header data-sling-include=&quot;${resource}&quot; data-sling-resourceType=&quot;&#39;example/page/header&#39;&quot; data-sling-unwrap=&quot;true&quot;/&gt;</code></p>
139c139
< <h3><a href="#supported-options-requestdispatcher-option" id="supported-options-requestdispatcher-option">supported options (* = </a><a href="http://sling.apache.org/apidocs/sling7/org/apache/sling/api/request/RequestDispatcherOptions.html">RequestDispatcher option</a>)</h3> 
---
> <h3>supported options (* = <a href="http://sling.apache.org/apidocs/sling7/org/apache/sling/api/request/RequestDispatcherOptions.html">RequestDispatcher option</a>)</h3>
141,144c141,148
<  <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>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>
147,149c151,153
< <h1><a href="#class-diagram" id="class-diagram">Class Diagram</a></h1> 
< <p><a href="Scripting-Thymeleaf-Class-Diagram.png"><img src="http://sling.apache.org/Scripting-Thymeleaf-Class-Diagram.png" alt="Class Diagram"></a></p> 
< <h1><a href="#sample" id="sample">Sample</a></h1> 
---
> <h1><a href="#class-diagram" name="class-diagram">Class Diagram</a></h1>
> <p><a href="Scripting-Thymeleaf-Class-Diagram.png"><img src="Scripting-Thymeleaf-Class-Diagram.png" alt="Class Diagram" /></a></p>
> <h1><a href="#sample" name="sample">Sample</a></h1>
151c155
< <p><img src="http://sling.apache.org/sling-fling-sample.png" alt="Sling Fling Sample"></p></section></div></div>            
---
> <p><img src="sling-fling-sample.png" alt="Sling Fling Sample" /></p></section></div></div>            
diff -b -B -r ./documentation/bundles/scripting.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/scripting.html
97c97
< <h1><a href="#sling-scripting-engines" id="sling-scripting-engines">Sling Scripting Engines</a></h1> 
---
> <h1><a href="#sling-scripting-engines" name="sling-scripting-engines">Sling Scripting Engines</a></h1>
diff -b -B -r ./documentation/bundles/servlet-helpers.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/servlet-helpers.html
97,98c97,98
< <h2><a href="#usage" id="usage">Usage</a></h2> 
< <h3><a href="#slinghttpservletrequest" id="slinghttpservletrequest">SlingHttpServletRequest</a></h3> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
> <h3><a href="#slinghttpservletrequest" name="slinghttpservletrequest">SlingHttpServletRequest</a></h3>
104c104
< request.setQueryString("param1=aaa&amp;param2=bbb");
---
> request.setQueryString(&quot;param1=aaa&amp;param2=bbb&quot;);
108,109c108,109
<     .put("param1", "aaa")
<     .put("param2", "bbb")
---
>     .put(&quot;param1&quot;, &quot;aaa&quot;)
>     .put(&quot;param2&quot;, &quot;bbb&quot;)
113c113
< request.setResource(resourceResolver.getResource("/content/sample"));
---
> request.setResource(resourceResolver.getResource(&quot;/content/sample&quot;));
117,118c117,118
< requestPathInfo.setSelectorString("selector1.selector2");
< requestPathInfo.setExtension("html");
---
> requestPathInfo.setSelectorString(&quot;selector1.selector2&quot;);
> requestPathInfo.setExtension(&quot;html&quot;);
124c124
< request.setAttribute("attr1", "value1");
---
> request.setAttribute(&quot;attr1&quot;, &quot;value1&quot;);
127c127
< request.addHeader("header1", "value1");
---
> request.addHeader(&quot;header1&quot;, &quot;value1&quot;);
130c130
< request.addCookie(new Cookie("cookie1", "value1"));
---
> request.addCookie(new Cookie(&quot;cookie1&quot;, &quot;value1&quot;));
132c132
< <h3><a href="#slinghttpservletresponse" id="slinghttpservletresponse">SlingHttpServletResponse</a></h3> 
---
> <h3><a href="#slinghttpservletresponse" name="slinghttpservletresponse">SlingHttpServletResponse</a></h3>
143c143
< assertEquals("text/plain;charset=UTF-8", response.getContentType());
---
> assertEquals(&quot;text/plain;charset=UTF-8&quot;, response.getContentType());
148,149c148,149
< assertTrue(response.containsHeader("header1"));
< assertEquals("5", response.getHeader("header2"));
---
> assertTrue(response.containsHeader(&quot;header1&quot;));
> assertEquals(&quot;5&quot;, response.getHeader(&quot;header2&quot;));
diff -b -B -r ./documentation/bundles/sling-health-check-tool.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-health-check-tool.html
101c101
<  <li><a href="https://github.com/apache?utf8=%E2%9C%93&amp;q=sling%20hc">Source code for the HealthCheck modules on GitHub</a></li> 
---
>   <li><a href="https://github.com/apache?utf8=%E2%9C%93&q=sling%20hc">Source code for the HealthCheck modules on GitHub</a></li>
106c106,107
<   </ul> </li> 
---
>     </ul>
>   </li>
108c109
< <h2><a href="#use-cases" id="use-cases">Use cases</a></h2> 
---
> <h2><a href="#use-cases" name="use-cases">Use cases</a></h2>
125c126
< <h2><a href="#whats-a-healthcheck-" id="whats-a-healthcheck-">What's a <code>HealthCheck</code> ?</a></h2> 
---
> <h2>What's a <code>HealthCheck</code> ?</h2>
155c156
< <h3><a href="#slinghealthcheck-annotation" id="slinghealthcheck-annotation">SlingHealthCheck annotation</a></h3> 
---
> <h3><a href="#slinghealthcheck-annotation" name="slinghealthcheck-annotation">SlingHealthCheck annotation</a></h3>
159,162c160,163
<     name="Annotated Health Check Sample", 
<     mbeanName="annotatedHC",
<     description="Sample Health Check defined by a java annotation",
<     tags={"sample","annotation"})
---
>     name=&quot;Annotated Health Check Sample&quot;, 
>     mbeanName=&quot;annotatedHC&quot;,
>     description=&quot;Sample Health Check defined by a java annotation&quot;,
>     tags={&quot;sample&quot;,&quot;annotation&quot;})
172,173c173,174
< <h2><a href="#executing-health-checks" id="executing-health-checks">Executing Health Checks</a></h2> 
< <p>Health Checks can be executed via a <a href="#webconsole-plugin">webconsole plugin</a>, the <a href="#health-check-servlet">health check servlet</a> or via <a href="#jmx-access-to-health-checks">JMX</a>. <code>HealthCheck</code> services can be selected for execution based on their <code>hc.tags</code> multi-value service property.</p> 
---
> <h2><a href="#executing-health-checks" name="executing-health-checks">Executing Health Checks</a></h2>
> <p>Health Checks can be executed via a <a href="#webconsole-plugin">webconsole plugin</a>, the <a href="#health-check-servlet">health check servlet</a> or via <a href="#jmx-access-to-health-checks">JMX</a>. <code>HealthCheck</code> services can be selected for execution based on their <code>hc.tags</code> multi-value service property. </p>
176c177
< <h2><a href="#health-check-bundles" id="health-check-bundles">Health Check bundles</a></h2> 
---
> <h2><a href="#health-check-bundles" name="health-check-bundles">Health Check bundles</a></h2>
186,187c187,188
< <h2><a href="#out-of-the-box-healthcheck-services" id="out-of-the-box-healthcheck-services">Out-of-the-box <code>HealthCheck</code> services</a></h2> 
< <p>The following default <code>HealthCheck</code> services are provided by the <code>org.apache.sling.hc.core</code> bundle:</p> 
---
> <h2>Out-of-the-box <code>HealthCheck</code> services</h2>
> <p>The following default <code>HealthCheck</code> services are provided by the <code>org.apache.sling.hc.core</code> bundle: </p>
202c203
< <h2><a href="#configuring-health-checks" id="configuring-health-checks">Configuring Health Checks</a></h2> 
---
> <h2><a href="#configuring-health-checks" name="configuring-health-checks">Configuring Health Checks</a></h2>
209,210c210,211
<    <th> Type </th>
<    <th> Description</th>
---
>       <th>Type </th>
>       <th>Description</th>
216,217c217,218
<    <td> String </td>
<    <td> The name of the health check as shown in UI</td>
---
>       <td>String </td>
>       <td>The name of the health check as shown in UI</td>
221,222c222,223
<    <td> String[] </td>
<    <td> List of tags: Both Felix Console Plugin and Health Check servlet support selecting relevant checks by providing a list of tags</td>
---
>       <td>String[] </td>
>       <td>List of tags: Both Felix Console Plugin and Health Check servlet support selecting relevant checks by providing a list of tags</td>
226,227c227,228
<    <td> String </td>
<    <td> Makes the HC result available via given MBean name. If not provided no MBean is created for that <code>HealthCheck</code></td>
---
>       <td>String </td>
>       <td>Makes the HC result available via given MBean name. If not provided no MBean is created for that <code>HealthCheck</code></td>
231,232c232,233
<    <td> String </td>
<    <td> Used to schedule the execution of a <code>HealthCheck</code> at regular intervals, using a cron expression as specified by the <a href="/documentation/bundles/scheduler-service-commons-scheduler.html">Sling Scheduler</a> module.</td>
---
>       <td>String </td>
>       <td>Used to schedule the execution of a <code>HealthCheck</code> at regular intervals, using a cron expression as specified by the <a href="/documentation/bundles/scheduler-service-commons-scheduler.html">Sling Scheduler</a> module.</td>
236,237c237,238
<    <td> Long </td>
<    <td> Overrides the global default TTL as configured in health check executor for health check responses (since v1.2.6 of core)</td>
---
>       <td>Long </td>
>       <td>Overrides the global default TTL as configured in health check executor for health check responses (since v1.2.6 of core)</td>
241,242c242,243
<    <td> Long </td>
<    <td> This property will make WARN/CRITICAL results stay visible for future executions, even if the current state has returned to status OK. It is useful to keep attention on issues that might still require action after the state went back to OK, e.g. if an event pool has overflown and some events might have been lost (since v1.2.10 of core)</td>
---
>       <td>Long </td>
>       <td>This property will make WARN/CRITICAL results stay visible for future executions, even if the current state has returned to status OK. It is useful to keep attention on issues that might still require action after the state went back to OK, e.g. if an event pool has overflown and some events might have been lost (since v1.2.10 of core)</td>
249,253c250,254
< "hc.name" : "LoadedClassCount and ManagementSpecVersion are in range" 
< "hc.mbean.name" : "LoadedClassCount and ManagementSpecVersion"
< "hc.tags" : [jvm, script]
< "expression" : "jmx.attribute('java.lang:type=ClassLoading', 'LoadedClassCount') &gt; 10 &amp;&amp;  jmx.attribute('java.lang:type=Runtime', 'ManagementSpecVersion') &gt; 1" 
< "language.extension" : "ecma" 
---
> &quot;hc.name&quot; : &quot;LoadedClassCount and ManagementSpecVersion are in range&quot; 
> &quot;hc.mbean.name&quot; : &quot;LoadedClassCount and ManagementSpecVersion&quot;
> &quot;hc.tags&quot; : [jvm, script]
> &quot;expression&quot; : &quot;jmx.attribute(&#39;java.lang:type=ClassLoading&#39;, &#39;LoadedClassCount&#39;) &gt; 10 &amp;&amp;  jmx.attribute(&#39;java.lang:type=Runtime&#39;, &#39;ManagementSpecVersion&#39;) &gt; 1&quot; 
> &quot;language.extension&quot; : &quot;ecma&quot; 
255,256c256,257
< <p>The service properties starting with the <code>hc.</code> prefix in this example should be provided by all <code>HealthCheck</code> services.</p> 
< <h2><a href="#configuring-the-health-check-executor" id="configuring-the-health-check-executor">Configuring the Health Check Executor</a></h2> 
---
> <p>The service properties starting with the <code>hc.</code> prefix in this example should be provided by all <code>HealthCheck</code> services. </p>
> <h2><a href="#configuring-the-health-check-executor" name="configuring-the-health-check-executor">Configuring the Health Check Executor</a></h2>
262,264c263,265
<    <th> Type </th>
<    <th> Default </th>
<    <th> Description</th>
---
>       <th>Type </th>
>       <th>Default </th>
>       <th>Description</th>
270,272c271,273
<    <td> Long </td>
<    <td> 2000ms </td>
<    <td> Timeout in ms until a check is marked as timed out</td>
---
>       <td>Long </td>
>       <td>2000ms </td>
>       <td>Timeout in ms until a check is marked as timed out</td>
276,278c277,279
<    <td> Long </td>
<    <td> 300000ms = 5min </td>
<    <td> Threshold in ms until a check is marked as 'exceedingly' timed out and will marked CRITICAL instead of WARN only</td>
---
>       <td>Long </td>
>       <td>300000ms = 5min </td>
>       <td>Threshold in ms until a check is marked as 'exceedingly' timed out and will marked CRITICAL instead of WARN only</td>
282,284c283,285
<    <td> Long </td>
<    <td> 2000ms </td>
<    <td> Result Cache time to live - results will be cached for the given time</td>
---
>       <td>Long </td>
>       <td>2000ms </td>
>       <td>Result Cache time to live - results will be cached for the given time</td>
288c289
< <h2><a href="#webconsole-plugin" id="webconsole-plugin">Webconsole plugin</a></h2> 
---
> <h2><a href="#webconsole-plugin" name="webconsole-plugin">Webconsole plugin</a></h2>
292,293c293,294
< <p><img src="http://sling.apache.org/sling-hc-plugin.jpg" alt="Health Check Webconsole Plugin"></p> 
< <h2><a href="#jmx-access-to-health-checks" id="jmx-access-to-health-checks">JMX access to health checks</a></h2> 
---
> <p><img src="sling-hc-plugin.jpg" alt="Health Check Webconsole Plugin" /></p>
> <h2><a href="#jmx-access-to-health-checks" name="jmx-access-to-health-checks">JMX access to health checks</a></h2>
295c296
< <p>The MBean gives access to the <code>Result</code> and the log, as shown on the screenshot below.</p> 
---
> <p>The MBean gives access to the <code>Result</code> and the log, as shown on the screenshot below. </p>
297,298c298,299
< <p><img src="http://sling.apache.org/jconsole-hc.jpg" alt="JConsole showing Sling Health Check MBeans"></p> 
< <h2><a href="#health-check-servlet" id="health-check-servlet">Health Check Servlet</a></h2> 
---
> <p><img src="jconsole-hc.jpg" alt="JConsole showing Sling Health Check MBeans" /></p>
> <h2><a href="#health-check-servlet" name="health-check-servlet">Health Check Servlet</a></h2>
307,308c308,309
< <h2><a href="#health-checks-as-server-side-junit-tests" id="health-checks-as-server-side-junit-tests">Health Checks as server-side JUnit tests</a></h2> 
< <p>The <code>org.apache.sling.hc.junit.bridge</code> bundle makes selected Health Checks available as server-side JUnit tests.</p> 
---
> <h2><a href="#health-checks-as-server-side-junit-tests" name="health-checks-as-server-side-junit-tests">Health Checks as server-side JUnit tests</a></h2>
> <p>The <code>org.apache.sling.hc.junit.bridge</code> bundle makes selected Health Checks available as server-side JUnit tests. </p>
310c311
< <p>The idea is to implement the smoke tests of your system, for example, as health checks. You can then run them as part of integration testing, using the <a href="/documentation/development/sling-testing-tools.html">Sling Testing Tools</a><br> remote testing utilities, and also as plain Health Checks for monitoring or troubleshooting Sling instances.</p> 
---
> <p>The idea is to implement the smoke tests of your system, for example, as health checks. You can then run them as part of integration testing, using the <a href="/documentation/development/sling-testing-tools.html">Sling Testing Tools</a><br/>remote testing utilities, and also as plain Health Checks for monitoring or troubleshooting Sling instances.</p>
diff -b -B -r ./documentation/bundles/sling-oak-restrictions.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-oak-restrictions.html
100c100
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
102,104c102,104
< <p><strong>Important:</strong> Using the sling restrictions (as well as standard oak restrictions) is not as performant as simple path based ACE entries without any restrictions. Permission setups should always mostly work with path based ACEs and only use ACEs with restrictions for special cases.</p> 
< <h2><a href="#restriction-slingresourcetypes" id="restriction-slingresourcetypes">Restriction sling:resourceTypes</a></h2> 
< <p>This restriction allows to match against a sling resource type of a node and works much like the oak standard restriction <code>rep:ntNames</code>. Only resources that have one of the supplied resource types are matched, child and parent resources with other resource types are not matched.</p> 
---
> <p><strong>Important:</strong> Using the sling restrictions (as well as standard oak restrictions) is not as performant as simple path based ACE entries without any restrictions. Permission setups should always mostly work with path based ACEs and only use ACEs with restrictions for special cases. </p>
> <h2><a href="#restriction-sling-resourcetypes" name="restriction-sling-resourcetypes">Restriction sling:resourceTypes</a></h2>
> <p>This restriction allows to match against a sling resource type of a node and works much like the oak standard restriction <code>rep:ntNames</code>. Only resources that have one of the supplied resource types are matched, child and parent resources with other resource types are not matched. </p>
106,120c106,113
< <ul> 
<  <li>/content/myprj/mynode 
<   <ul> 
<    <li>rep:policy (rep:ACL) 
<     <ul> 
<      <li>allow (rep:GrantACE)</li> 
<      <li>principalName (String) = "myAuthorizable"</li> 
<      <li>rep:privileges (Name[]) = "rep:write"</li> 
<      <li>rep:restrictions (rep:Restrictions) 
<       <ul> 
<        <li>sling:resourceTypes (String[]) = [myproj/comp1,myproj/comp2]</li> 
<       </ul> </li> 
<     </ul> </li> 
<   </ul> </li> 
< </ul> 
---
> <pre><code>- /content/myprj/mynode 
>    - rep:policy (rep:ACL)
>      - allow (rep:GrantACE)
>        + principalName (String) = &quot;myAuthorizable&quot;
>        + rep:privileges (Name[]) = &quot;rep:write&quot;
>        - rep:restrictions (rep:Restrictions)
>           + sling:resourceTypes (String[]) = [myproj/comp1,myproj/comp2]
> </code></pre>
122,133c115,121
< <ul> 
<  <li>/content/myprj 
<   <ul> 
<    <li>sling:resourceType (String) = "myproj/siteroot"</li> 
<    <li>mynode 
<     <ul> 
<      <li>sling:resourceType (String) = "myproj/comp1"</li> 
<      <li>mysubnode</li> 
<      <li>sling:resourceType (String) = "myproj/comp3"</li> 
<     </ul> </li> 
<   </ul> </li> 
< </ul> 
---
> <pre><code>- /content/myprj 
>    + sling:resourceType (String) = &quot;myproj/siteroot&quot;
>    - mynode
>      + sling:resourceType (String) = &quot;myproj/comp1&quot;
>      - mysubnode 
>        + sling:resourceType (String) = &quot;myproj/comp3&quot;
> </code></pre>
136c124
< <h2><a href="#restriction-slingresourcetypeswithdescendants" id="restriction-slingresourcetypeswithdescendants">Restriction sling:resourceTypesWithDescendants</a></h2> 
---
> <h2><a href="#restriction-sling-resourcetypeswithdescendants" name="restriction-sling-resourcetypeswithdescendants">Restriction sling:resourceTypesWithDescendants</a></h2>
139,153c127,134
< <ul> 
<  <li>/content/myprj/mynode 
<   <ul> 
<    <li>rep:policy (rep:ACL) 
<     <ul> 
<      <li>allow (rep:GrantACE)</li> 
<      <li>principalName (String) = "myAuthorizable"</li> 
<      <li>rep:privileges (Name[]) = "rep:write" 
<       <ul> 
<        <li>rep:restrictions (rep:Restrictions)</li> 
<        <li>sling:resourceTypesWithDescendants (String[]) = [myproj/comp1,myproj/comp2]</li> 
<       </ul> </li> 
<     </ul> </li> 
<   </ul> </li> 
< </ul> 
---
> <pre><code>- /content/myprj/mynode 
>    - rep:policy (rep:ACL)
>      - allow (rep:GrantACE)
>        + principalName (String) = &quot;myAuthorizable&quot;
>        + rep:privileges (Name[]) = &quot;rep:write&quot;
>          - rep:restrictions (rep:Restrictions)
>            + sling:resourceTypesWithDescendants (String[]) = [myproj/comp1,myproj/comp2]
> </code></pre>
155,156c136,137
< <h2><a href="#advanced-path-matching" id="advanced-path-matching">Advanced Path Matching</a></h2> 
< <p>Both <a href="#restriction-slingresourcetypes">sling:resourceTypes</a> and <a href="#restriction-slingresourcetypeswithdescendants">sling:resourceTypesWithDescendants</a> support advanced path matching by using <code>resourcetype@path</code>. That way instead of checking the resource type of the current node, the resource type of node at the relative path is checked. For instance this is useful for the case where page content is stored in a <code>jcr:content</code> subnode of a hierarchy, the permission however is required to become effective on the parent node of <code>jcr:content</code>.</p> 
---
> <h2><a href="#advanced-path-matching" name="advanced-path-matching">Advanced Path Matching</a></h2>
> <p>Both <a href="#restriction-slingresourcetypes">sling:resourceTypes</a> and <a href="#restriction-slingresourcetypeswithdescendants">sling:resourceTypesWithDescendants</a> support advanced path matching by using <code>resourcetype@path</code>. That way instead of checking the resource type of the current node, the resource type of node at the relative path is checked. For instance this is useful for the case where page content is stored in a <code>jcr:content</code> subnode of a hierarchy, the permission however is required to become effective on the parent node of <code>jcr:content</code>. </p>
158,172c139,146
< <ul> 
<  <li>/content/myprj/mynode 
<   <ul> 
<    <li>rep:policy (rep:ACL) 
<     <ul> 
<      <li>allow (rep:GrantACE)</li> 
<      <li>principalName (String) = "myAuthorizable"</li> 
<      <li>rep:privileges (Name[]) = "rep:write"</li> 
<      <li>rep:restrictions (rep:Restrictions) 
<       <ul> 
<        <li>sling:resourceTypesWithDescendants (String[]) = [myproj/comp1@jcr:content,myproj/comp2@jcr:content]</li> 
<       </ul> </li> 
<     </ul> </li> 
<   </ul> </li> 
< </ul> 
---
> <pre><code>- /content/myprj/mynode 
>    - rep:policy (rep:ACL)
>      - allow (rep:GrantACE)
>        + principalName (String) = &quot;myAuthorizable&quot;
>        + rep:privileges (Name[]) = &quot;rep:write&quot;
>        - rep:restrictions (rep:Restrictions)
>           + sling:resourceTypesWithDescendants (String[]) = [myproj/comp1@jcr:content,myproj/comp2@jcr:content]
> </code></pre>
174,215c148,168
< <ul> 
<  <li>/content/myprj 
<   <ul> 
<    <li>jcr:content 
<     <ul> 
<      <li>sling:resourceType (String) = "myproj/siteroot"</li> 
<     </ul> </li> 
<    <li>mynode1 
<     <ul> 
<      <li>jcr:content 
<       <ul> 
<        <li>sling:resourceType (String) = "myproj/comp1"</li> 
<       </ul> </li> 
<      <li>mysubnode1</li> 
<      <li>jcr:content 
<       <ul> 
<        <li>sling:resourceType (String) = "myproj/comp3"</li> 
<        <li>contentsubnode1 
<         <ul> 
<          <li>sling:resourceType (String) = "myproj/comp4"</li> 
<         </ul> </li> 
<        <li>contentsubnode2 
<         <ul> 
<          <li>sling:resourceType (String) = "myproj/comp5"</li> 
<         </ul> </li> 
<       </ul> </li> 
<      <li>mysubnode2</li> 
<      <li>jcr:content 
<       <ul> 
<        <li>sling:resourceType (String) = "myproj/comp3"</li> 
<       </ul> </li> 
<     </ul> </li> 
<    <li>mynode2 
<     <ul> 
<      <li>jcr:content 
<       <ul> 
<        <li>sling:resourceType (String) = "myproj/comp7"</li> 
<       </ul> </li> 
<     </ul> </li> 
<   </ul> </li> 
< </ul> 
< <p>the rule from above will match</p> 
---
> <pre><code>- /content/myprj 
>    - jcr:content 
>       + sling:resourceType (String) = &quot;myproj/siteroot&quot;
>    - mynode1
>      - jcr:content 
>         + sling:resourceType (String) = &quot;myproj/comp1&quot;
>      - mysubnode1 
>        - jcr:content 
>           + sling:resourceType (String) = &quot;myproj/comp3&quot;
>           - contentsubnode1 
>             + sling:resourceType (String) = &quot;myproj/comp4&quot;
>           - contentsubnode2
>             + sling:resourceType (String) = &quot;myproj/comp5&quot;
>      - mysubnode2 
>        - jcr:content 
>           + sling:resourceType (String) = &quot;myproj/comp3&quot;
>    - mynode2
>      - jcr:content 
>         + sling:resourceType (String) = &quot;myproj/comp7&quot;
> </code></pre>
> <p>the rule from above will match </p>
diff -b -B -r ./documentation/bundles/sling-pipes/bindings.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-pipes/bindings.html
97c97
< <h2><a href="#configuration-expression" id="configuration-expression">configuration expression</a></h2> 
---
> <h2><a href="#configuration-expression" name="configuration-expression">configuration expression</a></h2>
100,101c100,101
< <h2><a href="#output-binding" id="output-binding">output binding</a></h2> 
< <p>each single pipe has to declare an output binding at the same time it outputs a resource. The binding will be named as the name of the pipe outputing it. If a pipe as been created as a sub pipe of a container with pipe builder api, it will have default name of "one", "two", ... depending on its position in the pipe, you can override the name with <code>.name(...)</code> api.</p> 
---
> <h2><a href="#output-binding" name="output-binding">output binding</a></h2>
> <p>each single pipe has to declare an output binding at the same time it outputs a resource. The binding will be named as the name of the pipe outputing it. If a pipe as been created as a sub pipe of a container with pipe builder api, it will have default name of "one", "two", ... depending on its position in the pipe, you can override the name with <code>.name(...)</code> api. </p>
103,105c103,105
< <pre><code>    .echo('/content/foo')
<     .children('nt:unstructured').name('example')
<     .write('jcr:description','this node property prop = ${example.prop}')
---
> <pre><code>    .echo(&#39;/content/foo&#39;)
>     .children(&#39;nt:unstructured&#39;).name(&#39;example&#39;)
>     .write(&#39;jcr:description&#39;,&#39;this node property prop = ${example.prop}&#39;)
109,111c109,111
<         "jcr:primaryType":"nt:unstructured",
<         "firstItem": {
<             "prop":"firstVal"
---
>         &quot;jcr:primaryType&quot;:&quot;nt:unstructured&quot;,
>         &quot;firstItem&quot;: {
>             &quot;prop&quot;:&quot;firstVal&quot;
113,114c113,114
<         "firstItem": {
<             "prop":"secondVal"
---
>         &quot;firstItem&quot;: {
>             &quot;prop&quot;:&quot;secondVal&quot;
120,123c120,123
<         "jcr:primaryType":"nt:unstructured",
<         "firstItem": {
<             "prop":"firstVal"
<             "jcr:description":"this node property prop = firstVal"
---
>         &quot;jcr:primaryType&quot;:&quot;nt:unstructured&quot;,
>         &quot;firstItem&quot;: {
>             &quot;prop&quot;:&quot;firstVal&quot;
>             &quot;jcr:description&quot;:&quot;this node property prop = firstVal&quot;
125,127c125,127
<         "firstItem": {
<             "prop":"secondVal"
<             "jcr:description":"this node property prop = secondVal"
---
>         &quot;firstItem&quot;: {
>             &quot;prop&quot;:&quot;secondVal&quot;
>             &quot;jcr:description&quot;:&quot;this node property prop = secondVal&quot;
131c131
< <h2><a href="#additional-bindings" id="additional-bindings">additional bindings</a></h2> 
---
> <h2><a href="#additional-bindings" name="additional-bindings">additional bindings</a></h2>
136c136
< <pre><code>    .runWith("env", "prod")
---
> <pre><code>    .runWith(&quot;env&quot;, &quot;prod&quot;)
139c139
< <pre><code>    -F binding='{"env":"prod"}'
---
> <pre><code>    -F binding=&#39;{&quot;env&quot;:&quot;prod&quot;}&#39;
141c141
< <h2><a href="#additional-scripts" id="additional-scripts">additional scripts</a></h2> 
---
> <h2><a href="#additional-scripts" name="additional-scripts">additional scripts</a></h2>
143c143
< <h2><a href="#bindings-forward" id="bindings-forward">bindings forward</a></h2> 
---
> <h2><a href="#bindings-forward" name="bindings-forward">bindings forward</a></h2>
diff -b -B -r ./documentation/bundles/sling-pipes/execution-monitoring.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-pipes/execution-monitoring.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#jcr-persistence-of-a-pipe" id="jcr-persistence-of-a-pipe">JCR persistence of a pipe</a></h3> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#jcr-persistence-of-a-pipe" name="jcr-persistence-of-a-pipe">JCR persistence of a pipe</a></h3>
101,102c101,102
<    <th> Configuration node property </th>
<    <th> Explanation </th>
---
>       <th>Configuration node property </th>
>       <th>Explanation </th>
107,108c107,108
<    <td> <code>sling:resourceType</code> </td>
<    <td> which must be a pipe type registered by the plumber </td>
---
>       <td><code>sling:resourceType</code> </td>
>       <td>which must be a pipe type registered by the plumber </td>
111,112c111,112
<    <td> <code>name</code> </td>
<    <td> that will be used in bindings as an id, and will be the key for the output bindings (default value being a value map of the current output resource). Note that the node name will be used in case no name is provided. </td>
---
>       <td><code>name</code> </td>
>       <td>that will be used in bindings as an id, and will be the key for the output bindings (default value being a value map of the current output resource). Note that the node name will be used in case no name is provided. </td>
115,116c115,116
<    <td> <code>path</code> </td>
<    <td> defines pipe's input. Note that property is not mandatory in case the pipe is streamed after another pipe, in which case previous pipe output's can be used as input. </td>
---
>       <td><code>path</code> </td>
>       <td>defines pipe's input. Note that property is not mandatory in case the pipe is streamed after another pipe, in which case previous pipe output's can be used as input. </td>
119,120c119,120
<    <td> <code>expr</code> </td>
<    <td> expression through which the pipe will execute (depending on the type) </td>
---
>       <td><code>expr</code> </td>
>       <td>expression through which the pipe will execute (depending on the type) </td>
123,124c123,124
<    <td> <code>additionalScripts</code> </td>
<    <td> multi value property to declare scripts that can be reused in <a href="/documentation/bundles/sling-pipes/bindings.html">expressions</a>&nbsp;</td>
---
>       <td><code>additionalScripts</code> </td>
>       <td>multi value property to declare scripts that can be reused in <a href="/documentation/bundles/sling-pipes/bindings.html">expressions</a> </td>
131,132c131,132
<    <th> Configuration child node </th>
<    <th> Explanation </th>
---
>       <th>Configuration child node </th>
>       <th>Explanation </th>
137,138c137,138
<    <td>&nbsp;<code>conf</code> </td>
<    <td>&nbsp;optional, contains addition configuration of the pipe (depending on the type)&nbsp;</td>
---
>       <td> <code>conf</code> </td>
>       <td> optional, contains addition configuration of the pipe (depending on the type) </td>
141,142c141,142
<    <td> <code>additionalBinding</code> </td>
<    <td> set "global" <a href="/documentation/bundles/sling-pipes/bindings.html">bindings</a> (property=value) in pipe execution </td>
---
>       <td><code>additionalBinding</code> </td>
>       <td>set "global" <a href="/documentation/bundles/sling-pipes/bindings.html">bindings</a> (property=value) in pipe execution </td>
145,146c145,146
<    <td> <code>writer</code> </td>
<    <td>&nbsp;set a writer with key / value property being label, and value of each added entry. Those values can be <a href="/documentation/bundles/sling-pipes/bindings.html">expressions</a>&nbsp;</td>
---
>       <td><code>writer</code> </td>
>       <td> set a writer with key / value property being label, and value of each added entry. Those values can be <a href="/documentation/bundles/sling-pipes/bindings.html">expressions</a> </td>
150c150
< <h3><a href="#java" id="java">Java</a></h3> 
---
> <h3><a href="#java" name="java">Java</a></h3>
158,161c158,161
< <p>You can encapsulate the whole execution of a pipe through the <code>execute</code> methods that are used internally by both Pipe Builder and HTTP APIs.</p> 
< <h3><a href="#pipe-builder-api" id="pipe-builder-api">Pipe Builder API</a></h3> 
< <p>Plumber osgi service provides PipeBuilder with <code>newPipe(ResourceResolver resolver)</code> API, that gives a fluent API to quickly configure and run pipes. e.g.</p> 
< <pre><code>plumber.newPipe(resolver).xpath('//element(*,nt:unstructured)[@sling:resourceType='to/delete']").rm().run();
---
> <p>You can encapsulate the whole execution of a pipe through the <code>execute</code> methods that are used internally by both Pipe Builder and HTTP APIs. </p>
> <h3><a href="#pipe-builder-api" name="pipe-builder-api">Pipe Builder API</a></h3>
> <p>Plumber osgi service provides PipeBuilder with <code>newPipe(ResourceResolver resolver)</code> API, that gives a fluent API to quickly configure and run pipes. e.g. </p>
> <pre><code>plumber.newPipe(resolver).xpath(&#39;//element(*,nt:unstructured)[@sling:resourceType=&#39;to/delete&#39;]&quot;).rm().run();
165c165
< <pre><code>     def plumber = getService("org.apache.sling.pipes.Plumber");
---
> <pre><code>     def plumber = getService(&quot;org.apache.sling.pipes.Plumber&quot;);
168c168
<          .echo("/content/mySite")
---
>          .echo(&quot;/content/mySite&quot;)
174,175c174,175
<    <th> Pipe Builder Method </th>
<    <th> Explanation </th>
---
>       <th>Pipe Builder Method </th>
>       <th>Explanation </th>
180,181c180,181
<    <td> <code>pipe(type)</code> </td>
<    <td> generate a new subpipe </td>
---
>       <td><code>pipe(type)</code> </td>
>       <td>generate a new subpipe </td>
184,185c184,185
<    <td> <code>with(Object...)</code> </td>
<    <td> add to actual subpipe configuration node key/value configurations </td>
---
>       <td><code>with(Object...)</code> </td>
>       <td>add to actual subpipe configuration node key/value configurations </td>
188,189c188,189
<    <td> <code>expr(String)</code> </td>
<    <td> add an <code>expr</code> configuration </td>
---
>       <td><code>expr(String)</code> </td>
>       <td>add an <code>expr</code> configuration </td>
192,193c192,193
<    <td> <code>path(String)</code> </td>
<    <td> add an <code>path</code> configuration </td>
---
>       <td><code>path(String)</code> </td>
>       <td>add an <code>path</code> configuration </td>
196,197c196,197
<    <td> <code>name(String)</code> </td>
<    <td> specify a name (there would be a default one, named 'one', 'two', ... depending on the position otherwise), that will be use in the persistence and bindings </td>
---
>       <td><code>name(String)</code> </td>
>       <td>specify a name (there would be a default one, named 'one', 'two', ... depending on the position otherwise), that will be use in the persistence and bindings </td>
200,201c200,201
<    <td> <code>conf(Object...)</code> </td>
<    <td> add an extra configuration node with key/value properties/values </td>
---
>       <td><code>conf(Object...)</code> </td>
>       <td>add an extra configuration node with key/value properties/values </td>
205c205
< <p>note that that configuration part has shortcuts for some pipes. Typically, above sample is a shorter equivalent of</p> 
---
> <p>note that that configuration part has shortcuts for some pipes. Typically, above sample is a shorter equivalent of </p>
207,208c207,208
<         .pipe('slingPipes/xpath').expr('//element(*,nt:unstructured)[@sling:resourceType='to/delete']")
<         .pipe('slingPipes/rm').run();
---
>         .pipe(&#39;slingPipes/xpath&#39;).expr(&#39;//element(*,nt:unstructured)[@sling:resourceType=&#39;to/delete&#39;]&quot;)
>         .pipe(&#39;slingPipes/rm&#39;).run();
220,221c220,221
<    <th> Pipe Builder Method </th>
<    <th> Explanation </th>
---
>       <th>Pipe Builder Method </th>
>       <th>Explanation </th>
226,227c226,227
<    <td> <code>outputs(keys...)</code> </td>
<    <td> set the keys you want as an output </td>
---
>       <td><code>outputs(keys...)</code> </td>
>       <td>set the keys you want as an output </td>
230,231c230,231
<    <td> <code>build(path)</code> </td>
<    <td> builds the requested pipe at the given <code>path</code> location </td>
---
>       <td><code>build(path)</code> </td>
>       <td>builds the requested pipe at the given <code>path</code> location </td>
234,235c234,235
<    <td> <code>build()</code> </td>
<    <td> will build the pipe under /var/pipes/... (random node under timed base path) </td>
---
>       <td><code>build()</code> </td>
>       <td>will build the pipe under /var/pipes/... (random node under timed base path) </td>
238,239c238,239
<    <td> <code>run(bindings)</code> or <code>runWith(bindings...)</code> </td>
<    <td> will build the pipe in random location, and run it with passed bindings </td>
---
>       <td><code>run(bindings)</code> or <code>runWith(bindings...)</code> </td>
>       <td>will build the pipe in random location, and run it with passed bindings </td>
242,243c242,243
<    <td> <code>runAsync(bindings)</code> </td>
<    <td> will do the same, but asynchronously </td>
---
>       <td><code>runAsync(bindings)</code> </td>
>       <td>will do the same, but asynchronously </td>
247,248c247,248
< <h3><a href="#http-api" id="http-api">HTTP API</a></h3> 
< <h4><a href="#pipe-http-request-bits" id="pipe-http-request-bits">Pipe HTTP Request bits</a></h4> 
---
> <h3><a href="#http-api" name="http-api">HTTP API</a></h3>
> <h4><a href="#pipe-http-request-bits" name="pipe-http-request-bits">Pipe HTTP Request bits</a></h4>
252,253c252,253
<    <th> request bit </th>
<    <th> Explanation </th>
---
>       <th>request bit </th>
>       <th>Explanation </th>
258,259c258,259
<    <td> request path </td>
<    <td> path of a pipe configuration resource (see above), or a resource of type <code>slingPipes/plumber</code> with a path parameter indicating the pipe configuration resource path.</td>
---
>       <td>request path </td>
>       <td>path of a pipe configuration resource (see above), or a resource of type <code>slingPipes/plumber</code> with a path parameter indicating the pipe configuration resource path.</td>
262,263c262,263
<    <td> request method </td>
<    <td> <code>GET</code> or <code>POST</code>. Note that <code>GET</code> will not work on pipe modifying content (unless you are using a <code>dryRun</code>) </td>
---
>       <td>request method </td>
>       <td><code>GET</code> or <code>POST</code>. Note that <code>GET</code> will not work on pipe modifying content (unless you are using a <code>dryRun</code>) </td>
266,267c266,267
<    <td> request extension </td>
<    <td> <code>.json</code> or <code>.csv</code> </td>
---
>       <td>request extension </td>
>       <td><code>.json</code> or <code>.csv</code> </td>
270,271c270,271
<    <td> request selectors </td>
<    <td>&nbsp;you can add <code>status</code> to get status on a currently executed pipe</td>
---
>       <td>request selectors </td>
>       <td> you can add <code>status</code> to get status on a currently executed pipe</td>
275c275
< <h5><a href="#pipe-http-request-parameter" id="pipe-http-request-parameter">Pipe HTTP Request parameter</a></h5> 
---
> <h5><a href="#pipe-http-request-parameter" name="pipe-http-request-parameter">Pipe HTTP Request parameter</a></h5>
279,280c279,280
<    <th> request parameter </th>
<    <th> Explanation </th>
---
>       <th>request parameter </th>
>       <th>Explanation </th>
285,286c285,286
<    <td> <code>size</code> </td>
<    <td>&nbsp;size of the returned excerpt. Default response is truncated to 10 items, if you need more (or less), you can modify that settings with the size parameter. 0 value will return all the items </td>
---
>       <td><code>size</code> </td>
>       <td> size of the returned excerpt. Default response is truncated to 10 items, if you need more (or less), you can modify that settings with the size parameter. 0 value will return all the items </td>
289,290c289,290
<    <td> <code>binding</code> </td>
<    <td> json object of global bindings you want to add for the execution of the pipe e.g. <code>{testBinding:'foo'}</code> </td>
---
>       <td><code>binding</code> </td>
>       <td>json object of global bindings you want to add for the execution of the pipe e.g. <code>{testBinding:&#39;foo&#39;}</code> </td>
293,294c293,294
<    <td> <code>writer</code> </td>
<    <td> you can configure output of your servlet, with <code>writer</code> parameter, a json object as a pattern to the result you want to have. The values of the json object are expressions and can reuse each pipe's subpipe binding. This will be entries of your json output, or headers and values of your csv output, e.g <code>{"user":"${user.fullName}"}</code> </td>
---
>       <td><code>writer</code> </td>
>       <td>you can configure output of your servlet, with <code>writer</code> parameter, a json object as a pattern to the result you want to have. The values of the json object are expressions and can reuse each pipe's subpipe binding. This will be entries of your json output, or headers and values of your csv output, e.g <code>{&quot;user&quot;:&quot;${user.fullName}&quot;}</code> </td>
297,298c297,298
<    <td> <code>dryRun=true</code> </td>
<    <td> if parameter dryRun is set to true, and the executed pipe is supposed to modify content, it will log (at best it can) the change it <em>would</em> have done, without doing anything </td>
---
>       <td><code>dryRun=true</code> </td>
>       <td>if parameter dryRun is set to true, and the executed pipe is supposed to modify content, it will log (at best it can) the change it <em>would</em> have done, without doing anything </td>
301,302c301,302
<    <td> <code>async=true</code> </td>
<    <td> allow asynchronous execution of the given type. This is advised in case you plan your pipe execution to last longer than the session of your HTTP client. If used, the returned value will be id of the created sling Job. In that case you can monitor the pipes path with <code>status</code> selector as described above until it has the value <code>finished</code>. </td>
---
>       <td><code>async=true</code> </td>
>       <td>allow asynchronous execution of the given type. This is advised in case you plan your pipe execution to last longer than the session of your HTTP client. If used, the returned value will be id of the created sling Job. In that case you can monitor the pipes path with <code>status</code> selector as described above until it has the value <code>finished</code>. </td>
306,308c306,308
< <h3><a href="#pipemodel" id="pipemodel">PipeModel</a></h3> 
< <p>a <a href="/documentation/bundles/models.html">Sling Model</a> is shipped with sling pipes bundle that allows you to add a set of pipes to a component instance.</p> 
< <p>A typical usage would be to have some list pipes stored e.g. under <code>/etc/pipes/navigation-lists</code> and then</p> 
---
> <h3><a href="#pipemodel" name="pipemodel">PipeModel</a></h3>
> <p>a <a href="/documentation/bundles/models.html">Sling Model</a> is shipped with sling pipes bundle that allows you to add a set of pipes to a component instance. </p>
> <p>A typical usage would be to have some list pipes stored e.g. under <code>/etc/pipes/navigation-lists</code> and then </p>
311,318c311,318
<         "jcr:primaryType":"nt:unstructured",
<         "sling:resourceType":"my/navigation/breadcrumb",
<         "pipes": {
<             "jcr:primaryType":"nt:unstructured",
<             "breadcrumb": {
<                 "jcr:primaryType":"nt:unstructured",
<                 "sling:resourceType":"slingPipes/reference"
<                 "expr":"/etc/pipes/navigation-lists/breadcrumb"
---
>         &quot;jcr:primaryType&quot;:&quot;nt:unstructured&quot;,
>         &quot;sling:resourceType&quot;:&quot;my/navigation/breadcrumb&quot;,
>         &quot;pipes&quot;: {
>             &quot;jcr:primaryType&quot;:&quot;nt:unstructured&quot;,
>             &quot;breadcrumb&quot;: {
>                 &quot;jcr:primaryType&quot;:&quot;nt:unstructured&quot;,
>                 &quot;sling:resourceType&quot;:&quot;slingPipes/reference&quot;
>                 &quot;expr&quot;:&quot;/etc/pipes/navigation-lists/breadcrumb&quot;
323,327c323,327
< <p>and then the sightly script for "/apps/my/navigation/breadcrumb" could look like</p> 
< <pre><code>        &lt;ol class="breadcrumb"
<                  data-sly-use.pipe="org.apache.sling.pipes.models.PipeModel"
<                  data-sly-list.nav="${pipe.outputs.breadcrumb}"&gt;
<             &lt;sly data-sly-resource="${breadcrumb.path}"&gt;&lt;/sly&gt;
---
> <p>and then the sightly script for "/apps/my/navigation/breadcrumb" could look like </p>
> <pre><code>        &lt;ol class=&quot;breadcrumb&quot;
>                  data-sly-use.pipe=&quot;org.apache.sling.pipes.models.PipeModel&quot;
>                  data-sly-list.nav=&quot;${pipe.outputs.breadcrumb}&quot;&gt;
>             &lt;sly data-sly-resource=&quot;${breadcrumb.path}&quot;&gt;&lt;/sly&gt;
333,335c333,335
< <pre><code>    .echo('${path.currentResource}')
<     .parents("my:PageContent[showInNav=true]")
<     .parent("my:Page")  
---
> <pre><code>    .echo(&#39;${path.currentResource}&#39;)
>     .parents(&quot;my:PageContent[showInNav=true]&quot;)
>     .parent(&quot;my:Page&quot;)  
337c337
< <h3><a href="#jmx" id="jmx">JMX</a></h3> 
---
> <h3><a href="#jmx" name="jmx">JMX</a></h3>
diff -b -B -r ./documentation/bundles/sling-pipes/logical.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-pipes/logical.html
97c97
< <h3><a href="#container-pipe" id="container-pipe">Container Pipe</a></h3> 
---
> <h3><a href="#container-pipe" name="container-pipe">Container Pipe</a></h3>
104c104
< <h3><a href="#referencepipe-refpath" id="referencepipe-refpath">ReferencePipe (<code>ref(path)</code>)</a></h3> 
---
> <h3>ReferencePipe (<code>ref(path)</code>)</h3>
110c110
< <h3><a href="#filterpipe-grepconf" id="filterpipe-grepconf">FilterPipe (<code>grep(conf)</code>)</a></h3> 
---
> <h3>FilterPipe (<code>grep(conf)</code>)</h3>
115,116c115,116
<  <li><code>slingPipesFilter_test='${...}'</code> evaluates the property value, and filters out the stream if the expression is not a boolean or false</li> 
<  <li><code>slingPipesFilter_not='true'</code> inverts the expected result of the filter</li> 
---
>   <li><code>slingPipesFilter_test=&#39;${...}&#39;</code> evaluates the property value, and filters out the stream if the expression is not a boolean or false</li>
>   <li><code>slingPipesFilter_not=&#39;true&#39;</code> inverts the expected result of the filter</li>
119c119
< <pre><code>echo('/content/foo').grep('foo','bar','slingPipesFilter_not',true).run()
---
> <pre><code>echo(&#39;/content/foo&#39;).grep(&#39;foo&#39;,&#39;bar&#39;,&#39;slingPipesFilter_not&#39;,true).run()
122c122
< <pre><code>echo('content/foo').name('FOO').grep('slingPipesFilter_test','${FOO.foo == "bar"}').run()
---
> <pre><code>echo(&#39;content/foo&#39;).name(&#39;FOO&#39;).grep(&#39;slingPipesFilter_test&#39;,&#39;${FOO.foo == &quot;bar&quot;}&#39;).run()
125c125
< <h3><a href="#notpipe" id="notpipe">NotPipe</a></h3> 
---
> <h3><a href="#notpipe" name="notpipe">NotPipe</a></h3>
diff -b -B -r ./documentation/bundles/sling-pipes/readers.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-pipes/readers.html
99c99
< <h3><a href="#base-pipe-echopath" id="base-pipe-echopath">Base pipe (<code>echo(path)</code>)</a></h3> 
---
> <h3>Base pipe (<code>echo(path)</code>)</h3>
105,106c105,106
< <pre><code>    echo('/content/foo')
<     .write('bar',true)
---
> <pre><code>    echo(&#39;/content/foo&#39;)
>     .write(&#39;bar&#39;,true)
109c109
< <pre><code>    write('bar',true).with('path','/content/foo')
---
> <pre><code>    write(&#39;bar&#39;,true).with(&#39;path&#39;,&#39;/content/foo&#39;)
111c111
< <h3><a href="#xpathpipe-xpathexpr" id="xpathpipe-xpathexpr">XPathPipe (<code>xpath(expr)</code>)</a></h3> 
---
> <h3>XPathPipe (<code>xpath(expr)</code>)</h3>
115,117c115,119
<  <li><code>expr</code> should be a valid xpath query <pre><code>xpath('/jcr:root/content/foo//element(*,nt:unstructured)[@sling:resourceType="foo/bar"]')
< .write('foo','bar')
< </code></pre> </li> 
---
>   <li><code>expr</code> should be a valid xpath query
>     <pre><code>xpath(&#39;/jcr:root/content/foo//element(*,nt:unstructured)[@sling:resourceType=&quot;foo/bar&quot;]&#39;)
> .write(&#39;foo&#39;,&#39;bar&#39;)
> </code></pre>
>   </li>
119c121
< <h3><a href="#traversepipe-traverse" id="traversepipe-traverse">TraversePipe (<code>traverse()</code>)</a></h3> 
---
> <h3>TraversePipe (<code>traverse()</code>)</h3>
128c130
< <h3><a href="#multipropertypipe" id="multipropertypipe">MultiPropertyPipe</a></h3> 
---
> <h3><a href="#multipropertypipe" name="multipropertypipe">MultiPropertyPipe</a></h3>
134c136
< <h2><a href="#sling-query-pipes" id="sling-query-pipes">Sling Query Pipes</a></h2> 
---
> <h2><a href="#sling-query-pipes" name="sling-query-pipes">Sling Query Pipes</a></h2>
136c138
< <h3><a href="#find-pipe-expr" id="find-pipe-expr">Find Pipe (<code>$(expr)</code>)</a></h3> 
---
> <h3>Find Pipe (<code>$(expr)</code>)</h3>
140,143c142,147
<  <li><code>expr</code> mandatory property, contains Sling Query <a href="/documentation/bundles/sling-query/selectors.html">selector string</a> <pre><code>echo("/content/foo")
< .$("nt:unstructured[sling:resourceType=foo/bar]")
< .write('foo','bar')
< </code></pre> </li> 
---
>   <li><code>expr</code> mandatory property, contains Sling Query <a href="/documentation/bundles/sling-query/selectors.html">selector string</a>
>     <pre><code>echo(&quot;/content/foo&quot;)
> .$(&quot;nt:unstructured[sling:resourceType=foo/bar]&quot;)
> .write(&#39;foo&#39;,&#39;bar&#39;)
> </code></pre>
>   </li>
145c149
< <h3><a href="#children-pipe-childrenexpr" id="children-pipe-childrenexpr">Children Pipe (<code>children(expr)</code>)</a></h3> 
---
> <h3>Children Pipe (<code>children(expr)</code>)</h3>
151c155
< <h3><a href="#siblings-pipe-siblingsexpr" id="siblings-pipe-siblingsexpr">Siblings Pipe (<code>siblings(expr)</code>)</a></h3> 
---
> <h3>Siblings Pipe (<code>siblings(expr)</code>)</h3>
157c161
< <h3><a href="#parent-pipe-parent" id="parent-pipe-parent">Parent Pipe (<code>parent()</code>)</a></h3> 
---
> <h3>Parent Pipe (<code>parent()</code>)</h3>
162c166
< <h3><a href="#closest-pipe-closestexpr" id="closest-pipe-closestexpr">Closest Pipe (<code>closest(expr)</code>)</a></h3> 
---
> <h3>Closest Pipe (<code>closest(expr)</code>)</h3>
166,168c170,174
<  <li><code>expr</code> mandatory property, contains Sling Query <a href="/documentation/bundles/sling-query/selectors.html">selector string</a> <pre><code>.$("nt:unstructured[sling:resourceType=foo/bar]")
< .closest('jcr:content')
< </code></pre> </li> 
---
>   <li><code>expr</code> mandatory property, contains Sling Query <a href="/documentation/bundles/sling-query/selectors.html">selector string</a>
>     <pre><code>.$(&quot;nt:unstructured[sling:resourceType=foo/bar]&quot;)
> .closest(&#39;jcr:content&#39;)
> </code></pre>
>   </li>
171c177
< <h3><a href="#parents-pipe-parentsexpr" id="parents-pipe-parentsexpr">Parents Pipe (<code>parents(expr)</code>)</a></h3> 
---
> <h3>Parents Pipe (<code>parents(expr)</code>)</h3>
177c183
< <h2><a href="#inputstream-reader-pipes" id="inputstream-reader-pipes">InputStream reader pipes</a></h2> 
---
> <h2><a href="#inputstream-reader-pipes" name="inputstream-reader-pipes">InputStream reader pipes</a></h2>
185c191
< <h3><a href="#jsonpipe-jsonexpr" id="jsonpipe-jsonexpr">JsonPipe (<code>json(expr)</code>)</a></h3> 
---
> <h3>JsonPipe (<code>json(expr)</code>)</h3>
193,194c199,200
< <pre><code>    .json('{items:[{val:1},{val:2},{val:3}]}').with('valuePath','$.items').name('demo')
<     .mkdir('/content/${demo.val}')
---
> <pre><code>    .json(&#39;{items:[{val:1},{val:2},{val:3}]}&#39;).with(&#39;valuePath&#39;,&#39;$.items&#39;).name(&#39;demo&#39;)
>     .mkdir(&#39;/content/${demo.val}&#39;)
198,201c204,207
< <pre><code>    .json('["/content/mySite/page1","/content/mySite/page2","/content/mySite/page3"]')
<     .echo('${one}')
<     .children("jcr:content")
<     .write("update","something")
---
> <pre><code>    .json(&#39;[&quot;/content/mySite/page1&quot;,&quot;/content/mySite/page2&quot;,&quot;/content/mySite/page3&quot;]&#39;)
>     .echo(&#39;${one}&#39;)
>     .children(&quot;jcr:content&quot;)
>     .write(&quot;update&quot;,&quot;something&quot;)
203c209
< <h3><a href="#csvpipe-csvexpr" id="csvpipe-csvexpr">CsvPipe (<code>csv(expr)</code>)</a></h3> 
---
> <h3>CsvPipe (<code>csv(expr)</code>)</h3>
208,210c214,218
<  <li><code>separator</code> separator character, default being comma <code>,</code> <pre><code>.csv('idx,val\n1,1\n2,2\n3,3').name('demo')
< .mkdir('/content/${demo.val}')
< </code></pre> </li> 
---
>   <li><code>separator</code> separator character, default being comma <code>,</code>
>     <pre><code>.csv(&#39;idx,val\n1,1\n2,2\n3,3&#39;).name(&#39;demo&#39;)
> .mkdir(&#39;/content/${demo.val}&#39;)
> </code></pre>
>   </li>
diff -b -B -r ./documentation/bundles/sling-pipes/samples.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-pipes/samples.html
96,98c96,98
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#pipebuilder-samples" id="pipebuilder-samples">Pipebuilder samples</a></h2> 
< <p>those are samples built with pipebuilder api you can</p> 
< <h3><a href="#echo-children-write" id="echo-children-write">echo |&nbsp;$ | children | write</a></h3> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#pipebuilder-samples" name="pipebuilder-samples">Pipebuilder samples</a></h2>
> <p>those are samples built with pipebuilder api you can </p>
> <h3>echo | $ | children | write</h3>
100,103c100,103
< <pre><code>  echo('/home/users')
<   .$('rep:User')
<   .children("nt:unstructured#profile")
<   .write("fullName","${(profile.gender === 'female' ? 'Ms ' + profile.fullName : 'Mr ' + profile.fullName)}")
---
> <pre><code>  echo(&#39;/home/users&#39;)
>   .$(&#39;rep:User&#39;)
>   .children(&quot;nt:unstructured#profile&quot;)
>   .write(&quot;fullName&quot;,&quot;${(profile.gender === &#39;female&#39; ? &#39;Ms &#39; + profile.fullName : &#39;Mr &#39; + profile.fullName)}&quot;)
105c105
< <h3><a href="#echo-multiproperty-auth-write" id="echo-multiproperty-auth-write">echo |&nbsp;$ | multiProperty | auth | write</a></h3> 
---
> <h3>echo | $ | multiProperty | auth | write</h3>
107,112c107,112
< <pre><code> .echo('/etc/badges/jcr:content/par')
<  .$('[sling:resourceType=myApp/components/badge]').name('badge')
<  .pipe('slingPipes/multiProperty').path('${path.badge}/profiles').name('profile')
<  .auth('${profile}').name('user')
<  .echo('${path.user}/profile')
<  .write('badges','+[${path.badge}]')
---
> <pre><code> .echo(&#39;/etc/badges/jcr:content/par&#39;)
>  .$(&#39;[sling:resourceType=myApp/components/badge]&#39;).name(&#39;badge&#39;)
>  .pipe(&#39;slingPipes/multiProperty&#39;).path(&#39;${path.badge}/profiles&#39;).name(&#39;profile&#39;)
>  .auth(&#39;${profile}&#39;).name(&#39;user&#39;)
>  .echo(&#39;${path.user}/profile&#39;)
>  .write(&#39;badges&#39;,&#39;+[${path.badge}]&#39;)
114,115c114,115
< <h5><a href="#echo-children-children-echo-json-write" id="echo-children-children-echo-json-write">echo | children | children | echo | json | write</a></h5> 
< <p>this use case is for completing repository website with external system's data (that has an json api), it does</p> 
---
> <h5>echo | children | children | echo | json | write</h5>
> <p>this use case is for completing repository website with external system's data (that has an json api), it does </p>
122,127c122,127
< <pre><code> .echo("/content/mySite")
<  .children('my:Page')
<  .children('my:Page').name("localePage")
<  .echo('${path.localePage}/jcr:content').name("content")
<  .json('https://www.external.com/api/${content.country.toUpperCase()}.json.name('api')
<  .write('cachedValue','${api.remoteJsonValueWeWant}')
---
> <pre><code> .echo(&quot;/content/mySite&quot;)
>  .children(&#39;my:Page&#39;)
>  .children(&#39;my:Page&#39;).name(&quot;localePage&quot;)
>  .echo(&#39;${path.localePage}/jcr:content&#39;).name(&quot;content&quot;)
>  .json(&#39;https://www.external.com/api/${content.country.toUpperCase()}.json.name(&#39;api&#39;)
>  .write(&#39;cachedValue&#39;,&#39;${api.remoteJsonValueWeWant}&#39;)
129c129
< <h5><a href="#echo-parent-rm" id="echo-parent-rm">echo | $ | parent | rm</a></h5> 
---
> <h5>echo | $ | parent | rm</h5>
133,134c133,135
<  <li>remove it <pre><code>.echo("/home/users")
< .$("profile[@bad]")
---
>   <li>remove it
>     <pre><code>.echo(&quot;/home/users&quot;)
> .$(&quot;profile[@bad]&quot;)
137c138,139
< </code></pre> </li> 
---
> </code></pre>
>   </li>
diff -b -B -r ./documentation/bundles/sling-pipes/writers.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-pipes/writers.html
96,97c96,97
< <div class="row"><div class="small-12 columns"><section class="wrap"><p>those pipes all are using common sling (or other) APIs to modify content. You'll probably need some <a href="/documentation/bundles/sling-pipes/readers.html">reader</a> pipes and/or <a href="/documentation/bundles/sling-pipes/logical.html">logical</a> pipes first to put you into the right context.</p> 
< <h5><a href="#write-pipe-writeconf" id="write-pipe-writeconf">Write Pipe (<code>write(conf)</code>)</a></h5> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><p>those pipes all are using common sling (or other) APIs to modify content. You'll probably need some <a href="/documentation/bundles/sling-pipes/readers.html">reader</a> pipes and/or <a href="/documentation/bundles/sling-pipes/logical.html">logical</a> pipes first to put you into the right context. </p>
> <h5>Write Pipe (<code>write(conf)</code>)</h5>
105,106c105,106
< <pre><code>    .echo('/content/foo')
<     .write('foo1','bar1','foo2','bar2')
---
> <pre><code>    .echo(&#39;/content/foo&#39;)
>     .write(&#39;foo1&#39;,&#39;bar1&#39;,&#39;foo2&#39;,&#39;bar2&#39;)
110,111c110,111
< <pre><code>    .echo('/content/destination')
<     .pipe("slingPipes/write").expr("/content/source")
---
> <pre><code>    .echo(&#39;/content/destination&#39;)
>     .pipe(&quot;slingPipes/write&quot;).expr(&quot;/content/source&quot;)
113c113
< <h5><a href="#movepipe-mvexpr" id="movepipe-mvexpr">MovePipe (<code>mv(expr)</code>)</a></h5> 
---
> <h5>MovePipe (<code>mv(expr)</code>)</h5>
117,119c117,121
<  <li><code>expr</code> full target path, note that parent path must exists <pre><code>.echo("/content/foo/old/location")
< .mv("/content/bar/new/location")
< </code></pre> </li> 
---
>   <li><code>expr</code> full target path, note that parent path must exists
>     <pre><code>.echo(&quot;/content/foo/old/location&quot;)
> .mv(&quot;/content/bar/new/location&quot;)
> </code></pre>
>   </li>
121c123
< <h5><a href="#removepipe-rm" id="removepipe-rm">RemovePipe (<code>rm()</code>)</a></h5> 
---
> <h5>RemovePipe (<code>rm()</code>)</h5>
128c130
< <pre><code>    .echo("/content/foo/toRemove")
---
> <pre><code>    .echo(&quot;/content/foo/toRemove&quot;)
131c133
< <h5><a href="#pathpipe-mkdirexpr" id="pathpipe-mkdirexpr">PathPipe (<code>mkdir(expr)</code>)</a></h5> 
---
> <h5>PathPipe (<code>mkdir(expr)</code>)</h5>
136,137c138,141
<  <li><code>autosave</code> should save at each creation (will make things slow, but sometimes you don't have choice) <pre><code>.mkdir("/content/foo/bar")
< </code></pre> </li> 
---
>   <li><code>autosave</code> should save at each creation (will make things slow, but sometimes you don't have choice)
>     <pre><code>.mkdir(&quot;/content/foo/bar&quot;)
> </code></pre>
>   </li>
139,140c143,144
< <p>will create a <code>/content/foo/bar</code> path of <code>sling:Folder</code> nodes</p> 
< <h5><a href="#authorizablepipe-authconf" id="authorizablepipe-authconf">AuthorizablePipe (<code>auth(conf)</code>)</a></h5> 
---
> <p>will create a <code>/content/foo/bar</code> path of <code>sling:Folder</code> nodes </p>
> <h5>AuthorizablePipe (<code>auth(conf)</code>)</h5>
151c155
< <pre><code>    .auth("createGroup", true).expr("foo-bar")
---
> <pre><code>    .auth(&quot;createGroup&quot;, true).expr(&quot;foo-bar&quot;)
154,156c158,160
< <pre><code>    .echo("/home/users/foo")
<     .$("rep:User")
<     .auth("addToGroup", "foo-bar")
---
> <pre><code>    .echo(&quot;/home/users/foo&quot;)
>     .$(&quot;rep:User&quot;)
>     .auth(&quot;addToGroup&quot;, &quot;foo-bar&quot;)
159,161c163,165
< <pre><code>    .auth("bindMembers",true).expr("administrators")
<     .json('${one}')
<     .mkdir('/content/admin-users/${two}')
---
> <pre><code>    .auth(&quot;bindMembers&quot;,true).expr(&quot;administrators&quot;)
>     .json(&#39;${one}&#39;)
>     .mkdir(&#39;/content/admin-users/${two}&#39;)
diff -b -B -r ./documentation/bundles/sling-pipes.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-pipes.html
95c95
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
97c97
< <pre><code>    searching for resources with type "foo/bar" and setting property id to 3
---
> <pre><code>    searching for resources with type &quot;foo/bar&quot; and setting property id to 3
101c101
< <pre><code>    plumber.newPipe(resolver).$("[sling:resourceType='foo/bar']").write("id",3).build("/etc/demo")
---
> <pre><code>    plumber.newPipe(resolver).$(&quot;[sling:resourceType=&#39;foo/bar&#39;]&quot;).write(&quot;id&quot;,3).build(&quot;/etc/demo&quot;)
103,104c103,104
< <p>this is enough to persist a pipe in <code>/etc/demo</code> that is executable as http, java, groovy console script, or JMX. You can make it monitor it with JMX, logs, http, you'll have dry run possibility of that execution for example, or asynchronous execution. You could also use a pipe to create a java-free json or csv servlet, or a list component whose list possibilities are pipes accessed through the <code>PipeModel</code></p> 
< <h2><a href="#what-is-a-pipe" id="what-is-a-pipe">What is a pipe</a></h2> 
---
> <p>this is enough to persist a pipe in <code>/etc/demo</code> that is executable as http, java, groovy console script, or JMX. You can make it monitor it with JMX, logs, http, you'll have dry run possibility of that execution for example, or asynchronous execution. You could also use a pipe to create a java-free json or csv servlet, or a list component whose list possibilities are pipes accessed through the <code>PipeModel</code> </p>
> <h2><a href="#what-is-a-pipe" name="what-is-a-pipe">What is a pipe</a></h2>
119c119
< <h2><a href="#get-started" id="get-started">Get Started</a></h2> 
---
> <h2><a href="#get-started" name="get-started">Get Started</a></h2>
127,128c127,128
< <p>Once you've successfully run your first try, you can get into more complicated configuration, making them dynamics with <a href="/documentation/bundles/sling-pipes/bindings.html">bindings</a> and have a look at some <a href="/documentation/bundles/sling-pipes/samples.html">other samples</a></p> 
< <h2><a href="#compatibility" id="compatibility">Compatibility</a></h2> 
---
> <p>Once you've successfully run your first try, you can get into more complicated configuration, making them dynamics with <a href="/documentation/bundles/sling-pipes/bindings.html">bindings</a> and have a look at some <a href="/documentation/bundles/sling-pipes/samples.html">other samples</a> </p>
> <h2><a href="#compatibility" name="compatibility">Compatibility</a></h2>
diff -b -B -r ./documentation/bundles/sling-query/basic-ideas.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/basic-ideas.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#collections" id="collections">Collections</a></h3> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#collections" name="collections">Collections</a></h3>
103c103
< <h3><a href="#operations" id="operations">Operations</a></h3> 
---
> <h3><a href="#operations" name="operations">Operations</a></h3>
116c116
< <h4><a href="#laziness" id="laziness">Laziness</a></h4> 
---
> <h4><a href="#laziness" name="laziness">Laziness</a></h4>
121c121
< <h4><a href="#immutability" id="immutability">Immutability</a></h4> 
---
> <h4><a href="#immutability" name="immutability">Immutability</a></h4>
128c128
< <h3><a href="#selectors" id="selectors">Selectors</a></h3> 
---
> <h3><a href="#selectors" name="selectors">Selectors</a></h3>
130c130
< <pre><code>"cq:Page"
---
> <pre><code>&quot;cq:Page&quot;
133c133
< <pre><code>$(resource).children("cq:Page")
---
> <pre><code>$(resource).children(&quot;cq:Page&quot;)
136c136
< <pre><code>$(resource).children("cq:Page[jcr:title=Some title][jcr:description=Some desc]")
---
> <pre><code>$(resource).children(&quot;cq:Page[jcr:title=Some title][jcr:description=Some desc]&quot;)
139c139
< <pre><code>$(resource).children("cq:Page[jcr:content/cq:template=my/template]:even")
---
> <pre><code>$(resource).children(&quot;cq:Page[jcr:content/cq:template=my/template]:even&quot;)
142,147c142,147
< <p>All parts of the selector are optional. In fact, an empty string (<code>""</code>) is a valid selector, accepting all resources. However, the defined order (resource type, attributes in square brackets and modifiers) has to be followed. Example selectors:</p> 
< <pre><code>"foundation/components/richtext" // resource type
< "foundation/components/richtext:first" // resource type with modifier
< "[property=value][property2=value2]" // two attributes
< ":even" // modifier
< ":even:not(:first)" // two modifiers, the second one is nested
---
> <p>All parts of the selector are optional. In fact, an empty string (<code>&quot;&quot;</code>) is a valid selector, accepting all resources. However, the defined order (resource type, attributes in square brackets and modifiers) has to be followed. Example selectors:</p>
> <pre><code>&quot;foundation/components/richtext&quot; // resource type
> &quot;foundation/components/richtext:first&quot; // resource type with modifier
> &quot;[property=value][property2=value2]&quot; // two attributes
> &quot;:even&quot; // modifier
> &quot;:even:not(:first)&quot; // two modifiers, the second one is nested
diff -b -B -r ./documentation/bundles/sling-query/examples.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/examples.html
96,97c96,97
< <div class="row"><div class="small-12 columns"><section class="wrap"><p>Get containing page (like <a href="https://docs.adobe.com/docs/en/aem/6-3/develop/ref/javadoc/com/day/cq/wcm/api/PageManager.html#getContainingPage(org.apache.sling.api.resource.Resource)">PageManager#getContainingPage</a>)</p> 
< <pre><code>$(resource).closest("cq:Page")
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><p>Get containing page (like [PageManager#getContainingPage](https://docs.adobe.com/docs/en/aem/6-3/develop/ref/javadoc/com/day/cq/wcm/api/PageManager.html#getContainingPage(org.apache.sling.api.resource.Resource)))</p>
> <pre><code>$(resource).closest(&quot;cq:Page&quot;)
100c100
< <pre><code>$(resource).closest("cq:Page[jcr:content/cq:template=/apps/geometrixx/templates/homepage]")
---
> <pre><code>$(resource).closest(&quot;cq:Page[jcr:content/cq:template=/apps/geometrixx/templates/homepage]&quot;)
103c103
< <pre><code>$(resource).closest("cq:Page").siblings("cq:Page[jcr:content/hiddenInNav=false]")
---
> <pre><code>$(resource).closest(&quot;cq:Page&quot;).siblings(&quot;cq:Page[jcr:content/hiddenInNav=false]&quot;)
106c106
< <pre><code>$(resource).closest("cq:Page").siblings("cq:Page").first()
---
> <pre><code>$(resource).closest(&quot;cq:Page&quot;).siblings(&quot;cq:Page&quot;).first()
109c109
< <pre><code>$(resource).parents("cq:Page").last()
---
> <pre><code>$(resource).parents(&quot;cq:Page&quot;).last()
112c112
< <pre><code>$(resource1, resource2, resource3).children(":eq(1)")
---
> <pre><code>$(resource1, resource2, resource3).children(&quot;:eq(1)&quot;)
115c115
< <pre><code>$(resource1, resource2, resource3).children(":lt(2)")
---
> <pre><code>$(resource1, resource2, resource3).children(&quot;:lt(2)&quot;)
118c118
< <pre><code>$(resource).closest("cq:Page foundation/components/parsys:parent")
---
> <pre><code>$(resource).closest(&quot;cq:Page foundation/components/parsys:parent&quot;)
121c121
< <pre><code>Iterable&lt;Page&gt; breadcrumbs = $(resource).parents("cq:Page").map(Page.class);
---
> <pre><code>Iterable&lt;Page&gt; breadcrumbs = $(resource).parents(&quot;cq:Page&quot;).map(Page.class);
126,127c126,127
<     "cq:Page[jcr:content/cq:template=/apps/geometrixx/templates/homepage]",
<     "cq:Page").map(Page.class);
---
>     &quot;cq:Page[jcr:content/cq:template=/apps/geometrixx/templates/homepage]&quot;,
>     &quot;cq:Page&quot;).map(Page.class);
130c130
< <pre><code>$(resource).children("cq:Page").children("cq:Page").has("foundation/components/parsys:empty)
---
> <pre><code>$(resource).children(&quot;cq:Page&quot;).children(&quot;cq:Page&quot;).has(&quot;foundation/components/parsys:empty)
135c135
<     .find("cq:PageContent[cq:template=/apps/geometrixx/templates/homepage]")
---
>     .find(&quot;cq:PageContent[cq:template=/apps/geometrixx/templates/homepage]&quot;)
139c139
< <pre><code>$(resource).children("#en, #de")
---
> <pre><code>$(resource).children(&quot;#en, #de&quot;)
diff -b -B -r ./documentation/bundles/sling-query/hierarchy-operators.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/hierarchy-operators.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#child-operator-parent-child" id="child-operator-parent-child">Child operator (<code>parent &gt; child</code>)</a></h3> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h3>Child operator (<code>parent &gt; child</code>)</h3>
99c99
< $(resource).find('foundation/components/parsys &gt; foundation/components/richtext')
---
> $(resource).find(&#39;foundation/components/parsys &gt; foundation/components/richtext&#39;)
101c101
< $(resource).find('foundation/components/parsys').children('foundation/components/richtext')
---
> $(resource).find(&#39;foundation/components/parsys&#39;).children(&#39;foundation/components/richtext&#39;)
103c103
< <h3><a href="#descendant-operator-ancestor-descendant" id="descendant-operator-ancestor-descendant">Descendant operator (<code>ancestor descendant</code>)</a></h3> 
---
> <h3>Descendant operator (<code>ancestor descendant</code>)</h3>
106c106
< $(resource).children('cq:Page [someAttribute]')
---
> $(resource).children(&#39;cq:Page [someAttribute]&#39;)
108c108
< $(resource).children('cq:Page').find('[someAttribute]')
---
> $(resource).children(&#39;cq:Page&#39;).find(&#39;[someAttribute]&#39;)
110c110
< <h3><a href="#next-adjacent-operator-prev-next" id="next-adjacent-operator-prev-next">Next adjacent operator (<code>prev + next</code>)</a></h3> 
---
> <h3>Next adjacent operator (<code>prev + next</code>)</h3>
113c113
< $(resource).closest('cq:Page + cq:Page')
---
> $(resource).closest(&#39;cq:Page + cq:Page&#39;)
115c115
< $(resource).closest('cq:Page').next('cq:Page')
---
> $(resource).closest(&#39;cq:Page&#39;).next(&#39;cq:Page&#39;)
117c117
< <h3><a href="#next-siblings-operator-prev-siblings" id="next-siblings-operator-prev-siblings">Next siblings operator (<code>prev ~ siblings</code>)</a></h3> 
---
> <h3>Next siblings operator (<code>prev ~ siblings</code>)</h3>
120c120
< $(resource).closest('cq:Page ~ cq:Page')
---
> $(resource).closest(&#39;cq:Page ~ cq:Page&#39;)
122c122
< $(resource).closest('cq:Page').nextAll('cq:Page')
---
> $(resource).closest(&#39;cq:Page&#39;).nextAll(&#39;cq:Page&#39;)
diff -b -B -r ./documentation/bundles/sling-query/methods.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/methods.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#resource-resources" id="resource-resources"><code>$(Resource... resources)</code></a></h3> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#resource-resources-" name="resource-resources-">$(Resource... resources)</a></h3>
100c100
< <h3><a href="#addresource-resources" id="addresource-resources"><code>.add(Resource... resources)</code></a></h3> 
---
> <h3><a href="#add-resource-resources-" name="add-resource-resources-">.add(Resource... resources)</a></h3>
104c104
< <h3><a href="#aslist" id="aslist"><code>.asList()</code></a></h3> 
---
> <h3><a href="#aslist-" name="aslist-">.asList()</a></h3>
106c106
< <pre><code>$(resource).children("cq:Page").asList().get(0); // get the first child page
---
> <pre><code>$(resource).children(&quot;cq:Page&quot;).asList().get(0); // get the first child page
109c109
< <h3><a href="#childrenselector" id="childrenselector"><code>.children([selector])</code></a></h3> 
---
> <h3><a href="#children-selector-" name="children-selector-">.children([selector])</a></h3>
111c111
< <pre><code>$(resource).children("cq:Page"); // get all page children of the resource
---
> <pre><code>$(resource).children(&quot;cq:Page&quot;); // get all page children of the resource
114c114
< <h3><a href="#closestselector" id="closestselector"><code>.closest(selector)</code></a></h3> 
---
> <h3><a href="#closest-selector-" name="closest-selector-">.closest(selector)</a></h3>
116,118c116,118
< <pre><code>$(resource).closest("cq:Page"); // find containing page, like PageManager#getContainingPage
< // let's assume that someCqPageResource is a cq:Page
< $(someCqPageResource).closest("cq:Page"); // return the same resource
---
> <pre><code>$(resource).closest(&quot;cq:Page&quot;); // find containing page, like PageManager#getContainingPage
> // let&#39;s assume that someCqPageResource is a cq:Page
> $(someCqPageResource).closest(&quot;cq:Page&quot;); // return the same resource
120c120
< <h3><a href="#eqindex" id="eqindex"><code>.eq(index)</code></a></h3> 
---
> <h3><a href="#eq-index-" name="eq-index-">.eq(index)</a></h3>
125c125
< <h3><a href="#filterselector" id="filterselector"><code>.filter(selector)</code></a></h3> 
---
> <h3><a href="#filter-selector-" name="filter-selector-">.filter(selector)</a></h3>
131c131
< SlingQuery query = $(resource).children("cq:Page").filter(new Predicate&lt;Resource&gt;() {
---
> SlingQuery query = $(resource).children(&quot;cq:Page&quot;).filter(new Predicate&lt;Resource&gt;() {
138c138
< <h3><a href="#findselector" id="findselector"><code>.find([selector])</code></a></h3> 
---
> <h3><a href="#find-selector-" name="find-selector-">.find([selector])</a></h3>
140c140
< <pre><code>$(resource).find("cq:Page"); // find all descendant pages
---
> <pre><code>$(resource).find(&quot;cq:Page&quot;); // find all descendant pages
142c142
< <h3><a href="#first" id="first"><code>.first()</code></a></h3> 
---
> <h3><a href="#first-" name="first-">.first()</a></h3>
146c146
< <h3><a href="#hasselector" id="hasselector"><code>.has(selector)</code></a></h3> 
---
> <h3><a href="#has-selector-" name="has-selector-">.has(selector)</a></h3>
148c148
< <pre><code>$(...).children('cq:Page').has(foundation/components/richtext) // find children pages containing some richtext component
---
> <pre><code>$(...).children(&#39;cq:Page&#39;).has(foundation/components/richtext) // find children pages containing some richtext component
151c151
< <h3><a href="#last" id="last"><code>.last()</code></a></h3> 
---
> <h3><a href="#last-" name="last-">.last()</a></h3>
155c155
< <h3><a href="#mapclasst-clazz" id="mapclasst-clazz"><code>.map(Class&lt;T&gt; clazz)</code></a></h3> 
---
> <h3><a href="#map-class-t-clazz-" name="map-class-t-clazz-">.map(Class<T> clazz)</a></h3>
157c157
< <pre><code>for (Page page : $(resource).parents("cq:Page").map(Page.class)) {
---
> <pre><code>for (Page page : $(resource).parents(&quot;cq:Page&quot;).map(Page.class)) {
161c161
< <h3><a href="#nextselector" id="nextselector"><code>.next([selector])</code></a></h3> 
---
> <h3><a href="#next-selector-" name="next-selector-">.next([selector])</a></h3>
163c163
< <pre><code>// let's assume that resource have 3 children: child1, child2 and child3
---
> <pre><code>// let&#39;s assume that resource have 3 children: child1, child2 and child3
166c166
< <h3><a href="#nextallselector" id="nextallselector"><code>.nextAll([selector])</code></a></h3> 
---
> <h3><a href="#nextall-selector-" name="nextall-selector-">.nextAll([selector])</a></h3>
168c168
< <pre><code>// let's assume that resource have 3 children: child1, child2 and child3
---
> <pre><code>// let&#39;s assume that resource have 3 children: child1, child2 and child3
171c171
< <h3><a href="#nextuntilselector" id="nextuntilselector"><code>.nextUntil(selector)</code></a></h3> 
---
> <h3><a href="#nextuntil-selector-" name="nextuntil-selector-">.nextUntil(selector)</a></h3>
173c173
< <pre><code>// let's assume that resource have 4 children: child1, child2, child3 and child4
---
> <pre><code>// let&#39;s assume that resource have 4 children: child1, child2, child3 and child4
175c175
< $(resource).children().first().nextUntil("[jcr:title=Page]"); // return child2 and child3
---
> $(resource).children().first().nextUntil(&quot;[jcr:title=Page]&quot;); // return child2 and child3
177c177
< <h3><a href="#notselector" id="notselector"><code>.not(selector)</code></a></h3> 
---
> <h3><a href="#not-selector-" name="not-selector-">.not(selector)</a></h3>
179,180c179,180
< <pre><code>$(resource).children().not("cq:Page"); // remove all cq:Pages from the collection
< $(resource).children().not(":first").not(":last"); // remove the first and the last element of the collection
---
> <pre><code>$(resource).children().not(&quot;cq:Page&quot;); // remove all cq:Pages from the collection
> $(resource).children().not(&quot;:first&quot;).not(&quot;:last&quot;); // remove the first and the last element of the collection
182c182
< <h3><a href="#parent" id="parent"><code>.parent()</code></a></h3> 
---
> <h3><a href="#parent-" name="parent-">.parent()</a></h3>
184c184
< <pre><code>$(resource).find("cq:PageContent[jcr:title=My page]:first").parent(); // find the parent of the first `cq:PageContent` resource with given attribute in the subtree
---
> <pre><code>$(resource).find(&quot;cq:PageContent[jcr:title=My page]:first&quot;).parent(); // find the parent of the first `cq:PageContent` resource with given attribute in the subtree
186c186
< <h3><a href="#parentsselector" id="parentsselector"><code>.parents([selector])</code></a></h3> 
---
> <h3><a href="#parents-selector-" name="parents-selector-">.parents([selector])</a></h3>
188c188
< <pre><code>($resource).parents("cq:Page"); // create page breadcrumbs for the given resources
---
> <pre><code>($resource).parents(&quot;cq:Page&quot;); // create page breadcrumbs for the given resources
190c190
< <h3><a href="#parentsuntilselector" id="parentsuntilselector"><code>.parentsUntil(selector)</code></a></h3> 
---
> <h3><a href="#parentsuntil-selector-" name="parentsuntil-selector-">.parentsUntil(selector)</a></h3>
192c192
< <pre><code>($currentResource).parentsUntil("cq:Page"); // find all ancestor components on the current page
---
> <pre><code>($currentResource).parentsUntil(&quot;cq:Page&quot;); // find all ancestor components on the current page
194c194
< <h3><a href="#prevselector" id="prevselector"><code>.prev([selector])</code></a></h3> 
---
> <h3><a href="#prev-selector-" name="prev-selector-">.prev([selector])</a></h3>
196c196
< <pre><code>// let's assume that resource have 3 children: child1, child2 and child3
---
> <pre><code>// let&#39;s assume that resource have 3 children: child1, child2 and child3
199c199
< <h3><a href="#prevallselector" id="prevallselector"><code>.prevAll([selector])</code></a></h3> 
---
> <h3><a href="#prevall-selector-" name="prevall-selector-">.prevAll([selector])</a></h3>
201c201
< <pre><code>// let's assume that resource have 3 children: child1, child2 and child3
---
> <pre><code>// let&#39;s assume that resource have 3 children: child1, child2 and child3
204c204
< <h3><a href="#prevuntilselector" id="prevuntilselector"><code>.prevUntil(selector)</code></a></h3> 
---
> <h3><a href="#prevuntil-selector-" name="prevuntil-selector-">.prevUntil(selector)</a></h3>
206c206
< <pre><code>// let's assume that resource have 4 children: child1, child2, child3 and child4
---
> <pre><code>// let&#39;s assume that resource have 4 children: child1, child2, child3 and child4
208c208
< $(resource).children().last().prevUntil("[jcr:title=Page]"); // return child2 and child3
---
> $(resource).children().last().prevUntil(&quot;[jcr:title=Page]&quot;); // return child2 and child3
210c210
< <h3><a href="#searchstrategystrategy" id="searchstrategystrategy"><code>.searchStrategy(strategy)</code></a></h3> 
---
> <h3><a href="#searchstrategy-strategy-" name="searchstrategy-strategy-">.searchStrategy(strategy)</a></h3>
218c218
< <h3><a href="#siblingsselector" id="siblingsselector"><code>.siblings([selector])</code></a></h3> 
---
> <h3><a href="#siblings-selector-" name="siblings-selector-">.siblings([selector])</a></h3>
220c220
< <pre><code>$(resource).closest("cq:Page").siblings("cq:Page"); // return all sibling pages
---
> <pre><code>$(resource).closest(&quot;cq:Page&quot;).siblings(&quot;cq:Page&quot;); // return all sibling pages
222c222
< <h3><a href="#slicefrom-to" id="slicefrom-to"><code>.slice(from[, to])</code></a></h3> 
---
> <h3><a href="#slice-from-to-" name="slice-from-to-">.slice(from[, to])</a></h3>
224c224
< <pre><code>// let's assume that resource have 4 children: child1, child2, child3 and child4
---
> <pre><code>// let&#39;s assume that resource have 4 children: child1, child2, child3 and child4
diff -b -B -r ./documentation/bundles/sling-query/modifiers.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/modifiers.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#eqindex" id="eqindex"><code>:eq(index)</code></a></h3> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#eq-index-" name="eq-index-">:eq(index)</a></h3>
98c98
< <pre><code>$(...).find("foundation/components/richtext:eq(2)"); // find the third richtext in the subtree
---
> <pre><code>$(...).find(&quot;foundation/components/richtext:eq(2)&quot;); // find the third richtext in the subtree
100c100
< <h3><a href="#even" id="even"><code>:even</code></a></h3> 
---
> <h3><a href="#even" name="even">:even</a></h3>
102c102
< <pre><code>$(...).children("cq:Page:even"); // get even children pages for each resource in the collection
---
> <pre><code>$(...).children(&quot;cq:Page:even&quot;); // get even children pages for each resource in the collection
104c104
< <h3><a href="#first" id="first"><code>:first</code></a></h3> 
---
> <h3><a href="#first" name="first">:first</a></h3>
106c106
< <pre><code>$(...).find("foundation/components/richtext:first"); // find the first richtext in the subtree
---
> <pre><code>$(...).find(&quot;foundation/components/richtext:first&quot;); // find the first richtext in the subtree
108c108
< <h3><a href="#gtindex" id="gtindex"><code>:gt(index)</code></a></h3> 
---
> <h3><a href="#gt-index-" name="gt-index-">:gt(index)</a></h3>
110c110
< <pre><code>$(...).children("cq:Page:gt(2)"); // filter out first 3 pages
---
> <pre><code>$(...).children(&quot;cq:Page:gt(2)&quot;); // filter out first 3 pages
112c112
< <h3><a href="#hasselector" id="hasselector"><code>:has(selector)</code></a></h3> 
---
> <h3><a href="#has-selector-" name="has-selector-">:has(selector)</a></h3>
114c114
< <pre><code>$(...).children("cq:Page:has(foundation/components/richtext)]"); // get children pages containing richtext component
---
> <pre><code>$(...).children(&quot;cq:Page:has(foundation/components/richtext)]&quot;); // get children pages containing richtext component
116c116
< <h3><a href="#last" id="last"><code>:last</code></a></h3> 
---
> <h3><a href="#last" name="last">:last</a></h3>
118c118
< <pre><code>$(...).find("foundation/components/richtext:last"); // find the last richtext in the subtree
---
> <pre><code>$(...).find(&quot;foundation/components/richtext:last&quot;); // find the last richtext in the subtree
120c120
< <h3><a href="#ltindex" id="ltindex"><code>:lt(index)</code></a></h3> 
---
> <h3><a href="#lt-index-" name="lt-index-">:lt(index)</a></h3>
122c122
< <pre><code>$(...).children("cq:Page:lt(3)"); // get first 3 matches
---
> <pre><code>$(...).children(&quot;cq:Page:lt(3)&quot;); // get first 3 matches
124c124
< <h3><a href="#notselector" id="notselector"><code>:not(selector)</code></a></h3> 
---
> <h3><a href="#not-selector-" name="not-selector-">:not(selector)</a></h3>
126c126
< <pre><code>$(...).find(":not(:parent)"); // ancestor resources that doesn't contain any children
---
> <pre><code>$(...).find(&quot;:not(:parent)&quot;); // ancestor resources that doesn&#39;t contain any children
128c128
< <h3><a href="#odd" id="odd"><code>:odd</code></a></h3> 
---
> <h3><a href="#odd" name="odd">:odd</a></h3>
130c130
< <pre><code>$(...).children("cq:Page:odd"); // get odd children pages for each resource in the collection
---
> <pre><code>$(...).children(&quot;cq:Page:odd&quot;); // get odd children pages for each resource in the collection
132c132
< <h3><a href="#parent" id="parent"><code>:parent</code></a></h3> 
---
> <h3><a href="#parent" name="parent">:parent</a></h3>
134c134
< <pre><code>$(...).children(":parent]"); // get children resources containing any resource
---
> <pre><code>$(...).children(&quot;:parent]&quot;); // get children resources containing any resource
diff -b -B -r ./documentation/bundles/sling-query/operators.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/operators.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h3><a href="#contains-namevalue" id="contains-namevalue">Contains <code>[name*=value]</code></a></h3> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h3>Contains <code>[name*=value]</code></h3>
98,99c98,99
< <pre><code>// select children pages titled 'foo', 'foo bar', 'bar foo bar', 'foofoofoo', etc.
< $(resources).children("cq:Page[jcr:content/jcr:title*=foo]")
---
> <pre><code>// select children pages titled &#39;foo&#39;, &#39;foo bar&#39;, &#39;bar foo bar&#39;, &#39;foofoofoo&#39;, etc.
> $(resources).children(&quot;cq:Page[jcr:content/jcr:title*=foo]&quot;)
101c101
< <h3><a href="#contains-a-word-namevalue" id="contains-a-word-namevalue">Contains a word <code>[name~=value]</code></a></h3> 
---
> <h3>Contains a word <code>[name~=value]</code></h3>
103,104c103,104
< <pre><code>// select children pages titled 'foo', 'foo bar', 'bar foo bar', but not 'foofoofoo'
< $(resources).children("cq:Page[jcr:content/jcr:title~=foo]")
---
> <pre><code>// select children pages titled &#39;foo&#39;, &#39;foo bar&#39;, &#39;bar foo bar&#39;, but not &#39;foofoofoo&#39;
> $(resources).children(&quot;cq:Page[jcr:content/jcr:title~=foo]&quot;)
106c106
< <h3><a href="#ends-with-namevalue" id="ends-with-namevalue">Ends with <code>[name$=value]</code></a></h3> 
---
> <h3>Ends with <code>[name$=value]</code></h3>
108,109c108,109
< <pre><code>// select children pages titled 'foo', 'bar foo', etc.
< $(resources).children("cq:Page[jcr:content/jcr:title$=foo]")
---
> <pre><code>// select children pages titled &#39;foo&#39;, &#39;bar foo&#39;, etc.
> $(resources).children(&quot;cq:Page[jcr:content/jcr:title$=foo]&quot;)
111c111
< <h3><a href="#equals-namevalue" id="equals-namevalue">Equals <code>[name=value]</code></a></h3> 
---
> <h3>Equals <code>[name=value]</code></h3>
113c113
< <pre><code>$(resources).children("cq:Page[jcr:content/jcr:title=foo]")
---
> <pre><code>$(resources).children(&quot;cq:Page[jcr:content/jcr:title=foo]&quot;)
115c115
< <h3><a href="#not-equal-namevalue" id="not-equal-namevalue">Not equal <code>[name!=value]</code></a></h3> 
---
> <h3>Not equal <code>[name!=value]</code></h3>
117c117
< <pre><code>$(resources).children("cq:Page[jcr:content/jcr:title!=foo]")
---
> <pre><code>$(resources).children(&quot;cq:Page[jcr:content/jcr:title!=foo]&quot;)
119c119
< <h3><a href="#starts-with-namevalue" id="starts-with-namevalue">Starts with <code>[name^=value]</code></a></h3> 
---
> <h3>Starts with <code>[name^=value]</code></h3>
121,122c121,122
< <pre><code>// select children pages titled 'foo', 'foo bar', etc.
< $(resources).children("cq:Page[jcr:content/jcr:title^=foo]")
---
> <pre><code>// select children pages titled &#39;foo&#39;, &#39;foo bar&#39;, etc.
> $(resources).children(&quot;cq:Page[jcr:content/jcr:title^=foo]&quot;)
124c124
< <h3><a href="#has-attribute-name" id="has-attribute-name">Has attribute <code>[name]</code></a></h3> 
---
> <h3>Has attribute <code>[name]</code></h3>
126c126
< <pre><code>$(resources).find("[markerProperty]")
---
> <pre><code>$(resources).find(&quot;[markerProperty]&quot;)
diff -b -B -r ./documentation/bundles/sling-query/selectors.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/selectors.html
97c97
< <h2><a href="#syntax" id="syntax">Syntax</a></h2> 
---
> <h2><a href="#syntax" name="syntax">Syntax</a></h2>
99c99
< <h3><a href="#resource-type" id="resource-type">Resource type</a></h3> 
---
> <h3><a href="#resource-type" name="resource-type">Resource type</a></h3>
101c101
< <h3><a href="#resource-name" id="resource-name">Resource name</a></h3> 
---
> <h3><a href="#resource-name" name="resource-name">Resource name</a></h3>
103c103
< <pre><code>$(resource).children("cq:Page#some-name")
---
> <pre><code>$(resource).children(&quot;cq:Page#some-name&quot;)
106c106
< <pre><code>$(resource).children("#'jcr:content'[jcr:title=My title]")
---
> <pre><code>$(resource).children(&quot;#&#39;jcr:content&#39;[jcr:title=My title]&quot;)
108c108
< <h3><a href="#attributes" id="attributes">Attributes</a></h3> 
---
> <h3><a href="#attributes" name="attributes">Attributes</a></h3>
110c110
< <pre><code>$(resource).children("cq:Page[jcr:content/jcr:title=My title]")
---
> <pre><code>$(resource).children(&quot;cq:Page[jcr:content/jcr:title=My title]&quot;)
113c113
< <pre><code>$(resource).children("cq:Page[jcr:content/jcr:title*=title]")
---
> <pre><code>$(resource).children(&quot;cq:Page[jcr:content/jcr:title*=title]&quot;)
116c116
< <h3><a href="#modifiers" id="modifiers">Modifiers</a></h3> 
---
> <h3><a href="#modifiers" name="modifiers">Modifiers</a></h3>
118,120c118,120
< <pre><code>$(resource).children("cq:Page:first");
< $(resource).children("cq:Page:eq(0)"); // the same
< $(resource).children(":first"); // modifier can be used alone
---
> <pre><code>$(resource).children(&quot;cq:Page:first&quot;);
> $(resource).children(&quot;cq:Page:eq(0)&quot;); // the same
> $(resource).children(&quot;:first&quot;); // modifier can be used alone
126c126
< <pre><code>$(resource1, resource2).children(":first");
---
> <pre><code>$(resource1, resource2).children(&quot;:first&quot;);
130c130
< <h2><a href="#joining-selectors" id="joining-selectors">Joining selectors</a></h2> 
---
> <h2><a href="#joining-selectors" name="joining-selectors">Joining selectors</a></h2>
132c132
< <pre><code>$(resource).children("cq:Page foundation/components/parsys &gt; foundation/components/richtext")
---
> <pre><code>$(resource).children(&quot;cq:Page foundation/components/parsys &gt; foundation/components/richtext&quot;)
135c135
< <h2><a href="#combining-selectors" id="combining-selectors">Combining selectors</a></h2> 
---
> <h2><a href="#combining-selectors" name="combining-selectors">Combining selectors</a></h2>
137c137
< <pre><code>$(resource).children("#en, #de, #fr"); // return all direct children named `en` or `de` or `fr`.
---
> <pre><code>$(resource).children(&quot;#en, #de, #fr&quot;); // return all direct children named `en` or `de` or `fr`.
diff -b -B -r ./documentation/bundles/sling-query/vs-jcr.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query/vs-jcr.html
102,104c102,104
<    <th> Description </th>
<    <th> JCR query </th>
<    <th> SlingQuery </th>
---
>       <th>Description </th>
>       <th>JCR query </th>
>       <th>SlingQuery </th>
109,111c109,111
<    <td> You have a complex logic using Sling Resource API </td>
<    <td> (-) </td>
<    <td> Yes! </td>
---
>       <td>You have a complex logic using Sling Resource API </td>
>       <td>(-) </td>
>       <td>Yes! </td>
114,116c114,116
<    <td> You want to find resource ancestor </td>
<    <td> (-) </td>
<    <td> Yes! </td>
---
>       <td>You want to find resource ancestor </td>
>       <td>(-) </td>
>       <td>Yes! </td>
119,121c119,121
<    <td> You want to find all descendants with given attribute </td>
<    <td> Yes! </td>
<    <td> (-) </td>
---
>       <td>You want to find all descendants with given attribute </td>
>       <td>Yes! </td>
>       <td>(-) </td>
124,126c124,126
<    <td> You want to find all descendants of given type </td>
<    <td> Yes! </td>
<    <td> (-) </td>
---
>       <td>You want to find all descendants of given type </td>
>       <td>Yes! </td>
>       <td>(-) </td>
129,131c129,131
<    <td> You'd like to get ordered results </td>
<    <td> Yes! </td>
<    <td> (-) </td>
---
>       <td>You'd like to get ordered results </td>
>       <td>Yes! </td>
>       <td>(-) </td>
diff -b -B -r ./documentation/bundles/sling-query.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-query.html
95c95
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
99c99
<     if (!resource.isResourceType("cq:Page")) {
---
>     if (!resource.isResourceType(&quot;cq:Page&quot;)) {
102,103c102,103
<     Resource template = resource.getChild("jcr:content/cq:template");
<     if (template != null &amp;&amp; "my/template".equals(template.adaptTo(String.class))) {
---
>     Resource template = resource.getChild(&quot;jcr:content/cq:template&quot;);
>     if (template != null &amp;&amp; &quot;my/template&quot;.equals(template.adaptTo(String.class))) {
108c108
<     // we've found appropriate ancestor
---
>     // we&#39;ve found appropriate ancestor
114c114
< $(resource).closest("cq:Page[jcr:content/cq:template=my/template]")
---
> $(resource).closest(&quot;cq:Page[jcr:content/cq:template=my/template]&quot;)
118c118
< <h2><a href="#features" id="features">Features</a></h2> 
---
> <h2><a href="#features" name="features">Features</a></h2>
126c126
< <h2><a href="#installation" id="installation">Installation</a></h2> 
---
> <h2><a href="#installation" name="installation">Installation</a></h2>
134c134
< <h2><a href="#documentation" id="documentation">Documentation</a></h2> 
---
> <h2><a href="#documentation" name="documentation">Documentation</a></h2>
143c143,144
<   </ul> </li> 
---
>     </ul>
>   </li>
147c148
< <h2><a href="#external-resources" id="external-resources">External resources</a></h2> 
---
> <h2><a href="#external-resources" name="external-resources">External resources</a></h2>
diff -b -B -r ./documentation/bundles/sling-settings-org-apache-sling-settings.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/sling-settings-org-apache-sling-settings.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#overview" id="overview">Overview</a></h1> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#overview" name="overview">Overview</a></h1>
101,103c101,103
<    <th> Method </th>
<    <th> Bundle Context Property </th>
<    <th> Description </th>
---
>       <th>Method </th>
>       <th>Bundle Context Property </th>
>       <th>Description </th>
108,110c108,110
<    <td> <code>String getSlingId()</code> </td>
<    <td> (-) </td>
<    <td> A unique identifier of the running Sling instance. This value is created when Sling is first started and may be used to identify the instance, for example if multiple Sling instances are running on top of a Jackrabbit Repository Cluster </td>
---
>       <td><code>String getSlingId()</code> </td>
>       <td>(-) </td>
>       <td>A unique identifier of the running Sling instance. This value is created when Sling is first started and may be used to identify the instance, for example if multiple Sling instances are running on top of a Jackrabbit Repository Cluster </td>
113,115c113,115
<    <td> <code>String getSlingHomePath()</code> </td>
<    <td> <code>sling.home</code> </td>
<    <td> The absolute filesystem path to the directory where Sling stores all its content </td>
---
>       <td><code>String getSlingHomePath()</code> </td>
>       <td><code>sling.home</code> </td>
>       <td>The absolute filesystem path to the directory where Sling stores all its content </td>
118,120c118,120
<    <td> <code>URL getSlingHome()</code> </td>
<    <td> <code>sling.home.url</code> </td>
<    <td> The Sling Home path as an <code>java.net.URL</code> instance </td>
---
>       <td><code>URL getSlingHome()</code> </td>
>       <td><code>sling.home.url</code> </td>
>       <td>The Sling Home path as an <code>java.net.URL</code> instance </td>
123,125c123,125
<    <td> <code>Set&lt;String&gt; getRunModes()</code> </td>
<    <td> <code>sling.run.modes</code> </td>
<    <td> The active Run Modes of the running Sling instance </td>
---
>       <td><code>Set&lt;String&gt; getRunModes()</code> </td>
>       <td><code>sling.run.modes</code> </td>
>       <td>The active Run Modes of the running Sling instance </td>
130c130
< <h2><a href="#selecting-the-active-run-modes" id="selecting-the-active-run-modes">Selecting the active run modes</a></h2> 
---
> <h2><a href="#selecting-the-active-run-modes" name="selecting-the-active-run-modes">Selecting the active run modes</a></h2>
134c134
< <h2><a href="#defining-valid-run-modes" id="defining-valid-run-modes">Defining valid run modes</a></h2> 
---
> <h2><a href="#defining-valid-run-modes" name="defining-valid-run-modes">Defining valid run modes</a></h2>
148c148
< <p>The rules for determining the active run modes from the selected run mode (<code>sling.run.modes</code>) and the run mode options (<code>sling.run.mode.install.options</code> and <code>sling.run.mode.options</code>) are as follows :</p> 
---
> <p>The rules for determining the active run modes from the selected run mode (<code>sling.run.modes</code>) and the run mode options (<code>sling.run.mode.install.options</code> and <code>sling.run.mode.options</code>) are as follows : </p>
162c162
<    <th> Effectively active run modes</th>
---
>       <th>Effectively active run modes</th>
168c168
<    <td> <code>a,c</code></td>
---
>       <td><code>a,c</code></td>
172c172
<    <td> <code>a,c</code></td>
---
>       <td><code>a,c</code></td>
176c176
<    <td> <code>b,c</code></td>
---
>       <td><code>b,c</code></td>
180c180
<    <td> <code>a,c</code></td>
---
>       <td><code>a,c</code></td>
184c184
<    <td> <code>a,d</code></td>
---
>       <td><code>a,d</code></td>
188c188
<    <td> <code>a,e</code></td>
---
>       <td><code>a,e</code></td>
193c193
< <h3><a href="#getting-the-run-modes-of-the-sling-instance" id="getting-the-run-modes-of-the-sling-instance">Getting the Run Modes of the Sling instance</a></h3> 
---
> <h3><a href="#getting-the-run-modes-of-the-sling-instance" name="getting-the-run-modes-of-the-sling-instance">Getting the Run Modes of the Sling instance</a></h3>
198c198
< Set&lt;String&gt; expectedRunModes = new HashSet&lt;String&gt;(){{ add("foo");add("wii"); }};
---
> Set&lt;String&gt; expectedRunModes = new HashSet&lt;String&gt;(){{ add(&quot;foo&quot;);add(&quot;wii&quot;); }};
diff -b -B -r ./documentation/bundles/subsystem-installer-factory.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/subsystem-installer-factory.html
95c95
< <h2><a href="#subsystems" id="subsystems">Subsystems</a></h2> 
---
> <h2><a href="#subsystems" name="subsystems">Subsystems</a></h2>
97c97
< <h1><a href="#project-info" id="project-info">Project Info</a></h1> 
---
> <h1><a href="#project-info" name="project-info">Project Info</a></h1>
diff -b -B -r ./documentation/bundles/validation.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/validation.html
97c97
< <h1><a href="#prerequisites" id="prerequisites">Prerequisites</a></h1> 
---
> <h1><a href="#prerequisites" name="prerequisites">Prerequisites</a></h1>
104c104
< <h1><a href="#basic-usage" id="basic-usage">Basic Usage</a></h1> 
---
> <h1><a href="#basic-usage" name="basic-usage">Basic Usage</a></h1>
123c123
<             return !"resourcetype1".equals(resource.getResourceType());
---
>             return !&quot;resourcetype1&quot;.equals(resource.getResourceType());
138c138
< <h2><a href="#validationresult" id="validationresult">ValidationResult</a></h2> 
---
> <h2><a href="#validationresult" name="validationresult">ValidationResult</a></h2>
146,147c146,147
< <h1><a href="#validation-model-resources" id="validation-model-resources">Validation Model Resources</a></h1> 
< <p>The <code>ValidationModel</code> is constructed from resources with the resourceType <strong>sling/validation/model</strong>. Those resources are considered validation model resources if they are located below the Sling ResourceResolver search paths (<em>/apps</em> and <em>/libs</em>).</p> 
---
> <h1><a href="#validation-model-resources" name="validation-model-resources">Validation Model Resources</a></h1>
> <p>The <code>ValidationModel</code> is constructed from resources with the resourceType <strong>sling/validation/model</strong>. Those resources are considered validation model resources if they are located below the Sling ResourceResolver search paths (*/apps* and <em>/libs</em>).</p>
153,157c153,157
<    <th> Property or Resource </th>
<    <th> Type </th>
<    <th> Description </th>
<    <th> Mandatory </th>
<    <th> Example Value</th>
---
>       <th>Property or Resource </th>
>       <th>Type </th>
>       <th>Description </th>
>       <th>Mandatory </th>
>       <th>Example Value</th>
163,167c163,167
<    <td> Property </td>
<    <td> <code>String</code> </td>
<    <td> Always <code>sling/validation/model</code>, otherwise model will never be picked up by Sling Validation. </td>
<    <td> yes </td>
<    <td> <code>sling/validation/model</code></td>
---
>       <td>Property </td>
>       <td><code>String</code> </td>
>       <td>Always <code>sling/validation/model</code>, otherwise model will never be picked up by Sling Validation. </td>
>       <td>yes </td>
>       <td><code>sling/validation/model</code></td>
171,175c171,175
<    <td> Property </td>
<    <td> <code>String</code> </td>
<    <td> The resource type of the resource for which this validation model should be applied. Must always be relative to the resource resolver's search path (i.e. not start with a "/"). </td>
<    <td> yes </td>
<    <td> <code>my/own/resourcetype</code></td>
---
>       <td>Property </td>
>       <td><code>String</code> </td>
>       <td>The resource type of the resource for which this validation model should be applied. Must always be relative to the resource resolver's search path (i.e. not start with a "/"). </td>
>       <td>yes </td>
>       <td><code>my/own/resourcetype</code></td>
179,183c179,183
<    <td> Property </td>
<    <td> <code>String[]</code> </td>
<    <td> Path prefixes which restrict the validation model to resources which are below one of the given prefixes. No wildcards are supported. If not given, there is no path restriction. If there are multiple validation models registered for the same resource type the one with the longest matching applicablePath is chosen. </td>
<    <td> no </td>
<    <td> <code>/content/mysite</code></td>
---
>       <td>Property </td>
>       <td><code>String[]</code> </td>
>       <td>Path prefixes which restrict the validation model to resources which are below one of the given prefixes. No wildcards are supported. If not given, there is no path restriction. If there are multiple validation models registered for the same resource type the one with the longest matching applicablePath is chosen. </td>
>       <td>no </td>
>       <td><code>/content/mysite</code></td>
187,191c187,191
<    <td> Resource </td>
<    <td> n/a </td>
<    <td> This resource ensures that the property with the name <code>&lt;propertyName&gt;</code> is there. The resource name has no longer a meaning if the property <code>nameRegex</code> is set on this node. </td>
<    <td> no </td>
<    <td> n/a</td>
---
>       <td>Resource </td>
>       <td>n/a </td>
>       <td>This resource ensures that the property with the name <code>&lt;propertyName&gt;</code> is there. The resource name has no longer a meaning if the property <code>nameRegex</code> is set on this node. </td>
>       <td>no </td>
>       <td>n/a</td>
195,199c195,199
<    <td> Property </td>
<    <td> <code>Boolean</code> </td>
<    <td> If <code>true</code> it is not an error if there is no property with the given <code>&lt;propertyName&gt;</code> or none matching the <code>nameRegex</code>. If not set or <code>false</code> the property must be there. </td>
<    <td> no </td>
<    <td> <code>false</code></td>
---
>       <td>Property </td>
>       <td><code>Boolean</code> </td>
>       <td>If <code>true</code> it is not an error if there is no property with the given <code>&lt;propertyName&gt;</code> or none matching the <code>nameRegex</code>. If not set or <code>false</code> the property must be there. </td>
>       <td>no </td>
>       <td><code>false</code></td>
203,207c203,207
<    <td> Property </td>
<    <td> <code>Boolean</code> </td>
<    <td> If <code>true</code> only multivalue properties are allowed with the name <code>&lt;propertyName&gt;</code> or matching the <code>nameRegex</code>. If not set or <code>false</code>, multi- and single-value properties are accepted. </td>
<    <td> no </td>
<    <td> <code>false</code></td>
---
>       <td>Property </td>
>       <td><code>Boolean</code> </td>
>       <td>If <code>true</code> only multivalue properties are allowed with the name <code>&lt;propertyName&gt;</code> or matching the <code>nameRegex</code>. If not set or <code>false</code>, multi- and single-value properties are accepted. </td>
>       <td>no </td>
>       <td><code>false</code></td>
211,215c211,215
<    <td> Property </td>
<    <td> <code>String</code> </td>
<    <td> If set the <code>&lt;propertyName&gt;</code> has no longer a meaning. Rather all properties which match the given regular expression are considered. At least one match is required, otherwise the validated resource/valuemap is considered invalid. </td>
<    <td> no </td>
<    <td> <code>property[0-8]</code></td>
---
>       <td>Property </td>
>       <td><code>String</code> </td>
>       <td>If set the <code>&lt;propertyName&gt;</code> has no longer a meaning. Rather all properties which match the given regular expression are considered. At least one match is required, otherwise the validated resource/valuemap is considered invalid. </td>
>       <td>no </td>
>       <td><code>property[0-8]</code></td>
219,223c219,223
<    <td> Resource </td>
<    <td> n/a </td>
<    <td> The <code>&lt;validatorId&gt;</code> must be the id of a validator. The id is given by the OSGi service property <code>validator.id</code> set in the validator. Each validators node might have arbitrarily many child resources (one per validator). </td>
<    <td> no </td>
<    <td> n/a</td>
---
>       <td>Resource </td>
>       <td>n/a </td>
>       <td>The <code>&lt;validatorId&gt;</code> must be the id of a validator. The id is given by the OSGi service property <code>validator.id</code> set in the validator. Each validators node might have arbitrarily many child resources (one per validator). </td>
>       <td>no </td>
>       <td>n/a</td>
227,231c227,231
<    <td> Property </td>
<    <td> <code>String[]</code> </td>
<    <td> The parametrization for the validator with the id <code>&lt;validatorId&gt;</code>. Each value must have the pattern <code>key=value</code>. The parametrization differs per validator. </td>
<    <td> no </td>
<    <td> <code>regex=^[a-z]*$</code></td>
---
>       <td>Property </td>
>       <td><code>String[]</code> </td>
>       <td>The parametrization for the validator with the id <code>&lt;validatorId&gt;</code>. Each value must have the pattern <code>key=value</code>. The parametrization differs per validator. </td>
>       <td>no </td>
>       <td><code>regex=^[a-z]*$</code></td>
235,239c235,239
<    <td> Property </td>
<    <td> <code>Integer</code> </td>
<    <td> The severity which should be set on all emitted validation failures by this validator. </td>
<    <td> no </td>
<    <td> <code>0</code></td>
---
>       <td>Property </td>
>       <td><code>Integer</code> </td>
>       <td>The severity which should be set on all emitted validation failures by this validator. </td>
>       <td>no </td>
>       <td><code>0</code></td>
243,247c243,247
<    <td> Resource </td>
<    <td> n/a </td>
<    <td> This resource ensures that the resource with the name <code>&lt;resourceName&gt;</code> is there. The resource name has no longer a meaning if the property <code>nameRegex</code> is set on this node. </td>
<    <td> no </td>
<    <td> n/a</td>
---
>       <td>Resource </td>
>       <td>n/a </td>
>       <td>This resource ensures that the resource with the name <code>&lt;resourceName&gt;</code> is there. The resource name has no longer a meaning if the property <code>nameRegex</code> is set on this node. </td>
>       <td>no </td>
>       <td>n/a</td>
251,255c251,255
<    <td> Property </td>
<    <td> <code>String</code> </td>
<    <td> If set the <code>&lt;resourceName&gt;</code> has no longer a meaning. Rather all resources whose name match the given regular expression are considered. At least one match is required, otherwise the validated resource/valuemap is considered invalid. </td>
<    <td> no </td>
<    <td> <code>child[1-9]</code></td>
---
>       <td>Property </td>
>       <td><code>String</code> </td>
>       <td>If set the <code>&lt;resourceName&gt;</code> has no longer a meaning. Rather all resources whose name match the given regular expression are considered. At least one match is required, otherwise the validated resource/valuemap is considered invalid. </td>
>       <td>no </td>
>       <td><code>child[1-9]</code></td>
259,263c259,263
<    <td> Property </td>
<    <td> <code>Boolean</code> </td>
<    <td> If <code>true</code> it is not an error if there is no resource with the given <code>&lt;resourceName&gt;</code> or none matching the <code>nameRegex</code>. If not set or <code>false</code> the resource must be there. </td>
<    <td> no </td>
<    <td> <code>false</code></td>
---
>       <td>Property </td>
>       <td><code>Boolean</code> </td>
>       <td>If <code>true</code> it is not an error if there is no resource with the given <code>&lt;resourceName&gt;</code> or none matching the <code>nameRegex</code>. If not set or <code>false</code> the resource must be there. </td>
>       <td>no </td>
>       <td><code>false</code></td>
267,271c267,271
<    <td> Resource </td>
<    <td> n/a </td>
<    <td> The properties can be configured on the child level in the same way as on the root level. </td>
<    <td> no </td>
<    <td> n/a</td>
---
>       <td>Resource </td>
>       <td>n/a </td>
>       <td>The properties can be configured on the child level in the same way as on the root level. </td>
>       <td>no </td>
>       <td>n/a</td>
275c275
< <h2><a href="#validation-model-inheritance" id="validation-model-inheritance">Validation Model Inheritance</a></h2> 
---
> <h2><a href="#validation-model-inheritance" name="validation-model-inheritance">Validation Model Inheritance</a></h2>
277c277
< <h2><a href="#precedence-of-validation-models" id="precedence-of-validation-models">Precedence of Validation Models</a></h2> 
---
> <h2><a href="#precedence-of-validation-models" name="precedence-of-validation-models">Precedence of Validation Models</a></h2>
279,280c279,280
< <h1><a href="#usage-in-sling-models" id="usage-in-sling-models">Usage in </a><a href="/documentation/bundles/models.html">Sling Models</a></h1> 
< <h2><a href="#since-sling-models-120" id="since-sling-models-120">Since Sling Models 1.2.0</a></h2> 
---
> <h1>Usage in <a href="/documentation/bundles/models.html">Sling Models</a></h1>
> <h2><a href="#since-sling-models-1-2-0" name="since-sling-models-1-2-0">Since Sling Models 1.2.0</a></h2>
282c282
< <h2><a href="#before-sling-models-120" id="before-sling-models-120">Before Sling Models 1.2.0</a></h2> 
---
> <h2><a href="#before-sling-models-1-2-0" name="before-sling-models-1-2-0">Before Sling Models 1.2.0</a></h2>
295c295
<         LOG.warn("No validation defined for resource '{}' with type '{}'", resource.getPath(), resource.getResourceType());
---
>         LOG.warn(&quot;No validation defined for resource &#39;{}&#39; with type &#39;{}&#39;&quot;, resource.getPath(), resource.getResourceType());
304c304
<     	 LOG.warn("Invalid validation model for resource '{}' with type '{}'", resource.getPath(), resource.getResourceType());
---
>          LOG.warn(&quot;Invalid validation model for resource &#39;{}&#39; with type &#39;{}&#39;&quot;, resource.getPath(), resource.getResourceType());
308c308
< <h1><a href="#validators" id="validators">Validators</a></h1> 
---
> <h1><a href="#validators" name="validators">Validators</a></h1>
313,315c313,315
<    <th> Description </th>
<    <th> Parameters </th>
<    <th> Since</th>
---
>       <th>Description </th>
>       <th>Parameters </th>
>       <th>Since</th>
321,323c321,323
<    <td> Validates that a property value matches a given regular expression </td>
<    <td> <code>regex</code>, mandatory parameter giving a regular expression according to the pattern described in <a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html">java.util.regex.Pattern</a>. Only if the property value matches this expression it is considered valid. </td>
<    <td> 1.0.0</td>
---
>       <td>Validates that a property value matches a given regular expression </td>
>       <td><code>regex</code>, mandatory parameter giving a regular expression according to the pattern described in <a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html">java.util.regex.Pattern</a>. Only if the property value matches this expression it is considered valid. </td>
>       <td>1.0.0</td>
327c327
< <h1><a href="#writing-validators" id="writing-validators">Writing Validators</a></h1> 
---
> <h1><a href="#writing-validators" name="writing-validators">Writing Validators</a></h1>
331c331
< <h1><a href="#references" id="references">References</a></h1> 
---
> <h1><a href="#references" name="references">References</a></h1>
diff -b -B -r ./documentation/bundles/web-console-extensions.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles/web-console-extensions.html
99c99
< <h2><a href="#branding-orgapacheslingextensionswebconsolebranding" id="branding-orgapacheslingextensionswebconsolebranding">Branding (org.apache.sling.extensions.webconsolebranding)</a></h2> 
---
> <h2><a href="#branding-org-apache-sling-extensions-webconsolebranding-" name="branding-org-apache-sling-extensions-webconsolebranding-">Branding (org.apache.sling.extensions.webconsolebranding)</a></h2>
102c102
< <h2><a href="#security-provider-orgapacheslingextensionswebconsolesecurityprovider" id="security-provider-orgapacheslingextensionswebconsolesecurityprovider">Security Provider (org.apache.sling.extensions.webconsolesecurityprovider)</a></h2> 
---
> <h2><a href="#security-provider-org-apache-sling-extensions-webconsolesecurityprovider-" name="security-provider-org-apache-sling-extensions-webconsolesecurityprovider-">Security Provider (org.apache.sling.extensions.webconsolesecurityprovider)</a></h2>
110c110
< <h3><a href="#configuration" id="configuration">Configuration</a></h3> 
---
> <h3><a href="#configuration" name="configuration">Configuration</a></h3>
115,118c115,118
<    <th> Property </th>
<    <th> Type </th>
<    <th> Default Value </th>
<    <th> Description</th>
---
>       <th>Property </th>
>       <th>Type </th>
>       <th>Default Value </th>
>       <th>Description</th>
123,126c123,126
<    <td> <code>users</code> </td>
<    <td> <code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code> </td>
<    <td> admin </td>
<    <td> The list of users granted access to the Web Console </td>
---
>       <td><code>users</code> </td>
>       <td><code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code> </td>
>       <td>admin </td>
>       <td>The list of users granted access to the Web Console </td>
129,132c129,132
<    <td> <code>groups</code></td>
<    <td> <code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code> </td>
<    <td> (---) </td>
<    <td> The list of groups whose (direct or indirect) members are granted access to the Web Console </td>
---
>       <td><code>groups</code></td>
>       <td><code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code> </td>
>       <td>(---) </td>
>       <td>The list of groups whose (direct or indirect) members are granted access to the Web Console </td>
137c137
< <h3><a href="#authentication-handling" id="authentication-handling">Authentication Handling</a></h3> 
---
> <h3><a href="#authentication-handling" name="authentication-handling">Authentication Handling</a></h3>
diff -b -B -r ./documentation/bundles.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/bundles.html
94c94
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#bundles-and-git-repositories" id="bundles-and-git-repositories">Bundles and Git repositories</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#bundles-and-git-repositories" name="bundles-and-git-repositories">Bundles and Git repositories</a></h2>
97c97
< <h2><a href="#content" id="content">Content</a></h2> 
---
> <h2><a href="#content" name="content">Content</a></h2>
107c107
< <h2><a href="#resource-providers" id="resource-providers">Resource Providers</a></h2> 
---
> <h2><a href="#resource-providers" name="resource-providers">Resource Providers</a></h2>
114c114
< <h2><a href="#users-groups-access-permissions-acls-on-resources" id="users-groups-access-permissions-acls-on-resources">Users, Groups, Access, Permissions, ACLs on Resources</a></h2> 
---
> <h2><a href="#users-groups-access-permissions-acls-on-resources" name="users-groups-access-permissions-acls-on-resources">Users, Groups, Access, Permissions, ACLs on Resources</a></h2>
121c121
< <h2><a href="#osgi-installer" id="osgi-installer">OSGi Installer</a></h2> 
---
> <h2><a href="#osgi-installer" name="osgi-installer">OSGi Installer</a></h2>
130c130
< <h2><a href="#development-and-utilities" id="development-and-utilities">Development and Utilities</a></h2> 
---
> <h2><a href="#development-and-utilities" name="development-and-utilities">Development and Utilities</a></h2>
148c148
< <h2><a href="#content-presentation-and-rendering" id="content-presentation-and-rendering">Content Presentation and Rendering</a></h2> 
---
> <h2><a href="#content-presentation-and-rendering" name="content-presentation-and-rendering">Content Presentation and Rendering</a></h2>
156c156
< <h2><a href="#troubleshooting" id="troubleshooting">Troubleshooting</a></h2> 
---
> <h2><a href="#troubleshooting" name="troubleshooting">Troubleshooting</a></h2>
161c161
< <h2><a href="#misc" id="misc">Misc</a></h2> 
---
> <h2><a href="#misc" name="misc">Misc</a></h2>
diff -b -B -r ./documentation/configuration.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/configuration.html
92c92
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#introduction" name="introduction">Introduction</a></h2>
102c102,103
<   </ol> </li> 
---
>     </ol>
>   </li>
107c108
< <h2><a href="#initial-configuration" id="initial-configuration">Initial Configuration</a></h2> 
---
> <h2><a href="#initial-configuration" name="initial-configuration">Initial Configuration</a></h2>
124c125,126
<   </ul> </li> 
---
>     </ul>
>   </li>
130c132
< <h3><a href="#standalone-application" id="standalone-application">Standalone Application</a></h3> 
---
> <h3><a href="#standalone-application" name="standalone-application">Standalone Application</a></h3>
137,139c139,141
<    <th> Argument </th>
<    <th> Sling property </th>
<    <th> Description </th>
---
>       <th>Argument </th>
>       <th>Sling property </th>
>       <th>Description </th>
144,146c146,148
<    <td> <code>-l loglevel</code> </td>
<    <td> <code>org.apache.sling.osgi.log.level</code> </td>
<    <td> The initial loglevel (0..4, FATAL, ERROR, WARN, INFO, DEBUG) </td>
---
>       <td><code>-l loglevel</code> </td>
>       <td><code>org.apache.sling.osgi.log.level</code> </td>
>       <td>The initial loglevel (0..4, FATAL, ERROR, WARN, INFO, DEBUG) </td>
149,151c151,153
<    <td> <code>-f logfile</code> </td>
<    <td> <code>org.apache.sling.osgi.log.file</code> </td>
<    <td> The log file, "-" for stdout </td>
---
>       <td><code>-f logfile</code> </td>
>       <td><code>org.apache.sling.osgi.log.file</code> </td>
>       <td>The log file, "-" for stdout </td>
154,171c156,158
<    <td> <code>-c slinghome</code> </td>
<    <td> <code>sling.home</code> </td>
<    <td> the sling context directory </td>
<   </tr> 
<   <tr>
<    <td> <code>-a address</code> </td>
<    <td> -- </td>
<    <td> the interfact to bind to (use 0.0.0.0 for any) (not supported yet) </td>
<   </tr> 
<   <tr>
<    <td> <code>-p port</code> </td>
<    <td> <code>org.osgi.service.http.port</code> </td>
<    <td> the port to listen to (default 8080) </td>
<   </tr> 
<   <tr>
<    <td> <code>-h</code> </td>
<    <td> -- </td>
<    <td> Prints a simple usage message and exits. </td>
---
>       <td><code>-c slinghome</code> </td>
>       <td><code>sling.home</code> </td>
>       <td>the sling context directory </td>
174a162
> <p>| <code>-a address</code> | -- | the interfact to bind to (use 0.0.0.0 for any) (not supported yet) | | <code>-p port</code> | <code>org.osgi.service.http.port</code> | the port to listen to (default 8080) | | <code>-h</code> | -- | Prints a simple usage message and exits. |</p>
176c164
< <h3><a href="#web-application" id="web-application">Web Application</a></h3> 
---
> <h3><a href="#web-application" name="web-application">Web Application</a></h3>
180c168
< <h3><a href="#property-file-inclusions" id="property-file-inclusions">Property File Inclusions</a></h3> 
---
> <h3><a href="#property-file-inclusions" name="property-file-inclusions">Property File Inclusions</a></h3>
195c183
< <h3><a href="#osgi-boot-delegation-support" id="osgi-boot-delegation-support">OSGi Boot Delegation Support</a></h3> 
---
> <h3><a href="#osgi-boot-delegation-support" name="osgi-boot-delegation-support">OSGi Boot Delegation Support</a></h3>
207,208c195,196
<    <th> Configuration </th>
<    <th> Description </th>
---
>       <th>Configuration </th>
>       <th>Description </th>
213,214c201,202
<    <td> <code>sling.bootdelegation.simple = com.some.package</code> </td>
<    <td> This setting unconditionally adds the <code>com.some.package</code> package to the <code>org.osgi.framework.bootdelegation</code> property </td>
---
>       <td><code>sling.bootdelegation.simple = com.some.package</code> </td>
>       <td>This setting unconditionally adds the <code>com.some.package</code> package to the <code>org.osgi.framework.bootdelegation</code> property </td>
217,218c205,206
<    <td> <code>sling.bootdelegation.class.com.some.other.Main = com.some.other</code> </td>
<    <td> This setting checks whether the <code>com.some.other.Main</code> class is known. If so, the <code>com.some.other</code> package is added to the <code>org.osgi.framework.bootdelegation</code> property. Otherwise the <code>com.some.other</code> package is not added - and therefore must be exported by a bundle if required for use inside the framework. </td>
---
>       <td><code>sling.bootdelegation.class.com.some.other.Main = com.some.other</code> </td>
>       <td>This setting checks whether the <code>com.some.other.Main</code> class is known. If so, the <code>com.some.other</code> package is added to the <code>org.osgi.framework.bootdelegation</code> property. Otherwise the <code>com.some.other</code> package is not added - and therefore must be exported by a bundle if required for use inside the framework. </td>
223c211
< <h3><a href="#osgi-system-packages-support" id="osgi-system-packages-support">OSGi System Packages Support</a></h3> 
---
> <h3><a href="#osgi-system-packages-support" name="osgi-system-packages-support">OSGi System Packages Support</a></h3>
229,230c217,218
<    <th> Configuration </th>
<    <th> Description </th>
---
>       <th>Configuration </th>
>       <th>Description </th>
235,236c223,224
<    <td> <code>sling.system.packages.simple = com.some.package</code> </td>
<    <td> This setting unconditionally adds the <code>com.some.package</code> package to the <code>org.osgi.framework.system.packages</code> property </td>
---
>       <td><code>sling.system.packages.simple = com.some.package</code> </td>
>       <td>This setting unconditionally adds the <code>com.some.package</code> package to the <code>org.osgi.framework.system.packages</code> property </td>
239,240c227,228
<    <td> <code>sling.system.packages.class.com.some.other.Main = com.some.other</code> </td>
<    <td> This setting checks whether the <code>com.some.other.Main</code> class is known. If so, the <code>com.some.other</code> package is added to the <code>org.osgi.framework.system.packages</code> property. Otherwise the <code>com.some.other</code> package is not added - and therefore must be exported by a bundle if required for use inside the framework. </td>
---
>       <td><code>sling.system.packages.class.com.some.other.Main = com.some.other</code> </td>
>       <td>This setting checks whether the <code>com.some.other.Main</code> class is known. If so, the <code>com.some.other</code> package is added to the <code>org.osgi.framework.system.packages</code> property. Otherwise the <code>com.some.other</code> package is not added - and therefore must be exported by a bundle if required for use inside the framework. </td>
245c233
< <h2><a href="#recommendations-for-property-names" id="recommendations-for-property-names">Recommendations for property names</a></h2> 
---
> <h2><a href="#recommendations-for-property-names" name="recommendations-for-property-names">Recommendations for property names</a></h2>
257c245
< <h2><a href="#well-known-properties" id="well-known-properties">Well Known Properties</a></h2> 
---
> <h2><a href="#well-known-properties" name="well-known-properties">Well Known Properties</a></h2>
262,263c250,251
<    <th> Property </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Description </th>
268,269c256,257
<    <td> <code>sling.home</code> </td>
<    <td> Defines the file system location where Project Sling will write copies of the initial configuration. This property should also be used to define other local file system locations such as the directory to use for the Apache Felix Bundle Cache (<code>${sling.home}/felix</code> by default). If this property is not set it defaults to <code>${user.dir}/sling</code>. </td>
---
>       <td><code>sling.home</code> </td>
>       <td>Defines the file system location where Project Sling will write copies of the initial configuration. This property should also be used to define other local file system locations such as the directory to use for the Apache Felix Bundle Cache (<code>${sling.home}/felix</code> by default). If this property is not set it defaults to <code>${user.dir}/sling</code>. </td>
272,273c260,261
<    <td> <code>sling.home.url</code> </td>
<    <td> Contains the Sling directory set in the <code>sling.home</code> property as a valid URL. This property may be used in situations where the Sling directory is required as an URL. This property is automatically set by the Sling application and may not be modified by configuration files. </td>
---
>       <td><code>sling.home.url</code> </td>
>       <td>Contains the Sling directory set in the <code>sling.home</code> property as a valid URL. This property may be used in situations where the Sling directory is required as an URL. This property is automatically set by the Sling application and may not be modified by configuration files. </td>
276,277c264,265
<    <td> <code>sling.ignoreSystemProperties</code> </td>
<    <td> Whether to overwrite any configuration properties with Java system properties or not. By default this property is set to <code>true</code> by the Sling Servlet but not set by the Sling main class. The reason to set this by default in the Sling Servlet is to not induce values from the environment, which may not be appropriate in the Web Application case. </td>
---
>       <td><code>sling.ignoreSystemProperties</code> </td>
>       <td>Whether to overwrite any configuration properties with Java system properties or not. By default this property is set to <code>true</code> by the Sling Servlet but not set by the Sling main class. The reason to set this by default in the Sling Servlet is to not induce values from the environment, which may not be appropriate in the Web Application case. </td>
280,281c268,269
<    <td> <code>obr.repository.url</code> </td>
<    <td> A comma-separated list of OSGi Bundle Repository URLs. See <em>sling.properties</em> on the page <a href="/documentation/the-sling-engine/the-sling-launchpad.html#slingproperties">the Sling Launchpad</a>. </td>
---
>       <td><code>obr.repository.url</code> </td>
>       <td>A comma-separated list of OSGi Bundle Repository URLs. See <em>sling.properties</em> on the page <a href="/documentation/the-sling-engine/the-sling-launchpad.html#slingproperties">the Sling Launchpad</a>. </td>
284,285c272,273
<    <td> <code>org.apache.sling.commons.log.*</code> </td>
<    <td> Properties providing initial configuration to the Sling Log Service. See <em>sling.properties</em> on the page <a href="/documentation/the-sling-engine/the-sling-launchpad.html#slingproperties">the Sling Launchpad</a>. </td>
---
>       <td><code>org.apache.sling.commons.log.*</code> </td>
>       <td>Properties providing initial configuration to the Sling Log Service. See <em>sling.properties</em> on the page <a href="/documentation/the-sling-engine/the-sling-launchpad.html#slingproperties">the Sling Launchpad</a>. </td>
289c277
< <h2><a href="#configuration-admin-service" id="configuration-admin-service">Configuration Admin Service</a></h2> 
---
> <h2><a href="#configuration-admin-service" name="configuration-admin-service">Configuration Admin Service</a></h2>
diff -b -B -r ./documentation/development/client-request-logging.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/client-request-logging.html
99c99
< <h2><a href="#traditional-accesslog-and-requestlog-files" id="traditional-accesslog-and-requestlog-files">Traditional access.log and request.log Files</a></h2> 
---
> <h2><a href="#traditional-access-log-and-request-log-files" name="traditional-access-log-and-request-log-files">Traditional access.log and request.log Files</a></h2>
105,108c105,108
<    <th> Parameter </th>
<    <th> Name </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Parameter </th>
>       <th>Name </th>
>       <th>Default </th>
>       <th>Description </th>
113,116c113,116
<    <td> Request Log Name </td>
<    <td> <code>request.log.output</code> </td>
<    <td> logs/request.log </td>
<    <td> Name of the destination for the request log. The request log logs the entry and exit of each request into and out of the system together with the entry time, exit time, time to process the request, a request counter as well as the final status code and response content type. In terms of Request Logger Service formats, request entry is logged with the format <code>%t \[%R\] \-&gt; %m %U%q %H</code> and request exit is logged with the format <code>%\{end}t \[%R] &lt;\- %s %\{Content-Type}o %Dms</code> (See <a href="#log-format-specification">Log Format Specification</a> below for the specification of the format). </td>
---
>       <td>Request Log Name </td>
>       <td><code>request.log.output</code> </td>
>       <td>logs/request.log </td>
>       <td>Name of the destination for the request log. The request log logs the entry and exit of each request into and out of the system together with the entry time, exit time, time to process the request, a request counter as well as the final status code and response content type. In terms of Request Logger Service formats, request entry is logged with the format <code>%t \[%R\] \-&gt; %m %U%q %H</code> and request exit is logged with the format <code>%\{end}t \[%R] &lt;\- %s %\{Content-Type}o %Dms</code> (See <a href="#log-format-specification">Log Format Specification</a> below for the specification of the format). </td>
119,122c119,122
<    <td> Request Log Type </td>
<    <td> <code>request.log.outputtype</code> </td>
<    <td> Logger Name </td>
<    <td> Type of Logger named with the Logger Name parameter. See <a href="#log-output">Log Output</a> below </td>
---
>       <td>Request Log Type </td>
>       <td><code>request.log.outputtype</code> </td>
>       <td>Logger Name </td>
>       <td>Type of Logger named with the Logger Name parameter. See <a href="#log-output">Log Output</a> below </td>
125,128c125,128
<    <td> Enable Request Log </td>
<    <td> <code>request.log.enabled</code> </td>
<    <td> true </td>
<    <td> Whether to enable Request logging or not. </td>
---
>       <td>Enable Request Log </td>
>       <td><code>request.log.enabled</code> </td>
>       <td>true </td>
>       <td>Whether to enable Request logging or not. </td>
131,134c131,134
<    <td> Access Log Name </td>
<    <td> <code>access.log.output</code> </td>
<    <td> logs/access.log </td>
<    <td> Name of the destination for the access log. The access log writes an entry for each request as the request terminates using the NCSA extended/combined log format. In terms of Request Logger Service formats the access log is written with the format <code>%h %l %u %t "%r" %&gt;s %b "%\{Referer}i" "%\{User-Agent}i"</code> (See <a href="#log-format-specification">Log Format Specification</a> below for the specification of the format). </td>
---
>       <td>Access Log Name </td>
>       <td><code>access.log.output</code> </td>
>       <td>logs/access.log </td>
>       <td>Name of the destination for the access log. The access log writes an entry for each request as the request terminates using the NCSA extended/combined log format. In terms of Request Logger Service formats the access log is written with the format <code>%h %l %u %t &quot;%r&quot; %&gt;s %b &quot;%\{Referer}i&quot; &quot;%\{User-Agent}i&quot;</code> (See <a href="#log-format-specification">Log Format Specification</a> below for the specification of the format). </td>
137,140c137,140
<    <td> Access Log Type </td>
<    <td> <code>access.log.outputtype</code> </td>
<    <td> Logger Name </td>
<    <td> Type of Logger named with the Logger Name parameter. See <a href="#log-output">Log Output</a> below </td>
---
>       <td>Access Log Type </td>
>       <td><code>access.log.outputtype</code> </td>
>       <td>Logger Name </td>
>       <td>Type of Logger named with the Logger Name parameter. See <a href="#log-output">Log Output</a> below </td>
143,146c143,146
<    <td> Enable Access Log </td>
<    <td> <code>access.log.enabled</code> </td>
<    <td> true </td>
<    <td> Whether to enable Access logging or not. </td>
---
>       <td>Enable Access Log </td>
>       <td><code>access.log.enabled</code> </td>
>       <td>true </td>
>       <td>Whether to enable Access logging or not. </td>
150c150
< <h4><a href="#log-output" id="log-output">Log Output</a></h4> 
---
> <h4><a href="#log-output" name="log-output">Log Output</a></h4>
155,157c155,157
<    <th> Type Code </th>
<    <th> Type Name </th>
<    <th> Description and Logger Name interpretation </th>
---
>       <th>Type Code </th>
>       <th>Type Name </th>
>       <th>Description and Logger Name interpretation </th>
162,164c162,164
<    <td> 0 </td>
<    <td> Logger Name </td>
<    <td> Writes the logging information to a named SLF4J Logger. The name of the Logger is defined in the Logger Name property. The actual destination of the log messages is defined the SLF4J configuration for the named logger </td>
---
>       <td>0 </td>
>       <td>Logger Name </td>
>       <td>Writes the logging information to a named SLF4J Logger. The name of the Logger is defined in the Logger Name property. The actual destination of the log messages is defined the SLF4J configuration for the named logger </td>
167,169c167,169
<    <td> 1 </td>
<    <td> File Name </td>
<    <td> Writes the logging information to a file, on message per line. The file name is an absolute or relative path name. If the name is relative, it is resolved against the <code>sling.home</code> framework property. </td>
---
>       <td>1 </td>
>       <td>File Name </td>
>       <td>Writes the logging information to a file, on message per line. The file name is an absolute or relative path name. If the name is relative, it is resolved against the <code>sling.home</code> framework property. </td>
172,174c172,174
<    <td> 2 </td>
<    <td> RequestLog Service </td>
<    <td> Sends the logging information to a <code>org.apache.sling.engine.RequestLog</code> service whose <code>requestlog.name</code> service registration property must the same as the value of the Logger Name property. If more than one such service is registered, all services are called. If no such service is registered, the logging information is discarded. Using RequestLog Services is deprecated. </td>
---
>       <td>2 </td>
>       <td>RequestLog Service </td>
>       <td>Sends the logging information to a <code>org.apache.sling.engine.RequestLog</code> service whose <code>requestlog.name</code> service registration property must the same as the value of the Logger Name property. If more than one such service is registered, all services are called. If no such service is registered, the logging information is discarded. Using RequestLog Services is deprecated. </td>
179c179
< <h3><a href="#additional-per-request-loggers" id="additional-per-request-loggers">Additional per-request Loggers</a></h3> 
---
> <h3><a href="#additional-per-request-loggers" name="additional-per-request-loggers">Additional per-request Loggers</a></h3>
185,188c185,188
<    <th> Parameter </th>
<    <th> Name </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Parameter </th>
>       <th>Name </th>
>       <th>Default </th>
>       <th>Description </th>
193,196c193,196
<    <td> Log Format </td>
<    <td> <code>request.log.service.format</code> </td>
<    <td> &nbsp; </td>
<    <td> Specify a <a href="#log-format-specification">Log Format Specification</a> as described below </td>
---
>       <td>Log Format </td>
>       <td><code>request.log.service.format</code> </td>
>       <td>&nbsp; </td>
>       <td>Specify a <a href="#log-format-specification">Log Format Specification</a> as described below </td>
199,202c199,202
<    <td> Logger Type </td>
<    <td> <code>request.log.service.outputtype</code> </td>
<    <td> Logger Name/<code>0</code> </td>
<    <td> Type of Logger named with the Logger Name parameter. See <a href="#log-output">Log Output</a> above </td>
---
>       <td>Logger Type </td>
>       <td><code>request.log.service.outputtype</code> </td>
>       <td>Logger Name/<code>0</code> </td>
>       <td>Type of Logger named with the Logger Name parameter. See <a href="#log-output">Log Output</a> above </td>
205,208c205,208
<    <td> Logger Name </td>
<    <td> <code>request.log.service.output</code> </td>
<    <td> <code>request.log</code> </td>
<    <td> Name of the Logger to be used. See <a href="#log-output">Log Output</a> above </td>
---
>       <td>Logger Name </td>
>       <td><code>request.log.service.output</code> </td>
>       <td><code>request.log</code> </td>
>       <td>Name of the Logger to be used. See <a href="#log-output">Log Output</a> above </td>
211,214c211,214
<    <td> Request Entry </td>
<    <td> <code>request.log.service.onentry</code> </td>
<    <td> unchecked/<code>false</code> </td>
<    <td> Whether logger is called at the start of request processing or after processing the request </td>
---
>       <td>Request Entry </td>
>       <td><code>request.log.service.onentry</code> </td>
>       <td>unchecked/<code>false</code> </td>
>       <td>Whether logger is called at the start of request processing or after processing the request </td>
218c218
< <h4><a href="#log-format-specification" id="log-format-specification">Log Format Specification</a></h4> 
---
> <h4><a href="#log-format-specification" name="log-format-specification">Log Format Specification</a></h4>
224,225c224,225
<    <th> Format String </th>
<    <th> Description </th>
---
>       <th>Format String </th>
>       <th>Description </th>
230,231c230,231
<    <td> <code>%%</code> </td>
<    <td> The percent sign </td>
---
>       <td><code>%%</code> </td>
>       <td>The percent sign </td>
234,235c234,235
<    <td> <code>%a</code> </td>
<    <td> Remote IP-address </td>
---
>       <td><code>%a</code> </td>
>       <td>Remote IP-address </td>
238,239c238,239
<    <td> <code>%A</code> </td>
<    <td> Local IP-address </td>
---
>       <td><code>%A</code> </td>
>       <td>Local IP-address </td>
242,243c242,243
<    <td> <code>%B</code> </td>
<    <td> Size of response in bytes, excluding HTTP headers. </td>
---
>       <td><code>%B</code> </td>
>       <td>Size of response in bytes, excluding HTTP headers. </td>
246,247c246,247
<    <td> <code>%b</code> </td>
<    <td> Size of response in bytes, excluding HTTP headers. In CLF format, i.e. a '-' rather than a 0 when no bytes are sent. </td>
---
>       <td><code>%b</code> </td>
>       <td>Size of response in bytes, excluding HTTP headers. In CLF format, i.e. a '-' rather than a 0 when no bytes are sent. </td>
250,251c250,251
<    <td> <code>%\{Foobar}C</code> </td>
<    <td> The contents of cookie Foobar in the request sent to the server. </td>
---
>       <td><code>%\{Foobar}C</code> </td>
>       <td>The contents of cookie Foobar in the request sent to the server. </td>
254,255c254,255
<    <td> <code>%D</code> </td>
<    <td> The time taken to serve the request, in milliseconds. Please note that this deviates from the Apache httpd format. </td>
---
>       <td><code>%D</code> </td>
>       <td>The time taken to serve the request, in milliseconds. Please note that this deviates from the Apache httpd format. </td>
258c258
<    <td> <code>%\{FOOBAR}e</code> </td>
---
>       <td><code>%\{FOOBAR}e</code> </td>
262,263c262,263
<    <td> <code>%f</code> </td>
<    <td> The absolute path of the resolved resource </td>
---
>       <td><code>%f</code> </td>
>       <td>The absolute path of the resolved resource </td>
266,267c266,267
<    <td> <code>%h</code> </td>
<    <td> Remote host </td>
---
>       <td><code>%h</code> </td>
>       <td>Remote host </td>
270,271c270,271
<    <td> <code>%H</code> </td>
<    <td> The request protocol </td>
---
>       <td><code>%H</code> </td>
>       <td>The request protocol </td>
274,275c274,275
<    <td> <code>%\{Foobar}i</code> </td>
<    <td> The contents of Foobar: header line(s) in the request sent to the server. </td>
---
>       <td><code>%\{Foobar}i</code> </td>
>       <td>The contents of Foobar: header line(s) in the request sent to the server. </td>
278,279c278,279
<    <td> <code>%k</code> </td>
<    <td> Not supported in Sling; prints nothing. </td>
---
>       <td><code>%k</code> </td>
>       <td>Not supported in Sling; prints nothing. </td>
282,283c282,283
<    <td> <code>%l</code> </td>
<    <td> Not supported in Sling; prints nothing. </td>
---
>       <td><code>%l</code> </td>
>       <td>Not supported in Sling; prints nothing. </td>
286,287c286,287
<    <td> <code>%m</code> </td>
<    <td> The request method </td>
---
>       <td><code>%m</code> </td>
>       <td>The request method </td>
290,291c290,291
<    <td> <code>%\{Foobar}n</code> </td>
<    <td> Not supported in Sling; prints nothing. </td>
---
>       <td><code>%\{Foobar}n</code> </td>
>       <td>Not supported in Sling; prints nothing. </td>
294,295c294,295
<    <td> <code>%\{Foobar}o</code> </td>
<    <td> The contents of Foobar: header line(s) in the reply. </td>
---
>       <td><code>%\{Foobar}o</code> </td>
>       <td>The contents of Foobar: header line(s) in the reply. </td>
298,299c298,299
<    <td> <code>%p</code> </td>
<    <td> The canonical port of the server serving the request </td>
---
>       <td><code>%p</code> </td>
>       <td>The canonical port of the server serving the request </td>
302,303c302,303
<    <td> <code>%\{format}p</code> </td>
<    <td> The canonical port of the server serving the request or the server's actual port or the client's actual port. Valid formats are canonical, local, or remote. </td>
---
>       <td><code>%\{format}p</code> </td>
>       <td>The canonical port of the server serving the request or the server's actual port or the client's actual port. Valid formats are canonical, local, or remote. </td>
306,307c306,307
<    <td> <code>%P</code> </td>
<    <td> The <em>name of the thread</em> ~~process ID of the child~~ that serviced the request. </td>
---
>       <td><code>%P</code> </td>
>       <td>The <em>name of the thread</em> ~~process ID of the child~~ that serviced the request. </td>
310,311c310,311
<    <td> <code>%\{format}P</code> </td>
<    <td> Same as <code>%P</code>; the <code>format</code> parameter is ignored. </td>
---
>       <td><code>%\{format}P</code> </td>
>       <td>Same as <code>%P</code>; the <code>format</code> parameter is ignored. </td>
314,315c314,315
<    <td> <code>%q</code> </td>
<    <td> The query string (prepended with a ? if a query string exists, otherwise an empty string) </td>
---
>       <td><code>%q</code> </td>
>       <td>The query string (prepended with a ? if a query string exists, otherwise an empty string) </td>
318,319c318,319
<    <td> <code>%r</code> </td>
<    <td> First line of request </td>
---
>       <td><code>%r</code> </td>
>       <td>First line of request </td>
322,323c322,323
<    <td> <code>%R</code> </td>
<    <td> The number of requests processed by Sling since the last start. </td>
---
>       <td><code>%R</code> </td>
>       <td>The number of requests processed by Sling since the last start. </td>
326,327c326,327
<    <td> <code>%s</code> </td>
<    <td> Status. </td>
---
>       <td><code>%s</code> </td>
>       <td>Status. </td>
330,331c330,331
<    <td> <code>%t</code> </td>
<    <td> Time the request was received (standard english format) </td>
---
>       <td><code>%t</code> </td>
>       <td>Time the request was received (standard english format) </td>
334,335c334,335
<    <td> <code>%\{format}t</code> </td>
<    <td> Same as <code>%t</code>; the <code>format</code> parameter is ignored unless it is the literal value <em>end</em> indicating to use the time of request terminating (instead of the time of request receipt). </td>
---
>       <td><code>%\{format}t</code> </td>
>       <td>Same as <code>%t</code>; the <code>format</code> parameter is ignored unless it is the literal value <em>end</em> indicating to use the time of request terminating (instead of the time of request receipt). </td>
338,339c338,339
<    <td> <code>%T</code> </td>
<    <td> The time taken to serve the request, in seconds. </td>
---
>       <td><code>%T</code> </td>
>       <td>The time taken to serve the request, in seconds. </td>
342,343c342,343
<    <td> <code>%u</code> </td>
<    <td> Remote user (from auth; may be bogus if return status (%s) is 401) </td>
---
>       <td><code>%u</code> </td>
>       <td>Remote user (from auth; may be bogus if return status (%s) is 401) </td>
346,347c346,347
<    <td> <code>%U</code> </td>
<    <td> The URL path requested, not including any query string. </td>
---
>       <td><code>%U</code> </td>
>       <td>The URL path requested, not including any query string. </td>
350,351c350,351
<    <td> <code>%v</code> </td>
<    <td> The canonical ServerName of the server serving the request. </td>
---
>       <td><code>%v</code> </td>
>       <td>The canonical ServerName of the server serving the request. </td>
354,355c354,355
<    <td> <code>%V</code> </td>
<    <td> Same as <code>%v</code>. </td>
---
>       <td><code>%V</code> </td>
>       <td>Same as <code>%v</code>. </td>
358,359c358,359
<    <td> <code>%X</code> </td>
<    <td> Not supported in Sling; prints nothing. </td>
---
>       <td><code>%X</code> </td>
>       <td>Not supported in Sling; prints nothing. </td>
362,363c362,363
<    <td> <code>%I</code> </td>
<    <td> Not supported in Sling; prints nothing. </td>
---
>       <td><code>%I</code> </td>
>       <td>Not supported in Sling; prints nothing. </td>
366,367c366,367
<    <td> <code>%O</code> </td>
<    <td> Not supported in Sling; prints nothing. </td>
---
>       <td><code>%O</code> </td>
>       <td>Not supported in Sling; prints nothing. </td>
375,376c375,376
< <p>For security reasons non-printable and other special characters in %C, %i and %o are escaped using \uhhhh sequences, where hhhh stands for the hexadecimal representation of the character's unicode value. Exceptions from this rule are " and , which are escaped by prepending a backslash, and all whitespace characters, which are written in their Java-style notation (\n, \t, etc).</p> 
< <h4><a href="#rotating-logger-files" id="rotating-logger-files">Rotating Logger Files</a></h4> 
---
> <p>For security reasons non-printable and other special characters in %C, %i and %o are escaped using \uhhhh sequences, where hhhh stands for the hexadecimal representation of the character's unicode value. Exceptions from this rule are " and \, which are escaped by prepending a backslash, and all whitespace characters, which are written in their Java-style notation (\n, \t, etc).</p>
> <h4><a href="#rotating-logger-files" name="rotating-logger-files">Rotating Logger Files</a></h4>
386c386,387
<   </ul> </li> 
---
>     </ul>
>   </li>
diff -b -B -r ./documentation/development/dependency-management.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/dependency-management.html
97c97
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
106c106
< <h2><a href="#dependency-management" id="dependency-management">Dependency Management</a></h2> 
---
> <h2><a href="#dependency-management" name="dependency-management">Dependency Management</a></h2>
117,120c117,120
<    <th> Group ID </th>
<    <th> Artifact ID </th>
<    <th> Version </th>
<    <th> Scope </th>
---
>       <th>Group ID </th>
>       <th>Artifact ID </th>
>       <th>Version </th>
>       <th>Scope </th>
125,128c125,128
<    <td> org.osgi </td>
<    <td> org.osgi.core </td>
<    <td> 4.1.0 </td>
<    <td> provided </td>
---
>       <td>org.osgi </td>
>       <td>org.osgi.core </td>
>       <td>4.1.0 </td>
>       <td>provided </td>
131,134c131,134
<    <td> org.osgi </td>
<    <td> org.osgi.compendium </td>
<    <td> 4.1.0 </td>
<    <td> provided </td>
---
>       <td>org.osgi </td>
>       <td>org.osgi.compendium </td>
>       <td>4.1.0 </td>
>       <td>provided </td>
137,140c137,140
<    <td> javax.servlet </td>
<    <td> servlet-api </td>
<    <td> 2.4 </td>
<    <td> provided </td>
---
>       <td>javax.servlet </td>
>       <td>servlet-api </td>
>       <td>2.4 </td>
>       <td>provided </td>
143,146c143,146
<    <td> javax.jcr </td>
<    <td> jcr </td>
<    <td> 1.0 </td>
<    <td> provided </td>
---
>       <td>javax.jcr </td>
>       <td>jcr </td>
>       <td>1.0 </td>
>       <td>provided </td>
149,152c149,152
<    <td> org.slf4j </td>
<    <td> slf4j-api </td>
<    <td> 1.5.2 </td>
<    <td> provided </td>
---
>       <td>org.slf4j </td>
>       <td>slf4j-api </td>
>       <td>1.5.2 </td>
>       <td>provided </td>
155,158c155,158
<    <td> org.apache.felix </td>
<    <td> org.apache.felix.scr.annotations </td>
<    <td> 1.9.8 </td>
<    <td> provided </td>
---
>       <td>org.apache.felix </td>
>       <td>org.apache.felix.scr.annotations </td>
>       <td>1.9.8 </td>
>       <td>provided </td>
161,164c161,164
<    <td> biz.aQute </td>
<    <td> bndlib </td>
<    <td> 1.50.0 </td>
<    <td> provided </td>
---
>       <td>biz.aQute </td>
>       <td>bndlib </td>
>       <td>1.50.0 </td>
>       <td>provided </td>
167,170c167,170
<    <td> junit </td>
<    <td> junit </td>
<    <td> 4.11 </td>
<    <td> test </td>
---
>       <td>junit </td>
>       <td>junit </td>
>       <td>4.11 </td>
>       <td>test </td>
173,176c173,176
<    <td> org.jmock </td>
<    <td> jmock-junit4 </td>
<    <td> 2.5.1 </td>
<    <td> test </td>
---
>       <td>org.jmock </td>
>       <td>jmock-junit4 </td>
>       <td>2.5.1 </td>
>       <td>test </td>
179,182c179,182
<    <td> org.slf4j </td>
<    <td> slf4j-simple </td>
<    <td> 1.5.2 </td>
<    <td> test </td>
---
>       <td>org.slf4j </td>
>       <td>slf4j-simple </td>
>       <td>1.5.2 </td>
>       <td>test </td>
189c189
< <h2><a href="#references" id="references">References</a></h2> 
---
> <h2><a href="#references" name="references">References</a></h2>
diff -b -B -r ./documentation/development/embedding-sling.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/embedding-sling.html
103c103,104
<   </ul> </li> 
---
>     </ul>
>   </li>
110c111
< <h1><a href="#structure" id="structure">Structure</a></h1> 
---
> <h1><a href="#structure" name="structure">Structure</a></h1>
122c123
< <h1><a href="#the-bridging-part" id="the-bridging-part">The Bridging Part</a></h1> 
---
> <h1><a href="#the-bridging-part" name="the-bridging-part">The Bridging Part</a></h1>
127,128c128,129
<    <th> Class </th>
<    <th> Description </th>
---
>       <th>Class </th>
>       <th>Description </th>
133,134c134,135
<    <td> Launcher </td>
<    <td> The interface implemented by the internal class matching the external class being called to start/stop the framework. </td>
---
>       <td>Launcher </td>
>       <td>The interface implemented by the internal class matching the external class being called to start/stop the framework. </td>
137,138c138,139
<    <td> LauncherClassLoader </td>
<    <td> <code>URLClassLoader</code> implementing the class loader to load the internal part (along with the OSGi framework). This class loader only delegates to the parent class loader any packages not contained in the launchpad library (primary artifact of the Launchpad Base project). </td>
---
>       <td>LauncherClassLoader </td>
>       <td><code>URLClassLoader</code> implementing the class loader to load the internal part (along with the OSGi framework). This class loader only delegates to the parent class loader any packages not contained in the launchpad library (primary artifact of the Launchpad Base project). </td>
141,142c142,143
<    <td> Loader </td>
<    <td> Helper class to find the launchpad library and to create the <code>LauncherClassLoader</code> with that library. This class is also used to actually load the <code>Launcher</code> implementation to be called from the external launcher class. </td>
---
>       <td>Loader </td>
>       <td>Helper class to find the launchpad library and to create the <code>LauncherClassLoader</code> with that library. This class is also used to actually load the <code>Launcher</code> implementation to be called from the external launcher class. </td>
145,146c146,147
<    <td> Notifiable </td>
<    <td> The interface implemented in the external part and handed over to the internal part. </td>
---
>       <td>Notifiable </td>
>       <td>The interface implemented in the external part and handed over to the internal part. </td>
149,150c150,151
<    <td> SharedConstants </td>
<    <td> Constants naming various properties and classes. </td>
---
>       <td>SharedConstants </td>
>       <td>Constants naming various properties and classes. </td>
154c155
< <h1><a href="#the-internal-part" id="the-internal-part">The Internal Part</a></h1> 
---
> <h1><a href="#the-internal-part" name="the-internal-part">The Internal Part</a></h1>
162c163
< <h2><a href="#the-external-part" id="the-external-part">The External Part</a></h2> 
---
> <h2><a href="#the-external-part" name="the-external-part">The External Part</a></h2>
164c165
< <h3><a href="#standalone-java-application" id="standalone-java-application">Standalone Java Application</a></h3> 
---
> <h3><a href="#standalone-java-application" name="standalone-java-application">Standalone Java Application</a></h3>
169,170c170,171
<    <th> Class </th>
<    <th> Description </th>
---
>       <th>Class </th>
>       <th>Description </th>
175,176c176,177
<    <td> Main </td>
<    <td> This is the main class whose <code>main</code> method is called by the Java VM. This class is itself the <code>Notifiable</code> and finds the <code>sling.home</code> location from the environment (command line parameter, system property, or environment variable). </td>
---
>       <td>Main </td>
>       <td>This is the main class whose <code>main</code> method is called by the Java VM. This class is itself the <code>Notifiable</code> and finds the <code>sling.home</code> location from the environment (command line parameter, system property, or environment variable). </td>
179,180c180,181
<    <td> MainDelegate </td>
<    <td> This class is loaded by the <code>Loader</code> from the <code>LauncherClassLoader</code> to actually complete the initial setup before creating the <code>Sling</code> class to start the framework. </td>
---
>       <td>MainDelegate </td>
>       <td>This class is loaded by the <code>Loader</code> from the <code>LauncherClassLoader</code> to actually complete the initial setup before creating the <code>Sling</code> class to start the framework. </td>
183,184c184,185
<    <td> ControlListener </td>
<    <td> This class is used by the <code>Main</code> class to open a server socket to be able to start and stop Sling as a server. This class allows for starting (opening the server socket), status check (connecting to the socket asking for status), and shutdown (connecting to the socket asking for shutdown). </td>
---
>       <td>ControlListener </td>
>       <td>This class is used by the <code>Main</code> class to open a server socket to be able to start and stop Sling as a server. This class allows for starting (opening the server socket), status check (connecting to the socket asking for status), and shutdown (connecting to the socket asking for shutdown). </td>
189c190
< <h3><a href="#embedding-the-standalone-java-application" id="embedding-the-standalone-java-application">Embedding the Standalone Java Application</a></h3> 
---
> <h3><a href="#embedding-the-standalone-java-application" name="embedding-the-standalone-java-application">Embedding the Standalone Java Application</a></h3>
194,195c195,196
<    <th> Method </th>
<    <th> Description </th>
---
>       <th>Method </th>
>       <th>Description </th>
200,201c201,202
<    <td> <code>Main(Map&lt;String, String&gt; properties)</code> </td>
<    <td> Instantiates the Main class with the given configuration properties. These are properties which are used directly as overwrites to the configurations in the <code>sling.properties</code> file. There is no more conversion applied. </td>
---
>       <td><code>Main(Map&lt;String, String&gt; properties)</code> </td>
>       <td>Instantiates the Main class with the given configuration properties. These are properties which are used directly as overwrites to the configurations in the <code>sling.properties</code> file. There is no more conversion applied. </td>
204,205c205,206
<    <td> <code>doControlCommand()</code> </td>
<    <td> Before starting the application for the first time, this method can be called to handle any control command action. </td>
---
>       <td><code>doControlCommand()</code> </td>
>       <td>Before starting the application for the first time, this method can be called to handle any control command action. </td>
208,209c209,210
<    <td> <code>doStart()</code> </td>
<    <td> Starts the Sling Application using the provided configuration properties as overwrites. Also these properties (or the <code>sling.home</code> system property or the <code>SLING_HOME</code> environment variable are analyzed to get the value for the <code>sling.home</code> setting. </td>
---
>       <td><code>doStart()</code> </td>
>       <td>Starts the Sling Application using the provided configuration properties as overwrites. Also these properties (or the <code>sling.home</code> system property or the <code>SLING_HOME</code> environment variable are analyzed to get the value for the <code>sling.home</code> setting. </td>
212,213c213,214
<    <td> <code>doStop()</code> </td>
<    <td> Stops the application started by the <code>doStart()</code> method. </td>
---
>       <td><code>doStop()</code> </td>
>       <td>Stops the application started by the <code>doStart()</code> method. </td>
217c218
< <h4><a href="#external-control-of-the-sling-application" id="external-control-of-the-sling-application">External Control of the Sling Application</a></h4> 
---
> <h4><a href="#external-control-of-the-sling-application" name="external-control-of-the-sling-application">External Control of the Sling Application</a></h4>
224,225c225,226
<    <th> Value </th>
<    <th> Description </th>
---
>       <th>Value </th>
>       <th>Description </th>
230,231c231,232
<    <td> <code>start</code> </td>
<    <td> Starts a server socket as specified by the <code>sling.control.socket</code> property. If the socket cannot be bound to (because the port is in use) an error message is printed. Using the <code>start</code> action only makes sense when starting the application. </td>
---
>       <td><code>start</code> </td>
>       <td>Starts a server socket as specified by the <code>sling.control.socket</code> property. If the socket cannot be bound to (because the port is in use) an error message is printed. Using the <code>start</code> action only makes sense when starting the application. </td>
234,235c235,236
<    <td> <code>stop</code> </td>
<    <td> The <code>stop</code> action is used to stop a running application. For that a connection is opened to the server running on the socket specified by the <code>sling.control.socket</code> property. On this connection the server is instructed to shut down. After executing the <code>stop</code> action, the Java application should be terminated. </td>
---
>       <td><code>stop</code> </td>
>       <td>The <code>stop</code> action is used to stop a running application. For that a connection is opened to the server running on the socket specified by the <code>sling.control.socket</code> property. On this connection the server is instructed to shut down. After executing the <code>stop</code> action, the Java application should be terminated. </td>
238,239c239,240
<    <td> <code>status</code> </td>
<    <td> The <code>status</code> action is used to check the status of a running application. For that a connection is opened to the server running on the socket specified by the <code>sling.control.socket</code> property. On this connection the server is queried on its status. After executing the <code>stop</code> action, the Java application should be terminated. </td>
---
>       <td><code>status</code> </td>
>       <td>The <code>status</code> action is used to check the status of a running application. For that a connection is opened to the server running on the socket specified by the <code>sling.control.socket</code> property. On this connection the server is queried on its status. After executing the <code>stop</code> action, the Java application should be terminated. </td>
243c244
< <h4><a href="#conversion-of-commandline-arguments-to-properties" id="conversion-of-commandline-arguments-to-properties">Conversion of Commandline Arguments to Properties</a></h4> 
---
> <h4><a href="#conversion-of-commandline-arguments-to-properties" name="conversion-of-commandline-arguments-to-properties">Conversion of Commandline Arguments to Properties</a></h4>
248,249c249,250
<    <th> Command Line Argument </th>
<    <th> Properties Entry </th>
---
>       <th>Command Line Argument </th>
>       <th>Properties Entry </th>
254,255c255,256
<    <td> start </td>
<    <td> sling.control.action = "start" </td>
---
>       <td>start </td>
>       <td>sling.control.action = "start" </td>
258,259c259,260
<    <td> status </td>
<    <td> sling.control.action = "status" </td>
---
>       <td>status </td>
>       <td>sling.control.action = "status" </td>
262,263c263,264
<    <td> stop </td>
<    <td> sling.control.action = "stop" </td>
---
>       <td>stop </td>
>       <td>sling.control.action = "stop" </td>
266,267c267,268
<    <td> -c slinghome </td>
<    <td> sling.home = slinghome </td>
---
>       <td>-c slinghome </td>
>       <td>sling.home = slinghome </td>
270,271c271,272
<    <td> -l loglevel </td>
<    <td> org.apache.sling.commons.log.level = loglevel </td>
---
>       <td>-l loglevel </td>
>       <td>org.apache.sling.commons.log.level = loglevel </td>
274,275c275,276
<    <td> -f logfile </td>
<    <td> org.apache.sling.commons.log.file = logfile </td>
---
>       <td>-f logfile </td>
>       <td>org.apache.sling.commons.log.file = logfile </td>
278,279c279,280
<    <td> -a address </td>
<    <td> This command line argument is not supported yet and thus ignored </td>
---
>       <td>-a address </td>
>       <td>This command line argument is not supported yet and thus ignored </td>
282,283c283,284
<    <td> -p port </td>
<    <td> org.osgi.service.http.port = port </td>
---
>       <td>-p port </td>
>       <td>org.osgi.service.http.port = port </td>
286,287c287,288
<    <td> -j [ host ":" ] port </td>
<    <td> sling.control.socket = [ host ":" ] port </td>
---
>       <td>-j [ host ":" ] port </td>
>       <td>sling.control.socket = [ host ":" ] port </td>
290,291c291,292
<    <td> -h </td>
<    <td> This command line option is handled directly and not converted into the map </td>
---
>       <td>-h </td>
>       <td>This command line option is handled directly and not converted into the map </td>
295c296
< <h3><a href="#web-application" id="web-application">Web Application</a></h3> 
---
> <h3><a href="#web-application" name="web-application">Web Application</a></h3>
300,301c301,302
<    <th> Class </th>
<    <th> Description </th>
---
>       <th>Class </th>
>       <th>Description </th>
306,307c307,308
<    <td> SlingServlet </td>
<    <td> This is the servlet registered in the <code>web.xml</code> descriptor and loaded by the servlet container into which Sling is deplyoed. This class locates the <code>sling.home</code> folder and loads the <code>SlingServletDelagate</code> to actually launch the framework. </td>
---
>       <td>SlingServlet </td>
>       <td>This is the servlet registered in the <code>web.xml</code> descriptor and loaded by the servlet container into which Sling is deplyoed. This class locates the <code>sling.home</code> folder and loads the <code>SlingServletDelagate</code> to actually launch the framework. </td>
310,311c311,312
<    <td> SlingSessionListener </td>
<    <td> This -- somewhat inappropriately named -- class is registered as a listener by the Sling <code>web.xml</code> descriptor. It is called by the servlet container and forwards events to the <code>SlingHttpSessionListenerDelegate</code> which in turn forwards the events to the respective Servlet API listener services registered in the OSGi Framework. </td>
---
>       <td>SlingSessionListener </td>
>       <td>This -- somewhat inappropriately named -- class is registered as a listener by the Sling <code>web.xml</code> descriptor. It is called by the servlet container and forwards events to the <code>SlingHttpSessionListenerDelegate</code> which in turn forwards the events to the respective Servlet API listener services registered in the OSGi Framework. </td>
314,315c315,316
<    <td> SlingBridge </td>
<    <td> Simple extension of the <code>Sling</code> class which registers the system bundle's <code>BundleContext</code> as a servlet context attribute of the Sling web application. This allows Servlet Container bridging to properly work. </td>
---
>       <td>SlingBridge </td>
>       <td>Simple extension of the <code>Sling</code> class which registers the system bundle's <code>BundleContext</code> as a servlet context attribute of the Sling web application. This allows Servlet Container bridging to properly work. </td>
318,319c319,320
<    <td> SlingHttpSessionListenerDelegate </td>
<    <td> This class is loaded by the <code>LauncherClassLoader</code> called from the <code>SlingSessionListener</code>. It is called by the <code>SlingSessionListener</code> to forward servlet container events to registered Servlet API listener services. </td>
---
>       <td>SlingHttpSessionListenerDelegate </td>
>       <td>This class is loaded by the <code>LauncherClassLoader</code> called from the <code>SlingSessionListener</code>. It is called by the <code>SlingSessionListener</code> to forward servlet container events to registered Servlet API listener services. </td>
322,323c323,324
<    <td> SlingServletDelegate </td>
<    <td> This class is loaded by the <code>Loader</code> from the <code>LauncherClassLoader</code> to actually complete the initial setup before creating the <code>SlingBridge</code> class to start the framework. </td>
---
>       <td>SlingServletDelegate </td>
>       <td>This class is loaded by the <code>Loader</code> from the <code>LauncherClassLoader</code> to actually complete the initial setup before creating the <code>SlingBridge</code> class to start the framework. </td>
diff -b -B -r ./documentation/development/getting-and-building-sling.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/getting-and-building-sling.html
97c97
< <h2><a href="#tldr-short-form-build-run-instructions" id="tldr-short-form-build-run-instructions">tl:dr - Short form build + run instructions</a></h2> 
---
> <h2><a href="#tl-dr-short-form-build-run-instructions" name="tl-dr-short-form-build-run-instructions">tl:dr - Short form build + run instructions</a></h2>
102c102
< $ export DBG="-Xmx384M -agentlib:jdwp..." # (see below)
---
> $ export DBG=&quot;-Xmx384M -agentlib:jdwp...&quot; # (see below)
106c106
< <h2><a href="#prerequisites" id="prerequisites">Prerequisites</a></h2> 
---
> <h2><a href="#prerequisites" name="prerequisites">Prerequisites</a></h2>
113c113
< <h2><a href="#configuring-maven" id="configuring-maven">Configuring Maven</a></h2> 
---
> <h2><a href="#configuring-maven" name="configuring-maven">Configuring Maven</a></h2>
115c115
< <h2><a href="#getting-the-sling-source" id="getting-the-sling-source">Getting the Sling Source</a></h2> 
---
> <h2><a href="#getting-the-sling-source" name="getting-the-sling-source">Getting the Sling Source</a></h2>
117,120c117
< <p>The <a href="/repolist.html">complete list of modules</a> can be used to clone individual modules, but we provide a more convenient way of checking out all of the source modules that are used in Sling. Since that's over 2^
<  <super>
<   8
<  </super> repositories, it's based on additional tooling:</p> 
---
> <p>The <a href="/repolist.html">complete list of modules</a> can be used to clone individual modules, but we provide a more convenient way of checking out all of the source modules that are used in Sling. Since that's over 2^<super>8</super> repositories, it's based on additional tooling:</p>
122,123c119,123
<  <li> <p>Install a git client if needed and the <a href="https://android.googlesource.com/tools/repo">Google Repo</a> tool.</p> </li> 
<  <li> <p>Check out a new repo workspace</p> <pre><code>$ repo init --no-clone-bundle -u https://github.com/apache/sling-aggregator.git
---
>   <li>
>   <p>Install a git client if needed and the <a href="https://android.googlesource.com/tools/repo">Google Repo</a> tool.</p></li>
>   <li>
>     <p>Check out a new repo workspace</p>
>     <pre><code>$ repo init --no-clone-bundle -u https://github.com/apache/sling-aggregator.git
125,126c125,128
< </code></pre> </li> 
<  <li> <p>In your IDE, import the projects you're interested in from the repo workspace.</p> </li> 
---
> </code></pre>
>   </li>
>   <li>
>   <p>In your IDE, import the projects you're interested in from the repo workspace.</p></li>
128c130
< <h2><a href="#building-sling" id="building-sling">Building Sling</a></h2> 
---
> <h2><a href="#building-sling" name="building-sling">Building Sling</a></h2>
133c135
< <h2><a href="#running-sling" id="running-sling">Running Sling</a></h2> 
---
> <h2><a href="#running-sling" name="running-sling">Running Sling</a></h2>
139c141
<   When starting Sling inside the org-apache-sling-starter module you should not use the default Sling Home folder name sling because this folder is removed when running mvn clean. 
---
> When starting Sling inside the org-apache-sling-starter module you should not use the default Sling Home folder name sling because this folder is removed when running mvn clean.
149c151
< <h2><a href="#making-and-deploying-changes" id="making-and-deploying-changes">Making and deploying changes</a></h2> 
---
> <h2><a href="#making-and-deploying-changes" name="making-and-deploying-changes">Making and deploying changes</a></h2>
160,161c162,163
< <h2><a href="#further-tips-and-tricks" id="further-tips-and-tricks">Further Tips and Tricks</a></h2> 
< <h3><a href="#debug-sling-in-eclipse" id="debug-sling-in-eclipse">Debug Sling in Eclipse</a></h3> 
---
> <h2><a href="#further-tips-and-tricks" name="further-tips-and-tricks">Further Tips and Tricks</a></h2>
> <h3><a href="#debug-sling-in-eclipse" name="debug-sling-in-eclipse">Debug Sling in Eclipse</a></h3>
164,165c166,171
<  <li> <p>start Sling from the command line with (replace N with the actual version before running the command)</p> <p>java -Xmx384M -agentlib:jdwp=transport=dt_socket,address=30303,server=y,suspend=n -jar org.apache.sling.starter-N.jar</p> </li> 
<  <li> <p>Open Menu Run-&gt; Debug configurations</p> </li> 
---
>   <li>
>     <p>start Sling from the command line with (replace N with the actual version before running the command)</p>
>     <p>java -Xmx384M -agentlib:jdwp=transport=dt_socket,address=30303,server=y,suspend=n -jar org.apache.sling.starter-N.jar</p>
>   </li>
>   <li>
>   <p>Open Menu Run-&gt; Debug configurations</p></li>
178c184
< <h3><a href="#debug-maven-tests-in-eclipse" id="debug-maven-tests-in-eclipse">Debug Maven Tests in Eclipse</a></h3> 
---
> <h3><a href="#debug-maven-tests-in-eclipse" name="debug-maven-tests-in-eclipse">Debug Maven Tests in Eclipse</a></h3>
183c189
< <h3><a href="#simple-way-to-develop-new-bundle-in-eclipse-for-sling" id="simple-way-to-develop-new-bundle-in-eclipse-for-sling">Simple way to develop new bundle in Eclipse for Sling</a></h3> 
---
> <h3><a href="#simple-way-to-develop-new-bundle-in-eclipse-for-sling" name="simple-way-to-develop-new-bundle-in-eclipse-for-sling">Simple way to develop new bundle in Eclipse for Sling</a></h3>
diff -b -B -r ./documentation/development/hamcrest.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/hamcrest.html
95c95
< <h2><a href="#maven-dependency" id="maven-dependency">Maven Dependency</a></h2> 
---
> <h2><a href="#maven-dependency" name="maven-dependency">Maven Dependency</a></h2>
97c97
<   This module has not yet been officially released. 
---
> This module has not yet been officially released.
106c106
< <h2><a href="#usage" id="usage">Usage</a></h2> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
117,118c117,118
<     assertThat(resource, resourceOfType("my/app"));
<     assertThat(resource, hasChildren("header", "body"));
---
>     assertThat(resource, resourceOfType(&quot;my/app&quot;));
>     assertThat(resource, hasChildren(&quot;header&quot;, &quot;body&quot;));
diff -b -B -r ./documentation/development/ide-tooling/ide-tooling-incremental-build.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/ide-tooling/ide-tooling-incremental-build.html
100c100
< <h2><a href="#overview" id="overview">Overview</a></h2> 
---
> <h2><a href="#overview" name="overview">Overview</a></h2>
102,103c102,103
< <h2><a href="#manifest-generation" id="manifest-generation">Manifest Generation</a></h2> 
< <h3><a href="#maven-bundle-plugin" id="maven-bundle-plugin">maven-bundle-plugin</a></h3> 
---
> <h2><a href="#manifest-generation" name="manifest-generation">Manifest Generation</a></h2>
> <h3><a href="#maven-bundle-plugin" name="maven-bundle-plugin">maven-bundle-plugin</a></h3>
105c105
< <h4><a href="#maven-bundle-plugin-prior-to-version-320" id="maven-bundle-plugin-prior-to-version-320">maven-bundle-plugin prior to version 3.2.0</a></h4> 
---
> <h4><a href="#maven-bundle-plugin-prior-to-version-3-2-0" name="maven-bundle-plugin-prior-to-version-3-2-0">maven-bundle-plugin prior to version 3.2.0</a></h4>
107c107
< <h4><a href="#maven-bundle-plugin-since-version-320" id="maven-bundle-plugin-since-version-320">maven-bundle-plugin since version 3.2.0</a></h4> 
---
> <h4><a href="#maven-bundle-plugin-since-version-3-2-0" name="maven-bundle-plugin-since-version-3-2-0">maven-bundle-plugin since version 3.2.0</a></h4>
109c109
< <h3><a href="#bnd-maven-plugin" id="bnd-maven-plugin">bnd-maven-plugin</a></h3> 
---
> <h3><a href="#bnd-maven-plugin" name="bnd-maven-plugin">bnd-maven-plugin</a></h3>
111c111
< <h2><a href="#service-description-and-metatype-resources" id="service-description-and-metatype-resources">Service Description and Metatype Resources</a></h2> 
---
> <h2><a href="#service-description-and-metatype-resources" name="service-description-and-metatype-resources">Service Description and Metatype Resources</a></h2>
diff -b -B -r ./documentation/development/ide-tooling.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/ide-tooling.html
98,99c98,99
< <h2><a href="#installation" id="installation">Installation</a></h2> 
< <h3><a href="#prerequisites" id="prerequisites">Prerequisites</a></h3> 
---
> <h2><a href="#installation" name="installation">Installation</a></h2>
> <h3><a href="#prerequisites" name="prerequisites">Prerequisites</a></h3>
102c102
< <h3><a href="#update-site-installation" id="update-site-installation">Update site installation</a></h3> 
---
> <h3><a href="#update-site-installation" name="update-site-installation">Update site installation</a></h3>
104c104
< <h3><a href="#building-from-source" id="building-from-source">Building from source</a></h3> 
---
> <h3><a href="#building-from-source" name="building-from-source">Building from source</a></h3>
109c109
< <h2><a href="#overall-concepts" id="overall-concepts">Overall concepts</a></h2> 
---
> <h2><a href="#overall-concepts" name="overall-concepts">Overall concepts</a></h2>
112c112
< <h3><a href="#server-definition" id="server-definition">Server definition</a></h3> 
---
> <h3><a href="#server-definition" name="server-definition">Server definition</a></h3>
115c115
< <p><img src="http://sling.apache.org/ide-tooling/new-server.png" alt="New Server"></p> 
---
> <p><img src="ide-tooling/new-server.png" alt="New Server" /></p>
117c117
< <p><img src="http://sling.apache.org/ide-tooling/new-server-2.png" alt="New Server Step 2"></p> 
---
> <p><img src="ide-tooling/new-server-2.png" alt="New Server Step 2" /></p>
119c119
< <h2><a href="#server-configuration" id="server-configuration">Server configuration</a></h2> 
---
> <h2><a href="#server-configuration" name="server-configuration">Server configuration</a></h2>
121c121
< <p><img src="http://sling.apache.org/ide-tooling/servers-view.png" alt="Servers View"></p> 
---
> <p><img src="ide-tooling/servers-view.png" alt="Servers View" /></p>
133c133
< <p><img src="http://sling.apache.org/ide-tooling/server-definition.png" alt="Servers Definition"></p> 
---
> <p><img src="ide-tooling/server-definition.png" alt="Servers Definition" /></p>
135c135
< <h2><a href="#content-sync" id="content-sync">Content sync</a></h2> 
---
> <h2><a href="#content-sync" name="content-sync">Content sync</a></h2>
142c142
< <h3><a href="#creating-a-new-content-project" id="creating-a-new-content-project">Creating a new content project</a></h3> 
---
> <h3><a href="#creating-a-new-content-project" name="creating-a-new-content-project">Creating a new content project</a></h3>
144c144
< <p><img src="http://sling.apache.org/ide-tooling/new-content-project-step-1.png" alt="New content project step 1"></p> 
---
> <p><img src="ide-tooling/new-content-project-step-1.png" alt="New content project step 1" /></p>
146c146
< <p><img src="http://sling.apache.org/ide-tooling/new-content-project-step-2.png" alt="New content project step 2"></p> 
---
> <p><img src="ide-tooling/new-content-project-step-2.png" alt="New content project step 2" /></p>
148c148
< <p><img src="http://sling.apache.org/ide-tooling/new-content-project-step-3.png" alt="New content project step 3"></p> 
---
> <p><img src="ide-tooling/new-content-project-step-3.png" alt="New content project step 3" /></p>
151,152c151,152
< <h3><a href="#converting-existing-projects" id="converting-existing-projects">Converting existing projects</a></h3> 
< <h4><a href="#automatic-conversion" id="automatic-conversion">Automatic conversion</a></h4> 
---
> <h3><a href="#converting-existing-projects" name="converting-existing-projects">Converting existing projects</a></h3>
> <h4><a href="#automatic-conversion" name="automatic-conversion">Automatic conversion</a></h4>
159,160c159,160
<    <th> Property name </th>
<    <th> Effect </th>
---
>       <th>Property name </th>
>       <th>Effect </th>
165,166c165,166
<    <td> <code>sling.ide.m2e.contentpackage.active</code> </td>
<    <td> When set to <code>false</code>, the configuration is disabled </td>
---
>       <td><code>sling.ide.m2e.contentpackage.active</code> </td>
>       <td>When set to <code>false</code>, the configuration is disabled </td>
169,170c169,170
<    <td> <code>sling.ide.m2e.contentpackage.javaFacetVersion</code> </td>
<    <td> Controls the version of the Java Facet which is added to the project, e.g. <code>8</code> </td>
---
>       <td><code>sling.ide.m2e.contentpackage.javaFacetVersion</code> </td>
>       <td>Controls the version of the Java Facet which is added to the project, e.g. <code>8</code> </td>
173,174c173,174
<    <td> <code>sling.ide.m2e.contentpackage.webFacetVersion</code> </td>
<    <td> Controls the version of the Web Facet which is added to the project, e.g. <code>3.0</code> </td>
---
>       <td><code>sling.ide.m2e.contentpackage.webFacetVersion</code> </td>
>       <td>Controls the version of the Web Facet which is added to the project, e.g. <code>3.0</code> </td>
180,181c180,181
< <p><img src="http://sling.apache.org/ide-tooling/maven-configurators-preferences.png" alt="Maven Project Configurator preferences"></p> 
< <h4><a href="#manual-conversion" id="manual-conversion">Manual conversion</a></h4> 
---
> <p><img src="ide-tooling/maven-configurators-preferences.png" alt="Maven Project Configurator preferences" /></p>
> <h4><a href="#manual-conversion" name="manual-conversion">Manual conversion</a></h4>
183c183
< <h3><a href="#content-navigator" id="content-navigator">Content navigator</a></h3> 
---
> <h3><a href="#content-navigator" name="content-navigator">Content navigator</a></h3>
185c185
< <p><img src="http://sling.apache.org/ide-tooling/content-navigator.png" alt="Content navigator"></p> 
---
> <p><img src="ide-tooling/content-navigator.png" alt="Content navigator" /></p>
187,188c187,188
< <p><img src="http://sling.apache.org/ide-tooling/jcr-properties.png" alt="JCR properties"></p> 
< <h3><a href="#filterxml-workspace-filter-definition" id="filterxml-workspace-filter-definition">filter.xml - workspace filter definition</a></h3> 
---
> <p><img src="ide-tooling/jcr-properties.png" alt="JCR properties" /></p>
> <h3><a href="#filter-xml-workspace-filter-definition" name="filter-xml-workspace-filter-definition">filter.xml - workspace filter definition</a></h3>
190c190
< <h3><a href="#deploying-projects-on-the-server" id="deploying-projects-on-the-server">Deploying projects on the server</a></h3> 
---
> <h3><a href="#deploying-projects-on-the-server" name="deploying-projects-on-the-server">Deploying projects on the server</a></h3>
192c192
< <p><img src="http://sling.apache.org/ide-tooling/add-remove-projects.png" alt="Add and Remove projects from server"></p> 
---
> <p><img src="ide-tooling/add-remove-projects.png" alt="Add and Remove projects from server" /></p>
194c194
< <h3><a href="#manual-content-sync" id="manual-content-sync">Manual content sync</a></h3> 
---
> <h3><a href="#manual-content-sync" name="manual-content-sync">Manual content sync</a></h3>
197c197
< <p><img src="http://sling.apache.org/ide-tooling/repository-export.png" alt="Repository export"></p> 
---
> <p><img src="ide-tooling/repository-export.png" alt="Repository export" /></p>
199,200c199,200
< <p><img src="http://sling.apache.org/ide-tooling/repository-import.png" alt="Repository import"></p> 
< <h3><a href="#excluding-paths-from-the-sync-process" id="excluding-paths-from-the-sync-process">Excluding paths from the sync process</a></h3> 
---
> <p><img src="ide-tooling/repository-import.png" alt="Repository import" /></p>
> <h3><a href="#excluding-paths-from-the-sync-process" name="excluding-paths-from-the-sync-process">Excluding paths from the sync process</a></h3>
203,204c203,204
< <p><img src="http://sling.apache.org/ide-tooling/content-sync-exclusions.png" alt="Content sync exclusions"></p> 
< <h2><a href="#bundle-sync" id="bundle-sync">Bundle sync</a></h2> 
---
> <p><img src="ide-tooling/content-sync-exclusions.png" alt="Content sync exclusions" /></p>
> <h2><a href="#bundle-sync" name="bundle-sync">Bundle sync</a></h2>
206c206
< <h3><a href="#creating-a-new-bundle-project" id="creating-a-new-bundle-project">Creating a new bundle project</a></h3> 
---
> <h3><a href="#creating-a-new-bundle-project" name="creating-a-new-bundle-project">Creating a new bundle project</a></h3>
208c208
< <p><img src="http://sling.apache.org/ide-tooling/new-bundle-project-step-1.png" alt="New bundle project step 1"></p> 
---
> <p><img src="ide-tooling/new-bundle-project-step-1.png" alt="New bundle project step 1" /></p>
210c210
< <p><img src="http://sling.apache.org/ide-tooling/new-bundle-project-step-2.png" alt="New bundle project step 2"></p> 
---
> <p><img src="ide-tooling/new-bundle-project-step-2.png" alt="New bundle project step 2" /></p>
212c212
< <p><img src="http://sling.apache.org/ide-tooling/new-bundle-project-step-3.png" alt="New bundle project step 3"></p> 
---
> <p><img src="ide-tooling/new-bundle-project-step-3.png" alt="New bundle project step 3" /></p>
214c214
< <p><img src="http://sling.apache.org/ide-tooling/new-bundle-project-step-4.png" alt="New bundle project step 4"></p> 
---
> <p><img src="ide-tooling/new-bundle-project-step-4.png" alt="New bundle project step 4" /></p>
216c216
< <h3><a href="#converting-existing-projects" id="converting-existing-projects">Converting existing projects</a></h3> 
---
> <h3><a href="#converting-existing-projects" name="converting-existing-projects">Converting existing projects</a></h3>
218c218
< <h3><a href="#deploying-projects-on-the-server" id="deploying-projects-on-the-server">Deploying projects on the server</a></h3> 
---
> <h3><a href="#deploying-projects-on-the-server" name="deploying-projects-on-the-server">Deploying projects on the server</a></h3>
220c220
< <p><img src="http://sling.apache.org/ide-tooling/add-remove-projects.png" alt="Add and Remove projects from server"></p> 
---
> <p><img src="ide-tooling/add-remove-projects.png" alt="Add and Remove projects from server" /></p>
222c222
< <h2><a href="#htl-support" id="htl-support">HTL support</a></h2> 
---
> <h2><a href="#htl-support" name="htl-support">HTL support</a></h2>
231c231
< <p><img src="http://sling.apache.org/ide-tooling/sightly-editor.png" alt="HTL Editor"></p> 
---
> <p><img src="ide-tooling/sightly-editor.png" alt="HTL Editor" /></p>
233c233
< <h2><a href="#debugging" id="debugging">Debugging</a></h2> 
---
> <h2><a href="#debugging" name="debugging">Debugging</a></h2>
236c236
< <p><img src="http://sling.apache.org/ide-tooling/debug.png" alt="Debugging"></p> 
---
> <p><img src="ide-tooling/debug.png" alt="Debugging" /></p>
238c238
< <h2><a href="#launchpad-project-support" id="launchpad-project-support">Launchpad project support</a></h2> 
---
> <h2><a href="#launchpad-project-support" name="launchpad-project-support">Launchpad project support</a></h2>
242,244c242,244
< <p><img src="http://sling.apache.org/ide-tooling/launchpad-models-directory.png" alt="Launchpad project"></p> 
< <h2><a href="#troubleshooting" id="troubleshooting">Troubleshooting</a></h2> 
< <h3><a href="#gathering-debug-information" id="gathering-debug-information">Gathering debug information</a></h3> 
---
> <p><img src="ide-tooling/launchpad-models-directory.png" alt="Launchpad project" /></p>
> <h2><a href="#troubleshooting" name="troubleshooting">Troubleshooting</a></h2>
> <h3><a href="#gathering-debug-information" name="gathering-debug-information">Gathering debug information</a></h3>
246c246
< <p><img src="http://sling.apache.org/ide-tooling/sling-console.png" alt="Sling Console"></p> 
---
> <p><img src="ide-tooling/sling-console.png" alt="Sling Console" /></p>
248,250c248,250
< <p><img src="http://sling.apache.org/ide-tooling/tracing.png" alt="Tracing"></p> 
< <h3><a href="#why-do-i-get-an-error-about-no-ds-descriptor-found-at" id="why-do-i-get-an-error-about-no-ds-descriptor-found-at">Why do I get an error about "No DS descriptor found at..."?</a></h3> 
< <p><img src="http://sling.apache.org/ide-tooling/missing-scr-descriptor.png" alt="Missing SCR descriptors"></p> 
---
> <p><img src="ide-tooling/tracing.png" alt="Tracing" /></p>
> <h3><a href="#why-do-i-get-an-error-about-no-ds-descriptor-found-at-" name="why-do-i-get-an-error-about-no-ds-descriptor-found-at-">Why do I get an error about "No DS descriptor found at..."?</a></h3>
> <p><img src="ide-tooling/missing-scr-descriptor.png" alt="Missing SCR descriptors" /></p>
259c259
< <h3><a href="#how-do-i-fix-the-error-missing-m2e-incremental-build-support-for-generating-the-bundle-manifest-component-descriptions-and-metatype-resources" id="how-do-i-fix-the-error-missing-m2e-incremental-build-support-for-generating-the-bundle-manifest-component-descriptions-and-metatype-resources">How do I fix the error "Missing m2e incremental build support for generating the bundle manifest, component descriptions and metatype resources"?</a></h3> 
---
> <h3><a href="#how-do-i-fix-the-error-missing-m2e-incremental-build-support-for-generating-the-bundle-manifest-component-descriptions-and-metatype-resources-" name="how-do-i-fix-the-error-missing-m2e-incremental-build-support-for-generating-the-bundle-manifest-component-descriptions-and-metatype-resources-">How do I fix the error "Missing m2e incremental build support for generating the bundle manifest, component descriptions and metatype resources"?</a></h3>
261c261
< <h2><a href="#known-issues" id="known-issues">Known issues</a></h2> 
---
> <h2><a href="#known-issues" name="known-issues">Known issues</a></h2>
diff -b -B -r ./documentation/development/issue-tracker.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/issue-tracker.html
99c99
< <h2><a href="#issue-type" id="issue-type">Issue type</a></h2> 
---
> <h2><a href="#issue-type" name="issue-type">Issue type</a></h2>
104,105c104,105
<    <th> Issue type </th>
<    <th> Description </th>
---
>       <th>Issue type </th>
>       <th>Description </th>
110,111c110,111
<    <td> <em>Bug</em> </td>
<    <td> Bug reports are used for cases where Sling fails not function as it should (as defined by some documentation). If you are not certain whether the issue you've found is actually a bug, please ask the <a href="/project-information.html#mailing-lists">Sling mailing lists</a> first for help. </td>
---
>       <td><em>Bug</em> </td>
>       <td>Bug reports are used for cases where Sling fails not function as it should (as defined by some documentation). If you are not certain whether the issue you've found is actually a bug, please ask the <a href="/project-information.html#mailing-lists">Sling mailing lists</a> first for help. </td>
114,115c114,115
<    <td> <em>New Feature</em> </td>
<    <td> Use a feature request when Sling does not have some functionality you need. </td>
---
>       <td><em>New Feature</em> </td>
>       <td>Use a feature request when Sling does not have some functionality you need. </td>
118,119c118,119
<    <td> <em>Improvement</em> </td>
<    <td> Use an improvement request to suggest improvements to existing features. Typical improvement requests are about updating documentation, increasing stability and performance, simplifying the implementation, or other such changes that make Sling better without introducing new features or fixing existing bugs. </td>
---
>       <td><em>Improvement</em> </td>
>       <td>Use an improvement request to suggest improvements to existing features. Typical improvement requests are about updating documentation, increasing stability and performance, simplifying the implementation, or other such changes that make Sling better without introducing new features or fixing existing bugs. </td>
122,123c122,123
<    <td> <em>Test</em> </td>
<    <td> Use this type when contributing test cases for existing features. Normally test cases should be contributed as a part of the original feature request or as regression tests associated with bug reports, but sometimes you just want to extend test coverage by introducing new test cases. This issue type is for such cases. </td>
---
>       <td><em>Test</em> </td>
>       <td>Use this type when contributing test cases for existing features. Normally test cases should be contributed as a part of the original feature request or as regression tests associated with bug reports, but sometimes you just want to extend test coverage by introducing new test cases. This issue type is for such cases. </td>
126,127c126,127
<    <td> <em>Task</em> </td>
<    <td> Used only for issues related to project infrastructure. </td>
---
>       <td><em>Task</em> </td>
>       <td>Used only for issues related to project infrastructure. </td>
131c131
< <h2><a href="#summary" id="summary">Summary</a></h2> 
---
> <h2><a href="#summary" name="summary">Summary</a></h2>
133c133
< <h2><a href="#issue-priority" id="issue-priority">Issue priority</a></h2> 
---
> <h2><a href="#issue-priority" name="issue-priority">Issue priority</a></h2>
138,139c138,139
<    <th> Issue priority </th>
<    <th> Description </th>
---
>       <th>Issue priority </th>
>       <th>Description </th>
144,145c144,145
<    <td> <em>Blocker</em> </td>
<    <td> Legal or other fundamental issue that makes it impossible to release Jackrabbit code </td>
---
>       <td><em>Blocker</em> </td>
>       <td>Legal or other fundamental issue that makes it impossible to release Jackrabbit code </td>
148,149c148,149
<    <td> <em>Critical</em> </td>
<    <td> Major loss of functionality that affects many Slingusers </td>
---
>       <td><em>Critical</em> </td>
>       <td>Major loss of functionality that affects many Slingusers </td>
152,153c152,153
<    <td> <em>Major</em> </td>
<    <td> Important issue that should be resolved soon </td>
---
>       <td><em>Major</em> </td>
>       <td>Important issue that should be resolved soon </td>
156,157c156,157
<    <td> <em>Minor</em> </td>
<    <td> Nice to have issues </td>
---
>       <td><em>Minor</em> </td>
>       <td>Nice to have issues </td>
160,161c160,161
<    <td> <em>Trivial</em> </td>
<    <td> Trivial changes that can be applied whenever someone has extra time </td>
---
>       <td><em>Trivial</em> </td>
>       <td>Trivial changes that can be applied whenever someone has extra time </td>
165c165
< <h2><a href="#issue-states" id="issue-states">Issue States</a></h2> 
---
> <h2><a href="#issue-states" name="issue-states">Issue States</a></h2>
170,172c170,172
<    <th> State </th>
<    <th> Description </th>
<    <th> Next States in Workflow </th>
---
>       <th>State </th>
>       <th>Description </th>
>       <th>Next States in Workflow </th>
177,179c177,179
<    <td> <em>Open</em> </td>
<    <td> The issue has just been created </td>
<    <td> <em>In Pogress</em> </td>
---
>       <td><em>Open</em> </td>
>       <td>The issue has just been created </td>
>       <td><em>In Pogress</em> </td>
182,184c182,184
<    <td> <em>In Progress</em> </td>
<    <td> Work has started on the issue </td>
<    <td> <em>Documentation Required</em>, <em>Testcase Required</em>, <em>Documentation/Testcase required</em>, <em>Resolved</em>, <em>Open</em> </td>
---
>       <td><em>In Progress</em> </td>
>       <td>Work has started on the issue </td>
>       <td><em>Documentation Required</em>, <em>Testcase Required</em>, <em>Documentation/Testcase required</em>, <em>Resolved</em>, <em>Open</em> </td>
187,189c187,189
<    <td> <em>Documentation Required</em> </td>
<    <td> Implementation work has finished for this issue. To complete it documentation must be created and/or updated. </td>
<    <td> <em>Resolved</em> </td>
---
>       <td><em>Documentation Required</em> </td>
>       <td>Implementation work has finished for this issue. To complete it documentation must be created and/or updated. </td>
>       <td><em>Resolved</em> </td>
192,194c192,194
<    <td> <em>Testcase Required</em> </td>
<    <td> Implementation work has finished for this issue. To complete it test cases must be created and/or updated. </td>
<    <td> <em>Resolved</em> </td>
---
>       <td><em>Testcase Required</em> </td>
>       <td>Implementation work has finished for this issue. To complete it test cases must be created and/or updated. </td>
>       <td><em>Resolved</em> </td>
197,199c197,199
<    <td> <em>Documentation/Testcase Required</em> </td>
<    <td> Implementation work has finished for this issue. To complete it documentation and test cases must be created and/or updated. </td>
<    <td> <em>Resolved</em>, <em>Documentation Required</em>, <em>Testcase Required</em> </td>
---
>       <td><em>Documentation/Testcase Required</em> </td>
>       <td>Implementation work has finished for this issue. To complete it documentation and test cases must be created and/or updated. </td>
>       <td><em>Resolved</em>, <em>Documentation Required</em>, <em>Testcase Required</em> </td>
202,204c202,204
<    <td> <em>Resolved</em> </td>
<    <td> The issue has been resolved from the developers point of view. Documentation and Testcases have been created and updated as required. Issue is ready for release. </td>
<    <td> <em>Reopened</em>, <em>Closed</em> </td>
---
>       <td><em>Resolved</em> </td>
>       <td>The issue has been resolved from the developers point of view. Documentation and Testcases have been created and updated as required. Issue is ready for release. </td>
>       <td><em>Reopened</em>, <em>Closed</em> </td>
207,214c207,209
<    <td> <em>Reopened</em> </td>
<    <td> A resolved issue has been recognized to contain bugs or to be incomplete and thus has been reopened. </td>
<    <td> <em>In Progress</em>, <em>Resolved</em> </td>
<   </tr> 
<   <tr>
<    <td> <em>Closed</em> </td>
<    <td> Work on this issue has finished and it is included in the release. </td>
<    <td> -- </td>
---
>       <td><em>Reopened</em> </td>
>       <td>A resolved issue has been recognized to contain bugs or to be incomplete and thus has been reopened. </td>
>       <td><em>In Progress</em>, <em>Resolved</em> </td>
217a213
> <p>| <em>Closed</em> | Work on this issue has finished and it is included in the release. | -- |</p>
221c217
< <h2><a href="#patches" id="patches">Patches</a></h2> 
---
> <h2><a href="#patches" name="patches">Patches</a></h2>
diff -b -B -r ./documentation/development/jcr-mock.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/jcr-mock.html
101c101
< <h2><a href="#maven-dependency" id="maven-dependency">Maven Dependency</a></h2> 
---
> <h2><a href="#maven-dependency" name="maven-dependency">Maven Dependency</a></h2>
108c108
< <h2><a href="#implemented-mock-features" id="implemented-mock-features">Implemented mock features</a></h2> 
---
> <h2><a href="#implemented-mock-features" name="implemented-mock-features">Implemented mock features</a></h2>
126,127c126,127
< <h2><a href="#usage" id="usage">Usage</a></h2> 
< <h3><a href="#getting-jcr-mock-objects" id="getting-jcr-mock-objects">Getting JCR mock objects</a></h3> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
> <h3><a href="#getting-jcr-mock-objects" name="getting-jcr-mock-objects">Getting JCR mock objects</a></h3>
137c137
< <h3><a href="#mocking-queries" id="mocking-queries">Mocking queries</a></h3> 
---
> <h3><a href="#mocking-queries" name="mocking-queries">Mocking queries</a></h3>
147c147
< MockJcr.setQueryResult(session, "your query statement", Query.JCR_SQL2, resultNodes);
---
> MockJcr.setQueryResult(session, &quot;your query statement&quot;, Query.JCR_SQL2, resultNodes);
diff -b -B -r ./documentation/development/jsr-305.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/jsr-305.html
96c96
< <h1><a href="#introduction" id="introduction">Introduction</a></h1> 
---
> <h1><a href="#introduction" name="introduction">Introduction</a></h1>
98c98
< <h1><a href="#annotations" id="annotations">Annotations</a></h1> 
---
> <h1><a href="#annotations" name="annotations">Annotations</a></h1>
108,109c108,109
< <h1><a href="#use-with-eclipse" id="use-with-eclipse">Use With Eclipse</a></h1> 
< <p>Eclipse since Juno supports <a href="http://help.eclipse.org/juno/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Freference%2Fpreferences%2Fjava%2Fcompiler%2Fref-preferences-errors-warnings.htm&amp;anchor=null_analysis">null analysis based on any annotations</a>. Those need to be enabled in <em>Preferences-&gt;Java-&gt;Compiler-&gt;Errors/Warnings</em> via <strong>Enable annoation-based null analysis</strong>. Also the annotations need to be configured. For Sling/JSR 305 those are</p> 
---
> <h1><a href="#use-with-eclipse" name="use-with-eclipse">Use With Eclipse</a></h1>
> <p>Eclipse since Juno supports <a href="http://help.eclipse.org/juno/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Freference%2Fpreferences%2Fjava%2Fcompiler%2Fref-preferences-errors-warnings.htm&anchor=null_analysis">null analysis based on any annotations</a>. Those need to be enabled in <em>Preferences-&gt;Java-&gt;Compiler-&gt;Errors/Warnings</em> via <strong>Enable annoation-based null analysis</strong>. Also the annotations need to be configured. For Sling/JSR 305 those are</p>
114c114
< <p><img src="http://sling.apache.org/eclipse-settings-null-analysis.png" alt="Eclipse Settings for Null analysis"></p> 
---
> <p><img src="eclipse-settings-null-analysis.png" alt="Eclipse Settings for Null analysis" /></p>
118,119c118,119
< <h1><a href="#use-with-maven" id="use-with-maven">Use With Maven</a></h1> 
< <h2><a href="#leveraging-eclipse-jdt-compiler-recommended" id="leveraging-eclipse-jdt-compiler-recommended">Leveraging Eclipse JDT Compiler (recommended)</a></h2> 
---
> <h1><a href="#use-with-maven" name="use-with-maven">Use With Maven</a></h1>
> <h2><a href="#leveraging-eclipse-jdt-compiler-recommended-" name="leveraging-eclipse-jdt-compiler-recommended-">Leveraging Eclipse JDT Compiler (recommended)</a></h2>
146c146
< <h2><a href="#leveraging-findbugs" id="leveraging-findbugs">Leveraging FindBugs</a></h2> 
---
> <h2><a href="#leveraging-findbugs" name="leveraging-findbugs">Leveraging FindBugs</a></h2>
166c166
< <h1><a href="#use-with-findbugs" id="use-with-findbugs">Use With FindBugs</a></h1> 
---
> <h1><a href="#use-with-findbugs" name="use-with-findbugs">Use With FindBugs</a></h1>
176c176
< <h1><a href="#use-with-sonarqube" id="use-with-sonarqube">Use with SonarQube</a></h1> 
---
> <h1><a href="#use-with-sonarqube" name="use-with-sonarqube">Use with SonarQube</a></h1>
diff -b -B -r ./documentation/development/logging.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/logging.html
97,98c97,98
<   This document is for the new (November 2013) 4.x release of the Sling Commons Log components. Refer to 
<  <a href="http://sling.apache.org/documentation/legacy/logging.html">Logging 3.x</a> for older versions. 
---
> This document is for the new (November 2013) 4.x release of the Sling Commons Log components. Refer to
> <a href="http://sling.apache.org/documentation/legacy/logging.html">Logging 3.x</a> for older versions.
102c102
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
114c114
< <h3><a href="#v500-release" id="v500-release">v5.0.0 release</a></h3> 
---
> <h3><a href="#v5-0-0-release" name="v5-0-0-release">v5.0.0 release</a></h3>
117c117
< <h2><a href="#webconsole-plugin" id="webconsole-plugin">WebConsole Plugin</a></h2> 
---
> <h2><a href="#webconsole-plugin" name="webconsole-plugin">WebConsole Plugin</a></h2>
129,130c129,130
< <p><img src="http://sling.apache.org/sling-log-support.png"></p> 
< <h2><a href="#webtail" id="webtail">WebTail</a></h2> 
---
> <img src="sling-log-support.png" />
> <h2><a href="#webtail" name="webtail">WebTail</a></h2>
132c132,134
< <p><code>http://localhost:8080/system/console/slinglog/tailer.txt?tail=1000&amp;grep=lucene&amp;name=%2Flogs%2Ferror.log</code></p> 
---
> <p><code>
> http://localhost:8080/system/console/slinglog/tailer.txt?tail=1000&amp;grep=lucene&amp;name=%2Flogs%2Ferror.log
> </code></p>
141c143,144
<   </ul> </li> 
---
>     </ul>
>   </li>
143c146
< <h2><a href="#initial-configuration" id="initial-configuration">Initial Configuration</a></h2> 
---
> <h2><a href="#initial-configuration" name="initial-configuration">Initial Configuration</a></h2>
148,150c151,153
<    <th> Property </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default </th>
>       <th>Description </th>
155,157c158,160
<    <td> <code>org.apache.sling.commons.log.level</code> </td>
<    <td> <code>INFO</code> </td>
<    <td> Sets the initial logging level of the root logger. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
---
>       <td><code>org.apache.sling.commons.log.level</code> </td>
>       <td><code>INFO</code> </td>
>       <td>Sets the initial logging level of the root logger. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
160,162c163,165
<    <td> <code>org.apache.sling.commons.log.file</code> </td>
<    <td> undefined </td>
<    <td> Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
---
>       <td><code>org.apache.sling.commons.log.file</code> </td>
>       <td>undefined </td>
>       <td>Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
165,167c168,170
<    <td> <code>org.apache.sling.commons.log.file.number</code> </td>
<    <td> 5 </td>
<    <td> The number of rotated files to keep. </td>
---
>       <td><code>org.apache.sling.commons.log.file.number</code> </td>
>       <td>5 </td>
>       <td>The number of rotated files to keep. </td>
170,172c173,175
<    <td> <code>org.apache.sling.commons.log.file.size</code> </td>
<    <td> '.'yyyy-MM-dd </td>
<    <td> Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
---
>       <td><code>org.apache.sling.commons.log.file.size</code> </td>
>       <td>'.'yyyy-MM-dd </td>
>       <td>Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
175,177c178,180
<    <td> <code>org.apache.sling.commons.log.pattern</code> </td>
<    <td> {0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
<    <td> The <code>MessageFormat</code> pattern to use for formatting log messages with the root logger. </td>
---
>       <td><code>org.apache.sling.commons.log.pattern</code> </td>
>       <td>{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
>       <td>The <code>MessageFormat</code> pattern to use for formatting log messages with the root logger. </td>
180,182c183,185
<    <td> <code>org.apache.sling.commons.log.julenabled</code> </td>
<    <td> n/a </td>
<    <td> Enables the <code>java.util.logging</code> support. </td>
---
>       <td><code>org.apache.sling.commons.log.julenabled</code> </td>
>       <td>n/a </td>
>       <td>Enables the <code>java.util.logging</code> support. </td>
185,187c188,190
<    <td> <code>org.apache.sling.commons.log.configurationFile</code> </td>
<    <td> n/a </td>
<    <td> Path for the Logback config file which would be used to configure logging. If the path is not absolute then it would be resolved against Sling Home </td>
---
>       <td><code>org.apache.sling.commons.log.configurationFile</code> </td>
>       <td>n/a </td>
>       <td>Path for the Logback config file which would be used to configure logging. If the path is not absolute then it would be resolved against Sling Home </td>
190,192c193,195
<    <td> <code>org.apache.sling.commons.log.packagingDataEnabled</code> </td>
<    <td> true </td>
<    <td> Boolean property to control packaging data support of Logback. See <a href="http://www.slf4j.org/manual.html#mdc">Packaging Data</a> section of Logback for more details </td>
---
>       <td><code>org.apache.sling.commons.log.packagingDataEnabled</code> </td>
>       <td>true </td>
>       <td>Boolean property to control packaging data support of Logback. See <a href="http://www.slf4j.org/manual.html#mdc">Packaging Data</a> section of Logback for more details </td>
195,197c198,200
<    <td> <code>org.apache.sling.commons.log.numOfLines</code> </td>
<    <td> 1000 </td>
<    <td> Number of lines from each log files to include while generating the dump in 'txt' mode. If set to -1 then whole file would be included </td>
---
>       <td><code>org.apache.sling.commons.log.numOfLines</code> </td>
>       <td>1000 </td>
>       <td>Number of lines from each log files to include while generating the dump in 'txt' mode. If set to -1 then whole file would be included </td>
200,202c203,205
<    <td> <code>org.apache.sling.commons.log.maxOldFileCountInDump</code> </td>
<    <td> 3 </td>
<    <td> Maximum number of old rolled over files for each active file to be included while generating the dump as part of Status zip support </td>
---
>       <td><code>org.apache.sling.commons.log.maxOldFileCountInDump</code> </td>
>       <td>3 </td>
>       <td>Maximum number of old rolled over files for each active file to be included while generating the dump as part of Status zip support </td>
205,207c208,210
<    <td> <code>sling.log.root</code> </td>
<    <td> Sling Home </td>
<    <td> The directory, which is used to resolve relative path names against. If not specified it would map to sling.home. Since <a href="https://issues.apache.org/jira/browse/SLING-4225">4.0.2</a></td>
---
>       <td><code>sling.log.root</code> </td>
>       <td>Sling Home </td>
>       <td>The directory, which is used to resolve relative path names against. If not specified it would map to sling.home. Since <a href="https://issues.apache.org/jira/browse/SLING-4225">4.0.2</a></td>
211c214
< <h2><a href="#user-configuration-osgi-based" id="user-configuration-osgi-based">User Configuration - OSGi Based</a></h2> 
---
> <h2><a href="#user-configuration-osgi-based" name="user-configuration-osgi-based">User Configuration - OSGi Based</a></h2>
213c216
< <h3><a href="#logger-configuration" id="logger-configuration">Logger Configuration</a></h3> 
---
> <h3><a href="#logger-configuration" name="logger-configuration">Logger Configuration</a></h3>
219,222c222,225
<    <th> Property </th>
<    <th> Type </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Type </th>
>       <th>Default </th>
>       <th>Description </th>
227,230c230,233
<    <td> <code>org.apache.sling.commons.log.level</code> </td>
<    <td> <code>String</code> </td>
<    <td> <code>INFO</code> </td>
<    <td> Sets the logging level of the loggers. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
---
>       <td><code>org.apache.sling.commons.log.level</code> </td>
>       <td><code>String</code> </td>
>       <td><code>INFO</code> </td>
>       <td>Sets the logging level of the loggers. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
233,236c236,239
<    <td> <code>org.apache.sling.commons.log.file</code> </td>
<    <td> <code>String</code> </td>
<    <td> undefined </td>
<    <td> Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. This property should refer to the file name of a configured Log Writer (see below). If no Log Writer is configured with the same file name an implicit Log Writer configuration with default configuration is created. </td>
---
>       <td><code>org.apache.sling.commons.log.file</code> </td>
>       <td><code>String</code> </td>
>       <td>undefined </td>
>       <td>Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. This property should refer to the file name of a configured Log Writer (see below). If no Log Writer is configured with the same file name an implicit Log Writer configuration with default configuration is created. </td>
239,242c242,245
<    <td> <code>org.apache.sling.commons.log.pattern</code> </td>
<    <td> <code>String</code> </td>
<    <td> {0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
<    <td> The <code>java.util.MessageFormat</code> pattern to use for formatting log messages with the root logger. This is a <code>java.util.MessageFormat</code> pattern supporting up to six arguments: {0} The timestamp of type <code>java.util.Date</code>, {1} the log marker, {2} the name of the current thread, {3} the name of the logger, {4} the log level and {5} the actual log message. If the log call includes a Throwable, the stacktrace is just appended to the message regardless of the pattern. </td>
---
>       <td><code>org.apache.sling.commons.log.pattern</code> </td>
>       <td><code>String</code> </td>
>       <td>{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
>       <td>The <code>java.util.MessageFormat</code> pattern to use for formatting log messages with the root logger. This is a <code>java.util.MessageFormat</code> pattern supporting up to six arguments: {0} The timestamp of type <code>java.util.Date</code>, {1} the log marker, {2} the name of the current thread, {3} the name of the logger, {4} the log level and {5} the actual log message. If the log call includes a Throwable, the stacktrace is just appended to the message regardless of the pattern. </td>
245,246c248,249
<    <td> <code>org.apache.sling.commons.log.names</code> </td>
<    <td> <code>String[]</code> </td>
---
>       <td><code>org.apache.sling.commons.log.names</code> </td>
>       <td><code>String[]</code> </td>
248c251
<    <td> A list of logger names to which this configuration applies. </td>
---
>       <td>A list of logger names to which this configuration applies. </td>
251,254c254,257
<    <td> <code>org.apache.sling.commons.log.additiv</code> </td>
<    <td> <code>Boolean</code> </td>
<    <td> false </td>
<    <td> If set to false then logs from these loggers would not be sent to any appender attached higher in the hierarchy </td>
---
>       <td><code>org.apache.sling.commons.log.additiv</code> </td>
>       <td><code>Boolean</code> </td>
>       <td>false </td>
>       <td>If set to false then logs from these loggers would not be sent to any appender attached higher in the hierarchy </td>
259c262
< <h3><a href="#log-writer-configuration" id="log-writer-configuration">Log Writer Configuration</a></h3> 
---
> <h3><a href="#log-writer-configuration" name="log-writer-configuration">Log Writer Configuration</a></h3>
265,267c268,270
<    <th> Property </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default </th>
>       <th>Description </th>
272,274c275,277
<    <td> <code>org.apache.sling.commons.log.file</code> </td>
<    <td> undefined </td>
<    <td> Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
---
>       <td><code>org.apache.sling.commons.log.file</code> </td>
>       <td>undefined </td>
>       <td>Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
277,279c280,282
<    <td> <code>org.apache.sling.commons.log.file.number</code> </td>
<    <td> 5 </td>
<    <td> The number of rotated files to keep. </td>
---
>       <td><code>org.apache.sling.commons.log.file.number</code> </td>
>       <td>5 </td>
>       <td>The number of rotated files to keep. </td>
282,284c285,287
<    <td> <code>org.apache.sling.commons.log.file.size</code> </td>
<    <td> '.'yyyy-MM-dd </td>
<    <td> Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
---
>       <td><code>org.apache.sling.commons.log.file.size</code> </td>
>       <td>'.'yyyy-MM-dd </td>
>       <td>Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
290c293
< <h4><a href="#log-file-rotation" id="log-file-rotation">Log File Rotation</a></h4> 
---
> <h4><a href="#log-file-rotation" name="log-file-rotation">Log File Rotation</a></h4>
292,293c295,296
< <p>As of version 2.0.6 of the Sling Commons Log bundle, the default value for log file scheduling is <code>'.'yyyy-MM-dd</code> causing daily log rotation. In previous version, log rotation defaults to a 10MB file size limit.</p> 
< <h5><a href="#scheduled-rotation" id="scheduled-rotation">Scheduled Rotation</a></h5> 
---
> <p>As of version 2.0.6 of the Sling Commons Log bundle, the default value for log file scheduling is <code>&#39;.&#39;yyyy-MM-dd</code> causing daily log rotation. In previous version, log rotation defaults to a 10MB file size limit.</p>
> <h5><a href="#scheduled-rotation" name="scheduled-rotation">Scheduled Rotation</a></h5>
295c298
< <p>For example, if the log file is configured as <code>/foo/bar.log</code> and the pattern set to <code>'.'yyyy-MM-dd</code>, on 2001-02-16 at midnight, the logging file <code>/foo/bar.log</code> will be renamed to <code>/foo/bar.log.2001-02-16</code> and logging for 2001-02-17 will continue in a new <code>/foo/bar.log</code> file until it rolls over the next day.</p> 
---
> <p>For example, if the log file is configured as <code>/foo/bar.log</code> and the pattern set to <code>&#39;.&#39;yyyy-MM-dd</code>, on 2001-02-16 at midnight, the logging file <code>/foo/bar.log</code> will be renamed to <code>/foo/bar.log.2001-02-16</code> and logging for 2001-02-17 will continue in a new <code>/foo/bar.log</code> file until it rolls over the next day.</p>
300,302c303,305
<    <th> DatePattern </th>
<    <th> Rollover schedule </th>
<    <th> Example </th>
---
>       <th>DatePattern </th>
>       <th>Rollover schedule </th>
>       <th>Example </th>
307,309c310,312
<    <td> <code>'.'yyyy-MM</code> </td>
<    <td> Rollover at the beginning of each month </td>
<    <td> At midnight of May 31st, 2002 <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-05</code>. Logging for the month of June will be output to <code>/foo/bar.log</code> until it is also rolled over the next month. </td>
---
>       <td><code>&#39;.&#39;yyyy-MM</code> </td>
>       <td>Rollover at the beginning of each month </td>
>       <td>At midnight of May 31st, 2002 <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-05</code>. Logging for the month of June will be output to <code>/foo/bar.log</code> until it is also rolled over the next month. </td>
312,314c315,317
<    <td> <code>'.'yyyy-ww</code> </td>
<    <td> Rollover at the first day of each week. The first day of the week depends on the locale. </td>
<    <td> Assuming the first day of the week is Sunday, on Saturday midnight, June 9th 2002, the file <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-23</code>. Logging for the 24th week of 2002 will be output to <code>/foo/bar.log</code> until it is rolled over the next week. </td>
---
>       <td><code>&#39;.&#39;yyyy-ww</code> </td>
>       <td>Rollover at the first day of each week. The first day of the week depends on the locale. </td>
>       <td>Assuming the first day of the week is Sunday, on Saturday midnight, June 9th 2002, the file <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-23</code>. Logging for the 24th week of 2002 will be output to <code>/foo/bar.log</code> until it is rolled over the next week. </td>
317,319c320,322
<    <td> <code>'.'yyyy-MM-dd</code> </td>
<    <td> Rollover at midnight each day.</td>
<    <td> At midnight, on March 8th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-08</code>. Logging for the 9th day of March will be output to <code>/foo/bar.log</code> until it is rolled over the next day.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd</code> </td>
>       <td>Rollover at midnight each day.</td>
>       <td>At midnight, on March 8th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-08</code>. Logging for the 9th day of March will be output to <code>/foo/bar.log</code> until it is rolled over the next day.</td>
322,324c325,327
<    <td> <code>'.'yyyy-MM-dd-a</code> </td>
<    <td> Rollover at midnight and midday of each day.</td>
<    <td> at noon, on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-AM</code>. Logging for the afternoon of the 9th will be output to <code>/foo/bar.log</code> until it is rolled over at midnight.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd-a</code> </td>
>       <td>Rollover at midnight and midday of each day.</td>
>       <td>at noon, on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-AM</code>. Logging for the afternoon of the 9th will be output to <code>/foo/bar.log</code> until it is rolled over at midnight.</td>
327,329c330,332
<    <td> <code>'.'yyyy-MM-dd-HH</code> </td>
<    <td> Rollover at the top of every hour.</td>
<    <td> At approximately 11:00.000 o'clock on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-10</code>. Logging for the 11th hour of the 9th of March will be output to <code>/foo/bar.log</code> until it is rolled over at the beginning of the next hour.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd-HH</code> </td>
>       <td>Rollover at the top of every hour.</td>
>       <td>At approximately 11:00.000 o'clock on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-10</code>. Logging for the 11th hour of the 9th of March will be output to <code>/foo/bar.log</code> until it is rolled over at the beginning of the next hour.</td>
332,334c335,337
<    <td> <code>'.'yyyy-MM-dd-HH-mm</code> </td>
<    <td> Rollover at the beginning of every minute.</td>
<    <td> At approximately 11:23,000, on March 9th, 2001, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2001-03-09-10-22</code>. Logging for the minute of 11:23 (9th of March) will be output to <code>/foo/bar.log</code> until it is rolled over the next minute.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd-HH-mm</code> </td>
>       <td>Rollover at the beginning of every minute.</td>
>       <td>At approximately 11:23,000, on March 9th, 2001, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2001-03-09-10-22</code>. Logging for the minute of 11:23 (9th of March) will be output to <code>/foo/bar.log</code> until it is rolled over the next minute.</td>
339,340c342,343
< <p>Note that when using Scheduled Rotation purging of old log files can be disabled by setting the property <code>org.apache.sling.commons.log.file.number</code> to '0'.</p> 
< <h5><a href="#size-rotation" id="size-rotation">Size Rotation</a></h5> 
---
> <p>Note that when using Scheduled Rotation purging of old log files  can be disabled by setting the property <code>org.apache.sling.commons.log.file.number</code> to '0'. </p>
> <h5><a href="#size-rotation" name="size-rotation">Size Rotation</a></h5>
343c346
< <h2><a href="#logback-integration" id="logback-integration">Logback Integration</a></h2> 
---
> <h2><a href="#logback-integration" name="logback-integration">Logback Integration</a></h2>
354c357
< <h3><a href="#turbofilters-as-osgi-services" id="turbofilters-as-osgi-services">TurboFilters as OSGi Services</a></h3> 
---
> <h3><a href="#turbofilters-as-osgi-services" name="turbofilters-as-osgi-services">TurboFilters as OSGi Services</a></h3>
365c368
<         if(logger.getName().equals("turbofilter.foo.bar")){
---
>         if(logger.getName().equals(&quot;turbofilter.foo.bar&quot;)){
373c376
< <h3><a href="#filters-as-osgi-services" id="filters-as-osgi-services">Filters as OSGi services</a></h3> 
---
> <h3><a href="#filters-as-osgi-services" name="filters-as-osgi-services">Filters as OSGi services</a></h3>
379c382
< props.put("appenders", "TestAppender");
---
> props.put(&quot;appenders&quot;, &quot;TestAppender&quot;);
386c389
<         if(event.getLoggerName().equals("filter.foo.bar")){
---
>         if(event.getLoggerName().equals(&quot;filter.foo.bar&quot;)){
394c397
< <h3><a href="#appenders-as-osgi-services" id="appenders-as-osgi-services">Appenders as OSGi services</a></h3> 
---
> <h3><a href="#appenders-as-osgi-services" name="appenders-as-osgi-services">Appenders as OSGi services</a></h3>
399,400c402,403
<         "foo.bar:DEBUG",
<         "foo.bar.zoo:INFO",
---
>         &quot;foo.bar:DEBUG&quot;,
>         &quot;foo.bar.zoo:INFO&quot;,
403c406
< props.put("loggers",loggers);
---
> props.put(&quot;loggers&quot;,loggers);
406c409
< <h3><a href="#logback-config-fragment-support" id="logback-config-fragment-support">Logback Config Fragment Support</a></h3> 
---
> <h3><a href="#logback-config-fragment-support" name="logback-config-fragment-support">Logback Config Fragment Support</a></h3>
408c411
< <h4><a href="#logback-config-fragments-as-string-objects" id="logback-config-fragments-as-string-objects">Logback config fragments as String objects</a></h4> 
---
> <h4><a href="#logback-config-fragments-as-string-objects" name="logback-config-fragments-as-string-objects">Logback config fragments as String objects</a></h4>
411c414
< props.setProperty("logbackConfig","true");
---
> props.setProperty(&quot;logbackConfig&quot;,&quot;true&quot;);
413,425c416,428
< String config = "&lt;included&gt;\n" +
<         "  &lt;appender name=\"FOOFILE\" class=\"ch.qos.logback.core.FileAppender\"&gt;\n" +
<         "    &lt;file&gt;${sling.home}/logs/foo.log&lt;/file&gt;\n" +
<         "    &lt;encoder&gt;\n" +
<         "      &lt;pattern&gt;%d %-5level %logger{35} - %msg %n&lt;/pattern&gt;\n" +
<         "    &lt;/encoder&gt;\n" +
<         "  &lt;/appender&gt;\n" +
<         "\n" +
<         "  &lt;logger name=\"foo.bar.include\" level=\"INFO\"&gt;\n" +
<         "       &lt;appender-ref ref=\"FOOFILE\" /&gt;\n" +
<         "  &lt;/logger&gt;\n" +
<         "\n" +
<         "&lt;/included&gt;";
---
> String config = &quot;&lt;included&gt;\n&quot; +
>         &quot;  &lt;appender name=\&quot;FOOFILE\&quot; class=\&quot;ch.qos.logback.core.FileAppender\&quot;&gt;\n&quot; +
>         &quot;    &lt;file&gt;${sling.home}/logs/foo.log&lt;/file&gt;\n&quot; +
>         &quot;    &lt;encoder&gt;\n&quot; +
>         &quot;      &lt;pattern&gt;%d %-5level %logger{35} - %msg %n&lt;/pattern&gt;\n&quot; +
>         &quot;    &lt;/encoder&gt;\n&quot; +
>         &quot;  &lt;/appender&gt;\n&quot; +
>         &quot;\n&quot; +
>         &quot;  &lt;logger name=\&quot;foo.bar.include\&quot; level=\&quot;INFO\&quot;&gt;\n&quot; +
>         &quot;       &lt;appender-ref ref=\&quot;FOOFILE\&quot; /&gt;\n&quot; +
>         &quot;  &lt;/logger&gt;\n&quot; +
>         &quot;\n&quot; +
>         &quot;&lt;/included&gt;&quot;;
430c433
< <h4><a href="#logback-config-fragments-as-configprovider-instances" id="logback-config-fragments-as-configprovider-instances">Logback config fragments as ConfigProvider instances</a></h4> 
---
> <h4><a href="#logback-config-fragments-as-configprovider-instances" name="logback-config-fragments-as-configprovider-instances">Logback config fragments as ConfigProvider instances</a></h4>
436c439
<         return new InputSource(getClass().getClassLoader().getResourceAsStream("foo-config.xml"));
---
>         return new InputSource(getClass().getClassLoader().getResourceAsStream(&quot;foo-config.xml&quot;));
441c444
< <pre><code><!-- TODO syntax marker (::java) disabled -->eventAdmin.sendEvent(new Event("org/apache/sling/commons/log/RESET",new Properties()));
---
> <pre><code><!-- TODO syntax marker (::java) disabled -->eventAdmin.sendEvent(new Event(&quot;org/apache/sling/commons/log/RESET&quot;,new Properties()));
443c446
< <h3><a href="#external-config-file" id="external-config-file">External Config File</a></h3> 
---
> <h3><a href="#external-config-file" name="external-config-file">External Config File</a></h3>
450,453c453,456
< <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;newRule pattern="*/configuration/osgi"
<          actionClass="org.apache.sling.commons.log.logback.OsgiAction"/&gt;
< &lt;newRule pattern="*/configuration/appender-ref-osgi"
<          actionClass="org.apache.sling.commons.log.logback.OsgiAppenderRefAction"/&gt;
---
> <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;newRule pattern=&quot;*/configuration/osgi&quot;
>          actionClass=&quot;org.apache.sling.commons.log.logback.OsgiAction&quot;/&gt;
> &lt;newRule pattern=&quot;*/configuration/appender-ref-osgi&quot;
>          actionClass=&quot;org.apache.sling.commons.log.logback.OsgiAppenderRefAction&quot;/&gt;
457c460
< <h3><a href="#java-util-logging-jul-integration" id="java-util-logging-jul-integration">Java Util Logging (JUL) Integration</a></h3> 
---
> <h3><a href="#java-util-logging-jul-integration" name="java-util-logging-jul-integration">Java Util Logging (JUL) Integration</a></h3>
462,463c465,466
< <p>If <code>org.apache.sling.commons.log.julenabled</code> is found to be true then <a href="http://logback.qos.ch/manual/configuration.html#LevelChangePropagator">LevelChangePropagator</a> would be registered automatically with Logback</p> 
< <h3><a href="#configuring-osgi-appenders-in-the-logback-config" id="configuring-osgi-appenders-in-the-logback-config"></a><a name="config-override"></a>Configuring OSGi appenders in the Logback Config</h3> 
---
> <p>If <code>org.apache.sling.commons.log.julenabled</code> is found to be true then <a href="http://logback.qos.ch/manual/configuration.html#LevelChangePropagator">LevelChangePropagator</a> would be registered automatically with Logback </p>
> <h3><a name="config-override"></a>Configuring OSGi appenders in the Logback Config</h3>
466,470c469,473
< <pre><code>org.apache.sling.commons.log.file="logs/error.log"
< org.apache.sling.commons.log.level="INFO"
< org.apache.sling.commons.log.file.size="'.'yyyy-MM-dd"
< org.apache.sling.commons.log.file.number=I"7"
< org.apache.sling.commons.log.pattern="{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* [{2}] {3} {5}"
---
> <pre><code>org.apache.sling.commons.log.file=&quot;logs/error.log&quot;
> org.apache.sling.commons.log.level=&quot;INFO&quot;
> org.apache.sling.commons.log.file.size=&quot;&#39;.&#39;yyyy-MM-dd&quot;
> org.apache.sling.commons.log.file.number=I&quot;7&quot;
> org.apache.sling.commons.log.pattern=&quot;{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* [{2}] {3} {5}&quot;
473c476
< <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;appender name="/logs/error.log" class="ch.qos.logback.core.FileAppender"&gt;
---
> <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;appender name=&quot;/logs/error.log&quot; class=&quot;ch.qos.logback.core.FileAppender&quot;&gt;
482,483c485,486
< <h2><a href="#using-slf4j-api-17" id="using-slf4j-api-17">Using Slf4j API 1.7</a></h2> 
< <p>With Slf4j API 1.7 onwards its possible to use logger methods with varargs i.e. log n arguments without constructing an object array e.g. <code>log.info("This is a test {} , {}, {}, {}",1,2,3,4)</code>. Without var args you need to construct an object array <code>log.info("This is a test {} , {}, {}, {}",new Object[] {1,2,3,4})</code>. To make use of this API and still be able to use your bundle on Sling systems which package older version of the API jar, follow the below steps. (See <a href="https://issues.apache.org/jira/browse/SLING-3243">SLING-3243</a>) for more details.</p> 
---
> <h2><a href="#using-slf4j-api-1-7" name="using-slf4j-api-1-7">Using Slf4j API 1.7</a></h2>
> <p>With Slf4j API 1.7 onwards its possible to use logger methods with varargs i.e. log n arguments without constructing an object array e.g. <code>log.info(&quot;This is a test {} , {}, {}, {}&quot;,1,2,3,4)</code>. Without var args you need to construct an object array <code>log.info(&quot;This is a test {} , {}, {}, {}&quot;,new Object[] {1,2,3,4})</code>. To make use of this API and still be able to use your bundle on Sling systems which package older version of the API jar, follow the below steps. (See <a href="https://issues.apache.org/jira/browse/SLING-3243">SLING-3243</a>) for more details.</p>
485c488,490
<  <li> <p>Update the api version in the pom:</p> <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;dependencies&gt;
---
>   <li>
>     <p>Update the api version in the pom:</p>
>     <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;dependencies&gt;
494,495c499,503
< </code></pre> </li> 
<  <li> <p>Add an <code>Import-Package</code> instruction with a custom version range:</p> <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;build&gt;
---
> </code></pre>
>   </li>
>   <li>
>     <p>Add an <code>Import-Package</code> instruction with a custom version range: </p>
>     <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;build&gt;
505c513
<               org.slf4j;version="[1.5,2)",
---
>               org.slf4j;version=&quot;[1.5,2)&quot;,
514c522,523
< </code></pre> </li> 
---
> </code></pre>
>   </li>
518c527
< <h2><a href="#log-tracer" id="log-tracer">Log Tracer</a></h2> 
---
> <h2><a href="#log-tracer" name="log-tracer">Log Tracer</a></h2>
521c530
< <h2><a href="#slf4j-mdc" id="slf4j-mdc">Slf4j MDC</a></h2> 
---
> <h2><a href="#slf4j-mdc" name="slf4j-mdc">Slf4j MDC</a></h2>
535,539c544,547
< <p><img src="http://sling.apache.org//documentation/bundles/mdc-filter-config.png" alt="MDC Filter Config"></p> 
< <p><a name="mdc-pattern"></a></p>
< <a name="mdc-pattern"> </a>
< <h3><a name="mdc-pattern"></a><a href="#including-mdc-in-log-message" id="including-mdc-in-log-message">Including MDC in Log Message</a></h3> 
< <p>To include the MDC value in log message you MUST use the <a href="http://logback.qos.ch/manual/layouts.html#conversionWord">Logback pattern</a> based on Logback and not the old MessageFormat based pattern.</p> 
---
> <p><img src="/documentation/bundles/mdc-filter-config.png" alt="MDC Filter Config" /></p>
> <a name="mdc-pattern">
> <h3><a href="#including-mdc-in-log-message" name="including-mdc-in-log-message">Including MDC in Log Message</a></h3>
> <p>To include the MDC value in log message you MUST use the <a href="http://logback.qos.ch/manual/layouts.html#conversionWord">Logback pattern</a> based on Logback and not the old MessageFormat based pattern. </p>
542c550
< <h3><a href="#installation" id="installation">Installation</a></h3> 
---
> <h3><a href="#installation" name="installation">Installation</a></h3>
550c558
< <h2><a href="#logback-groovy-fragment" id="logback-groovy-fragment">Logback Groovy Fragment</a></h2> 
---
> <h2><a href="#logback-groovy-fragment" name="logback-groovy-fragment">Logback Groovy Fragment</a></h2>
552,553c560,561
< <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;?xml version="1.0" encoding="UTF-8"?&gt;
< &lt;configuration scan="true" scanPeriod="1 second"&gt;
---
> <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
> &lt;configuration scan=&quot;true&quot; scanPeriod=&quot;1 second&quot;&gt;
555,556c563,564
<   &lt;newRule pattern="*/configuration/osgi" actionClass="org.apache.sling.commons.log.logback.OsgiAction"/&gt;
<   &lt;newRule pattern="*/configuration/appender-ref-osgi" actionClass="org.apache.sling.commons.log.logback.OsgiAppenderRefAction"/&gt;
---
>   &lt;newRule pattern=&quot;*/configuration/osgi&quot; actionClass=&quot;org.apache.sling.commons.log.logback.OsgiAction&quot;/&gt;
>   &lt;newRule pattern=&quot;*/configuration/appender-ref-osgi&quot; actionClass=&quot;org.apache.sling.commons.log.logback.OsgiAppenderRefAction&quot;/&gt;
559,561c567,569
<    &lt;appender name="OAK" class="ch.qos.logback.core.FileAppender"&gt;
<     &lt;filter class="ch.qos.logback.core.filter.EvaluatorFilter"&gt;      
<       &lt;evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator"&gt; 
---
>    &lt;appender name=&quot;OAK&quot; class=&quot;ch.qos.logback.core.FileAppender&quot;&gt;
>     &lt;filter class=&quot;ch.qos.logback.core.filter.EvaluatorFilter&quot;&gt;      
>       &lt;evaluator class=&quot;ch.qos.logback.classic.boolex.GEventEvaluator&quot;&gt; 
563c571
<             return e.getThreadName().contains("JobHandler");
---
>             return e.getThreadName().contains(&quot;JobHandler&quot;);
576,577c584,585
<   &lt;logger name="org.apache.jackrabbit.oak.jcr.operations" level="DEBUG" additivity="false"&gt;
<       &lt;appender-ref ref="OAK"/&gt;
---
>   &lt;logger name=&quot;org.apache.jackrabbit.oak.jcr.operations&quot; level=&quot;DEBUG&quot; additivity=&quot;false&quot;&gt;
>       &lt;appender-ref ref=&quot;OAK&quot;/&gt;
582c590
< <h3><a href="#installation" id="installation">Installation</a></h3> 
---
> <h3><a href="#installation" name="installation">Installation</a></h3>
590,591c598,599
< <h2><a href="#faq" id="faq">FAQ</a></h2> 
< <h5><a href="#q-can-sling-commons-log-bundle-be-used-in-non-sling-environments" id="q-can-sling-commons-log-bundle-be-used-in-non-sling-environments">Q. Can Sling Commons Log bundle be used in non Sling environments</a></h5> 
---
> <h2><a href="#faq" name="faq">FAQ</a></h2>
> <h5><a href="#q-can-sling-commons-log-bundle-be-used-in-non-sling-environments" name="q-can-sling-commons-log-bundle-be-used-in-non-sling-environments">Q. Can Sling Commons Log bundle be used in non Sling environments</a></h5>
601c609
< <h5><a href="#q-how-to-start-sling-with-an-external-logbackxml-file" id="q-how-to-start-sling-with-an-external-logbackxml-file">Q. How to start Sling with an external logback.xml file</a></h5> 
---
> <h5><a href="#q-how-to-start-sling-with-an-external-logback-xml-file" name="q-how-to-start-sling-with-an-external-logback-xml-file">Q. How to start Sling with an external logback.xml file</a></h5>
diff -b -B -r ./documentation/development/maven-archetypes.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/maven-archetypes.html
97c97
< <h3><a href="#sling-launchpad-standalone-archetype" id="sling-launchpad-standalone-archetype">sling-launchpad-standalone-archetype</a></h3> 
---
> <h3><a href="#sling-launchpad-standalone-archetype" name="sling-launchpad-standalone-archetype">sling-launchpad-standalone-archetype</a></h3>
99c99
< <h3><a href="#sling-launchpad-webapp-archetype" id="sling-launchpad-webapp-archetype">sling-launchpad-webapp-archetype</a></h3> 
---
> <h3><a href="#sling-launchpad-webapp-archetype" name="sling-launchpad-webapp-archetype">sling-launchpad-webapp-archetype</a></h3>
101c101
< <h3><a href="#sling-initial-content-archetype" id="sling-initial-content-archetype">sling-initial-content-archetype</a></h3> 
---
> <h3><a href="#sling-initial-content-archetype" name="sling-initial-content-archetype">sling-initial-content-archetype</a></h3>
103c103
< <h3><a href="#sling-servlet-archetype" id="sling-servlet-archetype">sling-servlet-archetype</a></h3> 
---
> <h3><a href="#sling-servlet-archetype" name="sling-servlet-archetype">sling-servlet-archetype</a></h3>
105c105
< <h3><a href="#sling-bundle-archetype" id="sling-bundle-archetype">sling-bundle-archetype</a></h3> 
---
> <h3><a href="#sling-bundle-archetype" name="sling-bundle-archetype">sling-bundle-archetype</a></h3>
107c107
< <h3><a href="#sling-jcrinstall-bundle-archetype" id="sling-jcrinstall-bundle-archetype">sling-jcrinstall-bundle-archetype</a></h3> 
---
> <h3><a href="#sling-jcrinstall-bundle-archetype" name="sling-jcrinstall-bundle-archetype">sling-jcrinstall-bundle-archetype</a></h3>
diff -b -B -r ./documentation/development/maven-launchpad-plugin.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/maven-launchpad-plugin.html
97,98c97
<   The launchpad plugin has been retired in favour of the provisioning model and associated tooling, see 
<  <a href="http://sling.apache.org/documentation/development/slingstart.html">the provisioning model documentation</a>. 
---
> The launchpad plugin has been retired in favour of the provisioning model and associated tooling, see <a href="http://sling.apache.org/documentation/development/slingstart.html">the provisioning model documentation</a>.
111c110
< <p>Maven Launchpad Plugin provides the following goals:</p> 
---
> <p>Maven Launchpad Plugin provides the following goals: </p>
115,116c114,115
<    <th> Goals </th>
<    <th> Description </th>
---
>       <th>Goals </th>
>       <th>Description </th>
121,122c120,121
<    <td> launchpad:prepare-package </td>
<    <td> Create the file system structure required by Sling's Launchpad framework. </td>
---
>       <td>launchpad:prepare-package </td>
>       <td>Create the file system structure required by Sling's Launchpad framework. </td>
125,126c124,125
<    <td> launchpad:attach-bundle-list </td>
<    <td> Attach the bundle list descriptor to the current project as a Maven artifact. </td>
---
>       <td>launchpad:attach-bundle-list </td>
>       <td>Attach the bundle list descriptor to the current project as a Maven artifact. </td>
129,130c128,129
<    <td> launchpad:create-karaf-descriptor </td>
<    <td> Create an Apache Karaf Feature descriptor. </td>
---
>       <td>launchpad:create-karaf-descriptor </td>
>       <td>Create an Apache Karaf Feature descriptor. </td>
133,134c132,133
<    <td> launchpad:create-bundle-jar </td>
<    <td> Create a JAR file containing the bundles in a Launchpad-structured JAR file. </td>
---
>       <td>launchpad:create-bundle-jar </td>
>       <td>Create a JAR file containing the bundles in a Launchpad-structured JAR file. </td>
137,138c136,137
<    <td> launchpad:check-bundle-list-for-snapshots </td>
<    <td> Validate that the bundle list does not contain any SNAPSHOT versions. </td>
---
>       <td>launchpad:check-bundle-list-for-snapshots </td>
>       <td>Validate that the bundle list does not contain any SNAPSHOT versions. </td>
141,142c140,141
<    <td> launchpad:run </td>
<    <td> Run a Launchpad application. </td>
---
>       <td>launchpad:run </td>
>       <td>Run a Launchpad application. </td>
145,146c144,145
<    <td> launchpad:start </td>
<    <td> Start a Launchpad application. </td>
---
>       <td>launchpad:start </td>
>       <td>Start a Launchpad application. </td>
149,150c148,149
<    <td> launchpad:stop </td>
<    <td> Stop a Launchpad application. </td>
---
>       <td>launchpad:stop </td>
>       <td>Stop a Launchpad application. </td>
153,154c152,153
<    <td> launchpad:output-bundle-list </td>
<    <td> Output the bundle list to the console as XML. (added in version 2.0.8) </td>
---
>       <td>launchpad:output-bundle-list </td>
>       <td>Output the bundle list to the console as XML. (added in version 2.0.8) </td>
158c157
< <h3><a href="#general-configuration" id="general-configuration">General Configuration</a></h3> 
---
> <h3><a href="#general-configuration" name="general-configuration">General Configuration</a></h3>
169c168
< <h3><a href="#framework-configuration" id="framework-configuration">Framework Configuration</a></h3> 
---
> <h3><a href="#framework-configuration" name="framework-configuration">Framework Configuration</a></h3>
173c172
< <h2><a href="#bundle-list-files" id="bundle-list-files">Bundle List Files</a></h2> 
---
> <h2><a href="#bundle-list-files" name="bundle-list-files">Bundle List Files</a></h2>
175c174
< <pre><code>&lt;?xml version="1.0"?&gt;
---
> <pre><code>&lt;?xml version=&quot;1.0&quot;?&gt;
177c176
<     &lt;startLevel level="0"&gt;
---
>     &lt;startLevel level=&quot;0&quot;&gt;
190c189
<     &lt;startLevel level="10"&gt;
---
>     &lt;startLevel level=&quot;10&quot;&gt;
198c197
<     &lt;startLevel level="15"&gt;
---
>     &lt;startLevel level=&quot;15&quot;&gt;
209c208
< <h2><a href="#artifact-definition" id="artifact-definition">Artifact Definition</a></h2> 
---
> <h2><a href="#artifact-definition" name="artifact-definition">Artifact Definition</a></h2>
249c248
< <h2><a href="#integration-testing" id="integration-testing">Integration Testing</a></h2> 
---
> <h2><a href="#integration-testing" name="integration-testing">Integration Testing</a></h2>
251c250
< <h2><a href="#bundle-list-rewriting" id="bundle-list-rewriting">Bundle List Rewriting</a></h2> 
---
> <h2><a href="#bundle-list-rewriting" name="bundle-list-rewriting">Bundle List Rewriting</a></h2>
diff -b -B -r ./documentation/development/maven-usage.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/maven-usage.html
97c97
< <h2><a href="#parent-pom" id="parent-pom">Parent POM</a></h2> 
---
> <h2><a href="#parent-pom" name="parent-pom">Parent POM</a></h2>
108c108
< <h2><a href="#java-version" id="java-version">Java version</a></h2> 
---
> <h2><a href="#java-version" name="java-version">Java version</a></h2>
115c115
< <h2><a href="#dependency-management" id="dependency-management">Dependency management</a></h2> 
---
> <h2><a href="#dependency-management" name="dependency-management">Dependency management</a></h2>
diff -b -B -r ./documentation/development/maventipsandtricks.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/maventipsandtricks.html
97c97
< <h1><a href="#maven-local-repository" id="maven-local-repository">Maven local repository</a></h1> 
---
> <h1><a href="#maven-local-repository" name="maven-local-repository">Maven local repository</a></h1>
102,103c102,103
< <h1><a href="#maven-settings" id="maven-settings">Maven settings</a></h1> 
< <h2><a href="#ignore-your-local-settings" id="ignore-your-local-settings">Ignore your local settings</a></h2> 
---
> <h1><a href="#maven-settings" name="maven-settings">Maven settings</a></h1>
> <h2><a href="#ignore-your-local-settings" name="ignore-your-local-settings">Ignore your local settings</a></h2>
110c110
<   Does anyone have a similar command-line option that works under Windows? 
---
> Does anyone have a similar command-line option that works under Windows?
112c112
< <h1><a href="#maven-opts" id="maven-opts">MAVEN_OPTS</a></h1> 
---
> <h1>MAVEN_OPTS</h1>
115c115
< <h2><a href="#increase-jvm-memory-if-needed" id="increase-jvm-memory-if-needed">Increase JVM memory if needed</a></h2> 
---
> <h2><a href="#increase-jvm-memory-if-needed" name="increase-jvm-memory-if-needed">Increase JVM memory if needed</a></h2>
117c117
< <pre><code>MAVEN_OPTS="-Xmx256M -XX:MaxPermSize=256m"
---
> <pre><code>MAVEN_OPTS=&quot;-Xmx256M -XX:MaxPermSize=256m&quot;
120c120
< <h2><a href="#debugging-code-launched-by-maven" id="debugging-code-launched-by-maven">Debugging code launched by Maven</a></h2> 
---
> <h2><a href="#debugging-code-launched-by-maven" name="debugging-code-launched-by-maven">Debugging code launched by Maven</a></h2>
122c122
< <pre><code>MAVEN_OPTS="-agentlib:jdwp=transport=dt_socket,address=30303,server=y,suspend=n"
---
> <pre><code>MAVEN_OPTS=&quot;-agentlib:jdwp=transport=dt_socket,address=30303,server=y,suspend=n&quot;
125c125
< <h2><a href="#avoid-spaces-in-maven-repository-and-workspace-paths" id="avoid-spaces-in-maven-repository-and-workspace-paths">Avoid spaces in Maven repository and workspace paths</a></h2> 
---
> <h2><a href="#avoid-spaces-in-maven-repository-and-workspace-paths" name="avoid-spaces-in-maven-repository-and-workspace-paths">Avoid spaces in Maven repository and workspace paths</a></h2>
diff -b -B -r ./documentation/development/monitoring-requests.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/monitoring-requests.html
100c100
< <p><img src="http://sling.apache.org/sling-requests-plugin.jpg" alt=""></p></section></div></div>            
---
> <p><img src="sling-requests-plugin.jpg" /></p></section></div></div>            
diff -b -B -r ./documentation/development/osgi-mock.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/osgi-mock.html
103c103
< <h2><a href="#maven-dependency" id="maven-dependency">Maven Dependency</a></h2> 
---
> <h2><a href="#maven-dependency" name="maven-dependency">Maven Dependency</a></h2>
115c115
< <h2><a href="#implemented-mock-features" id="implemented-mock-features">Implemented mock features</a></h2> 
---
> <h2><a href="#implemented-mock-features" name="implemented-mock-features">Implemented mock features</a></h2>
134,135c134,135
< <h2><a href="#usage" id="usage">Usage</a></h2> 
< <h3><a href="#osgi-context-junit-rule" id="osgi-context-junit-rule">OSGi Context JUnit Rule</a></h3> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
> <h3><a href="#osgi-context-junit-rule" name="osgi-context-junit-rule">OSGi Context JUnit Rule</a></h3>
148c148
<         "prop1", "value1");
---
>         &quot;prop1&quot;, &quot;value1&quot;);
167c167
< <h3><a href="#getting-osgi-mock-objects" id="getting-osgi-mock-objects">Getting OSGi mock objects</a></h3> 
---
> <h3><a href="#getting-osgi-mock-objects" name="getting-osgi-mock-objects">Getting OSGi mock objects</a></h3>
175c175
<     "prop1", "value1");
---
>     &quot;prop1&quot;, &quot;value1&quot;);
185c185
< <h3><a href="#activation-and-dependency-injection" id="activation-and-dependency-injection">Activation and Dependency Injection</a></h3> 
---
> <h3><a href="#activation-and-dependency-injection" name="activation-and-dependency-injection">Activation and Dependency Injection</a></h3>
210c210
< <h3><a href="#provide-your-own-configuration-via-configadmin" id="provide-your-own-configuration-via-configadmin">Provide your own configuration via ConfigAdmin</a></h3> 
---
> <h3><a href="#provide-your-own-configuration-via-configadmin" name="provide-your-own-configuration-via-configadmin">Provide your own configuration via ConfigAdmin</a></h3>
217c217
< props.put("prop1", "value1");
---
> props.put(&quot;prop1&quot;, &quot;value1&quot;);
220c220
< <h3><a href="#context-plugins" id="context-plugins">Context Plugins</a></h3> 
---
> <h3><a href="#context-plugins" name="context-plugins">Context Plugins</a></h3>
224c224
< <p>Example:</p> 
---
> <p>Example: </p>
diff -b -B -r ./documentation/development/release-management.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/release-management.html
100c100
< <h2><a href="#prerequisites" id="prerequisites">Prerequisites</a></h2> 
---
> <h2><a href="#prerequisites" name="prerequisites">Prerequisites</a></h2>
129c129
< <h2><a href="#staging-the-release-candidates" id="staging-the-release-candidates">Staging the Release Candidates</a></h2> 
---
> <h2><a href="#staging-the-release-candidates" name="staging-the-release-candidates">Staging the Release Candidates</a></h2>
133,135c133,140
<  <li>Check that your POMs will not lose content when they are rewritten during the release process <pre><code>$ mvn release:prepare -DdryRun=true
< </code></pre> <p>Compare the original <code>pom.xml</code> with the one called <code>pom.xml.tag</code> to see if the license or any other info has been removed. This has been known to happen if the starting <code>&lt;project&gt;</code> tag is not on a single line. The only things that should be different between these files are the <code>&lt;version&gt;</code> and <code>&lt;scm&gt;</code> elements. If there are any other changes, you must fix the original <code>pom.xml</code> file and commit before proceeding with the release.</p> </li> 
<  <li> <p>Publish a snapshot</p> <pre><code>$ mvn deploy
---
>   <li>Check that your POMs will not lose content when they are rewritten during the release process
>     <pre><code>$ mvn release:prepare -DdryRun=true
> </code></pre>
>     <p>Compare the original <code>pom.xml</code> with the one called <code>pom.xml.tag</code> to see if the license or any other info has been removed. This has been known to happen if the starting <code>&lt;project&gt;</code> tag is not on a single line. The only things that should be different between these files are the <code>&lt;version&gt;</code> and <code>&lt;scm&gt;</code> elements. If there are any other changes, you must fix the original <code>pom.xml</code> file and commit before proceeding with the release.</p>
>   </li>
>   <li>
>     <p>Publish a snapshot</p>
>     <pre><code>$ mvn deploy
146,147c151,155
<   </ul> </li> 
<  <li> <p>Prepare the release</p> <pre><code>$ mvn release:clean
---
>     </ul>
>   </li>
>   <li>
>     <p>Prepare the release</p>
>     <pre><code>$ mvn release:clean
152,153c160,164
<   </ul> </li> 
<  <li> <p>Stage the release for a vote</p> <pre><code>$ mvn release:perform
---
>     </ul>
>   </li>
>   <li>
>     <p>Stage the release for a vote</p>
>     <pre><code>$ mvn release:perform
158,159c169,172
<   </ul> </li> 
<  <li> <p>Close the staging repository:</p> 
---
>     </ul>
>   </li>
>   <li>
>     <p>Close the staging repository:</p>
162,163c175,178
<   </ul> </li> 
<  <li> <p>Verify the staged artifacts</p> 
---
>     </ul>
>   </li>
>   <li>
>     <p>Verify the staged artifacts</p>
167c182,183
<   </ul> </li> 
---
>     </ul>
>   </li>
169c185
< <h2><a href="#starting-the-vote" id="starting-the-vote">Starting the Vote</a></h2> 
---
> <h2><a href="#starting-the-vote" name="starting-the-vote">Starting the Vote</a></h2>
171c187
< <pre><code>To: "Sling Developers List" &lt;dev@sling.apache.org&gt;
---
> <pre><code>To: &quot;Sling Developers List&quot; &lt;dev@sling.apache.org&gt;
194,195c210,211
<   [ ]  0 Don't care
<   [ ] -1 Don't release, because ...
---
>   [ ]  0 Don&#39;t care
>   [ ] -1 Don&#39;t release, because ...
199c215
< <h2><a href="#wait-for-the-results" id="wait-for-the-results">Wait for the Results</a></h2> 
---
> <h2><a href="#wait-for-the-results" name="wait-for-the-results">Wait for the Results</a></h2>
206c222
< <pre><code>To: "Sling Developers List" &lt;dev@sling.apache.org&gt;
---
> <pre><code>To: &quot;Sling Developers List&quot; &lt;dev@sling.apache.org&gt;
222c238
< <h2><a href="#canceling-the-release" id="canceling-the-release">Canceling the Release</a></h2> 
---
> <h2><a href="#canceling-the-release" name="canceling-the-release">Canceling the Release</a></h2>
232c248,249
<   </ol> </li> 
---
>     </ol>
>   </li>
237c254,255
<   </ol> </li> 
---
>     </ol>
>   </li>
240c258
< <h2><a href="#promoting-the-release" id="promoting-the-release">Promoting the Release</a></h2> 
---
> <h2><a href="#promoting-the-release" name="promoting-the-release">Promoting the Release</a></h2>
245c263
<    <li>Commit the released artifacts to <a href="https://dist.apache.org/repos/dist/release/sling/">https://dist.apache.org/repos/dist/release/sling/</a> which is replicated to <a href="http://www.apache.org/dist/sling/">http://www.apache.org/dist/sling/</a> quickly via svnpubsub. Hint: use svn import to avoid having to checkout the whole folder first. The easiest to do this is to get the released artifact using the check script (check_staged_release.sh) and then simply copy the artifacts from the downloaded folder to your local checkout folder. Make sure to not add the checksum files for the signature file *.asc.*). 
---
>       <li>Commit the released artifacts to <a href="https://dist.apache.org/repos/dist/release/sling/">https://dist.apache.org/repos/dist/release/sling/</a> which is replicated to <a href="http://www.apache.org/dist/sling/">http://www.apache.org/dist/sling/</a> quickly via svnpubsub. Hint: use svn import to avoid having to checkout the whole folder first. The easiest to do this is to get the released artifact using the check script (check&#95;staged&#95;release.sh) and then simply copy the artifacts from the downloaded folder to your local checkout folder. Make sure to not add the checksum files for the signature file *.asc.*).
249c267,268
<     </ul> </li> 
---
>         </ul>
>       </li>
251c270,271
<   </ol> </li> 
---
>     </ol>
>   </li>
256c276,277
<   </ol> </li> 
---
>     </ol>
>   </li>
262c283
< <h2><a href="#update-jira" id="update-jira">Update JIRA</a></h2> 
---
> <h2><a href="#update-jira" name="update-jira">Update JIRA</a></h2>
267c288
< <h2><a href="#update-the-sling-starter-fka-launchpad" id="update-the-sling-starter-fka-launchpad">Update the Sling Starter (fka Launchpad)</a></h2> 
---
> <h2><a href="#update-the-sling-starter-fka-launchpad-" name="update-the-sling-starter-fka-launchpad-">Update the Sling Starter (fka Launchpad)</a></h2>
269c290
< <h2><a href="#create-an-announcement" id="create-an-announcement">Create an Announcement</a></h2> 
---
> <h2><a href="#create-an-announcement" name="create-an-announcement">Create an Announcement</a></h2>
271c292
< <pre><code>To: "Sling Developers List" &lt;dev@sling.apache.org&gt;, "Apache Announcements" &lt;announce@apache.org&gt;
---
> <pre><code>To: &quot;Sling Developers List&quot; &lt;dev@sling.apache.org&gt;, &quot;Apache Announcements&quot; &lt;announce@apache.org&gt;
302c323
< <h2><a href="#related-links" id="related-links">Related Links</a></h2> 
---
> <h2><a href="#related-links" name="related-links">Related Links</a></h2>
307,310c328,331
< <h2><a href="#releasing-the-sling-ide-tooling" id="releasing-the-sling-ide-tooling">Releasing the Sling IDE Tooling</a></h2> 
< <div class="note">
<  Eclipse is very aggresive about caching artifacts with the same coordinates. Make sure that once you build the artifacts with code signing enabled you install the right ones. If you install artifacts with the same version but not signed, Eclipse will cache that version indefinitely with no known workaround except setting up a new installation of Eclipse.
< </div> 
---
> <h2><a href="#releasing-the-sling-ide-tooling" name="releasing-the-sling-ide-tooling">Releasing the Sling IDE Tooling</a></h2>
> <div class="note">Eclipse is very aggresive about caching artifacts with the same coordinates. Make sure that once you build the artifacts 
> with code signing enabled you install the right ones. If you install artifacts with the same version but not signed, Eclipse will cache
> that version indefinitely with no known workaround except setting up a new installation of Eclipse.</div>
312,316c333,334
< <div class="note">
<  While we sort out a proper location you will need to locally build install the 
<  <tt>codesign-maven-plugin</tt> from 
<  <a href="https://github.com/apache/sling-whiteboard/tree/master/codesign">https://github.com/apache/sling-whiteboard/tree/master/codesign</a>.
< </div> 
---
> <div class="note">While we sort out a proper location you will need to locally build install the <tt>codesign-maven-plugin</tt> from
> <a href="https://github.com/apache/sling-whiteboard/tree/master/codesign">https://github.com/apache/sling-whiteboard/tree/master/codesign</a>.</div>
322c340
<  <li>Tag the commit using <code>git tag -a -m 'Tag 1.0.2 release' sling-ide-tooling-1.0.2</code></li> 
---
>   <li>Tag the commit using <code>git tag -a -m &#39;Tag 1.0.2 release&#39; sling-ide-tooling-1.0.2</code></li>
334c352,353
<   </ol> </li> 
---
>     </ol>
>   </li>
339c358
< <pre><code>To: "Sling Developers List" &lt;dev@sling.apache.org&gt;
---
> <pre><code>To: &quot;Sling Developers List&quot; &lt;dev@sling.apache.org&gt;
370,371c389,390
<   [ ]  0 Don't care
<   [ ] -1 Don't release, because ...
---
>   [ ]  0 Don&#39;t care
>   [ ] -1 Don&#39;t release, because ...
384c403,404
<   </ol> </li> 
---
>     </ol>
>   </li>
387,388c407,409
<    <li>The timestamps in the composite xml files should be refreshed to "now", for instance by using the value of <code>echo "`date +%s`000"</code></li> 
<   </ol> </li> 
---
>       <li>The timestamps in the composite xml files should be refreshed to "now", for instance by using the value of <code>echo &quot;`date +%s`000&quot;</code></li>
>     </ol>
>   </li>
394c415
< <h2><a href="#appendix-a-create-and-add-your-key-to-peopleapacheorg" id="appendix-a-create-and-add-your-key-to-peopleapacheorg">Appendix A: Create and Add your key to people.apache.org</a></h2> 
---
> <h2><a href="#appendix-a-create-and-add-your-key-to-people-apache-org" name="appendix-a-create-and-add-your-key-to-people-apache-org">Appendix A: Create and Add your key to people.apache.org</a></h2>
397,399c418,425
<  <li> <p>Create a public/private pair key:</p> <pre><code>$ gpg --gen-key
< </code></pre> <p>When gpg asks for e-mail linked the key you <em>MUST USE</em> the &lt;committer&gt;@apache.org one. When gpg asks for comment linked the key you <em>SHOULD USE</em> "CODE SIGNING KEY"</p> </li> 
<  <li> <p>Add the key to <a href="https://people.apache.org/keys/group/sling.asc">https://people.apache.org/keys/group/sling.asc</a></p> 
---
>   <li>
>     <p>Create a public/private pair key:</p>
>     <pre><code>$ gpg --gen-key
> </code></pre>
>     <p>When gpg asks for e-mail linked the key you <em>MUST USE</em> the &lt;committer&gt;@apache.org one. When gpg asks for comment linked the key you <em>SHOULD USE</em> "CODE SIGNING KEY"</p>
>   </li>
>   <li>
>     <p>Add the key to <a href="https://people.apache.org/keys/group/sling.asc">https://people.apache.org/keys/group/sling.asc</a></p>
401,406c427,440
<    <li> <p>Type the following command replacing the word <code>&lt;e-mail&gt;</code> with your Apache's one (&lt;committer&gt;@apache.org) to get the key signature</p> <pre><code>$ gpg --fingerprint &lt;e-mail&gt;
< </code></pre> <p>The key signature is in the output following the <code>Key fingerprint =</code> part.</p> </li> 
<    <li> <p>Add the key signature into the field 'OpenPGP Public Key Primary Fingerprint' in your profile at <a href="https://id.apache.org">https://id.apache.org</a>.</p> </li> 
<    <li> <p>You are <em>DONE</em>, but to see the changes on <a href="https://people.apache.org/keys/group/sling.asc">https://people.apache.org/keys/group/sling.asc</a> you may need to wait a few hours;</p> </li> 
<   </ol> </li> 
<  <li> <p>You also have to add your public key either on <code>pool.sks-keyservers.net</code> or <code>pgp.mit.edu</code> (for the staging repository). To do so you can follow these steps:</p> 
---
>       <li>
>         <p>Type the following command replacing the word <code>&lt;e-mail&gt;</code> with your Apache's one (&lt;committer&gt;@apache.org) to get the key signature</p>
>         <pre><code>$ gpg --fingerprint &lt;e-mail&gt;
> </code></pre>
>         <p>The key signature is in the output following the <code>Key fingerprint =</code> part.</p>
>       </li>
>       <li>
>       <p>Add the key signature into the field 'OpenPGP Public Key Primary Fingerprint' in your profile at <a href="https://id.apache.org">https://id.apache.org</a>.</p></li>
>       <li>
>       <p>You are <em>DONE</em>, but to see the changes on <a href="https://people.apache.org/keys/group/sling.asc">https://people.apache.org/keys/group/sling.asc</a> you may need to wait a few hours;</p></li>
>     </ol>
>   </li>
>   <li>
>     <p>You also have to add your public key either on <code>pool.sks-keyservers.net</code> or <code>pgp.mit.edu</code> (for the staging repository). To do so you can follow these steps:</p>
408,409c442,447
<    <li> <p>Extract the key id from all the secret keys stored in the system:</p> <pre><code>$ gpg --list-secret-keys.
< </code></pre> <p>The output is something like this</p> <pre><code>gpg --list-secret-keys
---
>       <li>
>         <p>Extract the key id from all the secret keys stored in the system:</p>
>         <pre><code>$ gpg --list-secret-keys.
> </code></pre>
>         <p>The output is something like this</p>
>         <pre><code>gpg --list-secret-keys
416,419c454,463
< </code></pre> <p>The key id in this case is <code>455ECC7C</code>.</p> </li> 
<    <li> <p>Send the key towards e.g. <code>pool.sks-keyservers.net</code> via</p> <pre><code>$ gpg --keyserver pool.sks-keyservers.net --send-key &lt;key-id&gt;
< </code></pre> </li> 
<   </ol> </li> 
---
> </code></pre>
>         <p>The key id in this case is <code>455ECC7C</code>.</p>
>       </li>
>       <li>
>         <p>Send the key towards e.g. <code>pool.sks-keyservers.net</code> via</p>
>         <pre><code>$ gpg --keyserver pool.sks-keyservers.net --send-key &lt;key-id&gt;
> </code></pre>
>       </li>
>     </ol>
>   </li>
421c465
< <h2><a href="#appendix-b-deploy-maven-plugin-documentation-if-applicable" id="appendix-b-deploy-maven-plugin-documentation-if-applicable">Appendix B: Deploy Maven plugin documentation (if applicable)</a></h2> 
---
> <h2><a href="#appendix-b-deploy-maven-plugin-documentation-if-applicable-" name="appendix-b-deploy-maven-plugin-documentation-if-applicable-">Appendix B: Deploy Maven plugin documentation (if applicable)</a></h2>
432,441c476,497
<  <li> <p>Checkout the release tag of the released plugin (or reset your workspace)</p> </li> 
<  <li> <p>Build and stage the maven site of the plugin locally.</p> <pre><code>$ mvn clean site:site site:stage
< </code></pre> </li> 
<  <li> <p>Checkout the Sling website and navigate to the 'components' directory</p> <pre><code>$ git clone https://github.com/apache/sling-site.git
< </code></pre> </li> 
<  <li> <p>Replace the content of the existing folder <code>src/main/jbake/assets/components/&lt;plugin-name&gt;</code> with the generated maven site from <code>target/staging</code></p> </li> 
<  <li> <p>Create a new folder <code>src/main/jbake/assets/components/&lt;plugin-name&gt;-archives/&lt;plugin-name&gt;-&lt;version&gt;</code> and copy the generated maven site there as well</p> </li> 
<  <li> <p>Commit the changes</p> </li> 
<  <li> <p>Publish the Sling site to production</p> </li> 
<  <li> <p>Check the results at <a href="http://sling.apache.org/components/">http://sling.apache.org/components/</a></p> </li> 
---
>   <li>
>   <p>Checkout the release tag of the released plugin (or reset your workspace)</p></li>
>   <li>
>     <p>Build and stage the maven site of the plugin locally.</p>
>     <pre><code>$ mvn clean site:site site:stage
> </code></pre>
>   </li>
>   <li>
>     <p>Checkout the Sling website and navigate to the 'components' directory</p>
>     <pre><code>$ git clone https://github.com/apache/sling-site.git
> </code></pre>
>   </li>
>   <li>
>   <p>Replace the content of the existing folder <code>src/main/jbake/assets/components/&lt;plugin-name&gt;</code> with the generated maven site from <code>target/staging</code></p></li>
>   <li>
>   <p>Create a new folder <code>src/main/jbake/assets/components/&lt;plugin-name&gt;-archives/&lt;plugin-name&gt;-&lt;version&gt;</code> and copy the generated maven site there as well</p></li>
>   <li>
>   <p>Commit the changes</p></li>
>   <li>
>   <p>Publish the Sling site to production</p></li>
>   <li>
>   <p>Check the results at <a href="http://sling.apache.org/components/">http://sling.apache.org/components/</a></p></li>
diff -b -B -r ./documentation/development/repository-based-development.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/repository-based-development.html
98,99c98,99
< <h1><a href="#webdav-support" id="webdav-support">WebDAV Support</a></h1> 
< <p>WebDAV support in Sling is based on the <a href="http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#Simple_Webdav_Server">Simple WebDAV</a> implementation of Apache Jackrabbit which is integrated in the <code>jcr/webdav</code> project. This bundle provides WebDAV access to Sling's repository in two flavours:</p> 
---
> <h1><a href="#webdav-support" name="webdav-support">WebDAV Support</a></h1>
> <p>WebDAV support in Sling is based on the <a href="http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#Simple_Webdav_Server">Simple WebDAV</a> implementation of Apache Jackrabbit which is integrated in the <code>jcr/webdav</code> project. This bundle provides WebDAV access to Sling's repository in two flavours: </p>
104c104
< <h2><a href="#example" id="example">Example</a></h2> 
---
> <h2><a href="#example" name="example">Example</a></h2>
107c107
< <h2><a href="#separate-uri-space-webdav" id="separate-uri-space-webdav">Separate URI Space WebDAV</a></h2> 
---
> <h2><a href="#separate-uri-space-webdav" name="separate-uri-space-webdav">Separate URI Space WebDAV</a></h2>
118c118
< <h2><a href="#configuration" id="configuration">Configuration</a></h2> 
---
> <h2><a href="#configuration" name="configuration">Configuration</a></h2>
124,125c124,125
<    <th> Default </th>
<    <th> Description</th>
---
>       <th>Default </th>
>       <th>Description</th>
131,132c131,132
<    <td> <code>/dav</code> </td>
<    <td> The root path at which the Simple WebDAV Servlet is accessible. Access to the repository is provided in two ways. You may connect your WebDAV client directly to the root of the Sling web application to access the workspace of Sling directly. The other way is required if you want to connect your WebDAV client to any other workspace besides the Sling workspace. In this case you connect your WebDAV client to another a path comprised of this root path plus the name of the workspace. For example to connect to the <code>some*other</code> workspace, you might connect to <code>http://slinghost/dav/some*other</code>.</td>
---
>       <td><code>/dav</code> </td>
>       <td>The root path at which the Simple WebDAV Servlet is accessible. Access to the repository is provided in two ways. You may connect your WebDAV client directly to the root of the Sling web application to access the workspace of Sling directly. The other way is required if you want to connect your WebDAV client to any other workspace besides the Sling workspace. In this case you connect your WebDAV client to another a path comprised of this root path plus the name of the workspace. For example to connect to the <code>some*other</code> workspace, you might connect to <code>http://slinghost/dav/some*other</code>.</td>
136,137c136,137
<    <td> <code>Sling WebDAV</code> </td>
<    <td> The name of the HTTP Basic Authentication Realm presented to the client to ask for authentication credentials to access the repository.</td>
---
>       <td><code>Sling WebDAV</code> </td>
>       <td>The name of the HTTP Basic Authentication Realm presented to the client to ask for authentication credentials to access the repository.</td>
141,142c141,142
<    <td> <code>nt:file</code>, <code>nt:resource</code> </td>
<    <td> The JCR Node Types considered being non-collection resources by WebDAV. Any node replying <code>true</code> to <code>Node.isNodeType()</code> for one of the listed types is considered a non-collection resource. Otherwise the respective node is considered a collection resource.</td>
---
>       <td><code>nt:file</code>, <code>nt:resource</code> </td>
>       <td>The JCR Node Types considered being non-collection resources by WebDAV. Any node replying <code>true</code> to <code>Node.isNodeType()</code> for one of the listed types is considered a non-collection resource. Otherwise the respective node is considered a collection resource.</td>
146,147c146,147
<    <td> <code>jcr</code>, <code>rep</code> </td>
<    <td> A list of namespace prefixes indicating JCR items filtered from being reported as collection members or properties. The default list includes jcr and rep (Jackrabbit internal namespace prefix) items. Do not modify this setting unless you know exactly what you are doing.</td>
---
>       <td><code>jcr</code>, <code>rep</code> </td>
>       <td>A list of namespace prefixes indicating JCR items filtered from being reported as collection members or properties. The default list includes jcr and rep (Jackrabbit internal namespace prefix) items. Do not modify this setting unless you know exactly what you are doing.</td>
151,152c151,152
<    <td> n/a </td>
<    <td> Nodetype names to be used to filter child nodes. A child node can be filtered if the declaring nodetype of its definition is one of the nodetype names specified in the nodetypes Element. E.g. defining rep:root as filtered nodetype would result in <code>jcr:system</code> being hidden but no other child node of the root node, since those are defined by the nodetype nt:unstructered. The default is empty. Do not modify this setting unless you know exactly what you are doing.</td>
---
>       <td>n/a </td>
>       <td>Nodetype names to be used to filter child nodes. A child node can be filtered if the declaring nodetype of its definition is one of the nodetype names specified in the nodetypes Element. E.g. defining rep:root as filtered nodetype would result in <code>jcr:system</code> being hidden but no other child node of the root node, since those are defined by the nodetype nt:unstructered. The default is empty. Do not modify this setting unless you know exactly what you are doing.</td>
156,157c156,157
<    <td> n/a </td>
<    <td> A list of namespace URIs indicating JCR items filtered from being reported as collection members or properties. The default list is empty. Do not modify this setting unless you know exactly what you are doing.</td>
---
>       <td>n/a </td>
>       <td>A list of namespace URIs indicating JCR items filtered from being reported as collection members or properties. The default list is empty. Do not modify this setting unless you know exactly what you are doing.</td>
161,162c161,162
<    <td> <code>sling:Folder</code> </td>
<    <td> The JCR Primary Node Type to assign to nodes created to reflect WebDAV collections. You may name any primary node type here, provided it allows the creation of nodex of this type and the defined Non-Collection Primary Type below it.</td>
---
>       <td><code>sling:Folder</code> </td>
>       <td>The JCR Primary Node Type to assign to nodes created to reflect WebDAV collections. You may name any primary node type here, provided it allows the creation of nodex of this type and the defined Non-Collection Primary Type below it.</td>
166,167c166,167
<    <td> <code>nt:file</code> </td>
<    <td> The JCR Primary Node Type to assign to nodes created to reflect WebDAV non-collection resources. You may name any primary node type here, provided the node type is allowed to be created below nodes of the type defined for the Collection Primary Type and that a child node with the name <code>jcr:content</code> may be created below the non-collection resource whose type is defined by the Content Primary Type.</td>
---
>       <td><code>nt:file</code> </td>
>       <td>The JCR Primary Node Type to assign to nodes created to reflect WebDAV non-collection resources. You may name any primary node type here, provided the node type is allowed to be created below nodes of the type defined for the Collection Primary Type and that a child node with the name <code>jcr:content</code> may be created below the non-collection resource whose type is defined by the Content Primary Type.</td>
171,172c171,172
<    <td> <code>nt:resource</code> </td>
<    <td> The JCR Primary Node Type to assign to the jcr:content child node of a WebDAV non-collection resource. You may name any primary node type here, provided the node type is allowed to be created as the jcr:content child node of the node type defined by the Non-Collection Primary Type. In addition the node type must allow at least the following properties: jcr:data (binary), jcr:lastModified (date), and jcr:mimeType (string).</td>
---
>       <td><code>nt:resource</code> </td>
>       <td>The JCR Primary Node Type to assign to the jcr:content child node of a WebDAV non-collection resource. You may name any primary node type here, provided the node type is allowed to be created as the jcr:content child node of the node type defined by the Non-Collection Primary Type. In addition the node type must allow at least the following properties: jcr:data (binary), jcr:lastModified (date), and jcr:mimeType (string).</td>
176c176
< <h2><a href="#advanced-technical-details" id="advanced-technical-details">Advanced Technical Details</a></h2> 
---
> <h2><a href="#advanced-technical-details" name="advanced-technical-details">Advanced Technical Details</a></h2>
178c178
< <h3><a href="#iomanager" id="iomanager">IOManager</a></h3> 
---
> <h3><a href="#iomanager" name="iomanager">IOManager</a></h3>
180c180
< <h3><a href="#propertymanager" id="propertymanager">PropertyManager</a></h3> 
---
> <h3><a href="#propertymanager" name="propertymanager">PropertyManager</a></h3>
182c182
< <h3><a href="#itemfilter" id="itemfilter">ItemFilter</a></h3> 
---
> <h3><a href="#itemfilter" name="itemfilter">ItemFilter</a></h3>
184c184
< <h3><a href="#collection-node-types" id="collection-node-types">Collection Node Types</a></h3> 
---
> <h3><a href="#collection-node-types" name="collection-node-types">Collection Node Types</a></h3>
186c186
< <h1><a href="#davex-support" id="davex-support">DavEx Support</a></h1> 
---
> <h1><a href="#davex-support" name="davex-support">DavEx Support</a></h1>
188c188
< <h1><a href="#eclipse-plugin-for-jcr" id="eclipse-plugin-for-jcr">Eclipse plugin for JCR</a></h1> 
---
> <h1><a href="#eclipse-plugin-for-jcr" name="eclipse-plugin-for-jcr">Eclipse plugin for JCR</a></h1>
diff -b -B -r ./documentation/development/resourceresolver-mock.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/resourceresolver-mock.html
99c99
< <h2><a href="#maven-dependency" id="maven-dependency">Maven Dependency</a></h2> 
---
> <h2><a href="#maven-dependency" name="maven-dependency">Maven Dependency</a></h2>
106c106
< <h2><a href="#implemented-mock-features" id="implemented-mock-features">Implemented mock features</a></h2> 
---
> <h2><a href="#implemented-mock-features" name="implemented-mock-features">Implemented mock features</a></h2>
121c121
< <h2><a href="#usage" id="usage">Usage</a></h2> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
diff -b -B -r ./documentation/development/sling-mock.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/sling-mock.html
101c101
< <h2><a href="#maven-dependency" id="maven-dependency">Maven Dependency</a></h2> 
---
> <h2><a href="#maven-dependency" name="maven-dependency">Maven Dependency</a></h2>
113c113
< <h2><a href="#implemented-mock-features" id="implemented-mock-features">Implemented mock features</a></h2> 
---
> <h2><a href="#implemented-mock-features" name="implemented-mock-features">Implemented mock features</a></h2>
121c121,122
<   </ul> </li> 
---
>     </ul>
>   </li>
125c126,127
<   </ul> </li> 
---
>     </ul>
>   </li>
130c132,133
<   </ul> </li> 
---
>     </ul>
>   </li>
140c143,144
<   </ul> </li> 
---
>     </ul>
>   </li>
142c146
< <h3><a href="#additional-features" id="additional-features">Additional features</a></h3> 
---
> <h3><a href="#additional-features" name="additional-features">Additional features</a></h3>
149c153,154
<   </ul> </li> 
---
>     </ul>
>   </li>
152,153c157,158
< <h2><a href="#usage" id="usage">Usage</a></h2> 
< <h3><a href="#sling-context-junit-rule" id="sling-context-junit-rule">Sling Context JUnit Rule</a></h3> 
---
> <h2><a href="#usage" name="usage">Usage</a></h2>
> <h3><a href="#sling-context-junit-rule" name="sling-context-junit-rule">Sling Context JUnit Rule</a></h3>
163c168
<     Resource resource = context.resourceResolver().getResource("/content/sample/en");
---
>     Resource resource = context.resourceResolver().getResource(&quot;/content/sample/en&quot;);
185c190
< <h3><a href="#choosing-resource-resolver-mock-type" id="choosing-resource-resolver-mock-type">Choosing Resource Resolver Mock Type</a></h3> 
---
> <h3><a href="#choosing-resource-resolver-mock-type" name="choosing-resource-resolver-mock-type">Choosing Resource Resolver Mock Type</a></h3>
195c200
< <h3><a href="#resource-resolver-types" id="resource-resolver-types">Resource Resolver Types</a></h3> 
---
> <h3><a href="#resource-resolver-types" name="resource-resolver-types">Resource Resolver Types</a></h3>
256c261
< <h3><a href="#sling-resource-resolver" id="sling-resource-resolver">Sling Resource Resolver</a></h3> 
---
> <h3><a href="#sling-resource-resolver" name="sling-resource-resolver">Sling Resource Resolver</a></h3>
265c270
< <h3><a href="#adapter-factories" id="adapter-factories">Adapter Factories</a></h3> 
---
> <h3><a href="#adapter-factories" name="adapter-factories">Adapter Factories</a></h3>
281c286
< <h3><a href="#slingscripthelper" id="slingscripthelper">SlingScriptHelper</a></h3> 
---
> <h3><a href="#slingscripthelper" name="slingscripthelper">SlingScriptHelper</a></h3>
292c297
< <p>To support getting OSGi services you have to register them via the <code>BundleContext</code> interface of the <a href="/documentation/development/jcr-mock.html">JCR Mocks</a> before. You can use an alternative factory method for the <code>SlingScriptHelper</code> providing existing instances of request, response and bundle context.</p> 
---
> <p>To support getting OSGi services you have to register them via the <code>BundleContext</code> interface of the <a href="/documentation/development/jcr-mock.html">JCR Mocks</a> before. You can use an alternative factory method for the <code>SlingScriptHelper</code> providing existing instances of request, response and bundle context. </p>
294c299
< <h3><a href="#slinghttpservletrequest" id="slinghttpservletrequest">SlingHttpServletRequest</a></h3> 
---
> <h3><a href="#slinghttpservletrequest" name="slinghttpservletrequest">SlingHttpServletRequest</a></h3>
301c306
< request.setQueryString("param1=aaa&amp;param2=bbb");
---
> request.setQueryString(&quot;param1=aaa&amp;param2=bbb&quot;);
305,306c310,311
<     .put("param1", "aaa")
<     .put("param2", "bbb")
---
>     .put(&quot;param1&quot;, &quot;aaa&quot;)
>     .put(&quot;param2&quot;, &quot;bbb&quot;)
310c315
< request.setResource(resourceResolver.getResource("/content/sample"));
---
> request.setResource(resourceResolver.getResource(&quot;/content/sample&quot;));
314,315c319,320
< requestPathInfo.setSelectorString("selector1.selector2");
< requestPathInfo.setExtension("html");
---
> requestPathInfo.setSelectorString(&quot;selector1.selector2&quot;);
> requestPathInfo.setExtension(&quot;html&quot;);
321c326
< request.setAttribute("attr1", "value1");
---
> request.setAttribute(&quot;attr1&quot;, &quot;value1&quot;);
324c329
< request.addHeader("header1", "value1");
---
> request.addHeader(&quot;header1&quot;, &quot;value1&quot;);
327c332
< request.addCookie(new Cookie("cookie1", "value1"));
---
> request.addCookie(new Cookie(&quot;cookie1&quot;, &quot;value1&quot;));
329c334
< <h3><a href="#slinghttpservletresponse" id="slinghttpservletresponse">SlingHttpServletResponse</a></h3> 
---
> <h3><a href="#slinghttpservletresponse" name="slinghttpservletresponse">SlingHttpServletResponse</a></h3>
340c345
< assertEquals("text/plain;charset=UTF-8", response.getContentType());
---
> assertEquals(&quot;text/plain;charset=UTF-8&quot;, response.getContentType());
345,346c350,351
< assertTrue(response.containsHeader("header1"));
< assertEquals("5", response.getHeader("header2"));
---
> assertTrue(response.containsHeader(&quot;header1&quot;));
> assertEquals(&quot;5&quot;, response.getHeader(&quot;header2&quot;));
354c359
< <h3><a href="#import-resource-data-from-json-file-in-classpath" id="import-resource-data-from-json-file-in-classpath">Import resource data from JSON file in classpath</a></h3> 
---
> <h3><a href="#import-resource-data-from-json-file-in-classpath" name="import-resource-data-from-json-file-in-classpath">Import resource data from JSON file in classpath</a></h3>
358,372c363,377
<   "jcr:primaryType": "app:Page",
<   "jcr:content": {
<     "jcr:primaryType": "app:PageContent",
<     "jcr:title": "English",
<     "app:template": "/apps/sample/templates/homepage",
<     "sling:resourceType": "sample/components/homepage",
<     "jcr:createdBy": "admin",
<     "jcr:created": "Thu Aug 07 2014 16:32:59 GMT+0200",
<     "par": {
<       "jcr:primaryType": "nt:unstructured",
<       "sling:resourceType": "foundation/components/parsys",
<       "colctrl": {
<         "jcr:primaryType": "nt:unstructured",
<         "layout": "2;colctrl-lt0",
<         "sling:resourceType": "foundation/components/parsys/colctrl"
---
>   &quot;jcr:primaryType&quot;: &quot;app:Page&quot;,
>   &quot;jcr:content&quot;: {
>     &quot;jcr:primaryType&quot;: &quot;app:PageContent&quot;,
>     &quot;jcr:title&quot;: &quot;English&quot;,
>     &quot;app:template&quot;: &quot;/apps/sample/templates/homepage&quot;,
>     &quot;sling:resourceType&quot;: &quot;sample/components/homepage&quot;,
>     &quot;jcr:createdBy&quot;: &quot;admin&quot;,
>     &quot;jcr:created&quot;: &quot;Thu Aug 07 2014 16:32:59 GMT+0200&quot;,
>     &quot;par&quot;: {
>       &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;,
>       &quot;sling:resourceType&quot;: &quot;foundation/components/parsys&quot;,
>       &quot;colctrl&quot;: {
>         &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;,
>         &quot;layout&quot;: &quot;2;colctrl-lt0&quot;,
>         &quot;sling:resourceType&quot;: &quot;foundation/components/parsys/colctrl&quot;
379c384
< <pre><code><!-- TODO syntax marker (#!java) disabled -->context.load().json("/sample-data.json", "/content/sample/en");
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->context.load().json(&quot;/sample-data.json&quot;, &quot;/content/sample/en&quot;);
382,383c387,388
< <h3><a href="#import-binary-data-from-file-in-classpath" id="import-binary-data-from-file-in-classpath">Import binary data from file in classpath</a></h3> 
< <p>With the <code>ContentLoader</code> it is possible to import a binary file stored in the classpath beneath the unit tests. The data is stored using a nt:file/nt:resource or nt:resource node type.</p> 
---
> <h3><a href="#import-binary-data-from-file-in-classpath" name="import-binary-data-from-file-in-classpath">Import binary data from file in classpath</a></h3>
> <p>With the <code>ContentLoader</code> it is possible to import a binary file stored in the classpath beneath the unit tests. The data is stored using a nt:file/nt:resource or nt:resource node type. </p>
385c390
< <pre><code><!-- TODO syntax marker (#!java) disabled -->context.load().binaryFile("/sample-file.gif", "/content/binary/sample-file.gif");
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->context.load().binaryFile(&quot;/sample-file.gif&quot;, &quot;/content/binary/sample-file.gif&quot;);
388c393
< <h3><a href="#building-content" id="building-content">Building content</a></h3> 
---
> <h3><a href="#building-content" name="building-content">Building content</a></h3>
394c399
< <h4><a href="#building-content-using-contentbuilder" id="building-content-using-contentbuilder">Building content using <code>ContentBuilder</code></a></h4> 
---
> <h4>Building content using <code>ContentBuilder</code></h4>
397,399c402,404
< <pre><code><!-- TODO syntax marker (#!java) disabled -->context.create().resource("/content/test1", ImmutableMap.&lt;String, Object&gt;builder()
<         .put("prop1", "value1")
<         .put("prop2", "value2")
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->context.create().resource(&quot;/content/test1&quot;, ImmutableMap.&lt;String, Object&gt;builder()
>         .put(&quot;prop1&quot;, &quot;value1&quot;)
>         .put(&quot;prop2&quot;, &quot;value2&quot;)
403,405c408,410
< <pre><code><!-- TODO syntax marker (#!java) disabled -->context.create().resource("/content/test1",
<         "prop1", "value1",
<         "prop2", "value2");
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->context.create().resource(&quot;/content/test1&quot;,
>         &quot;prop1&quot;, &quot;value1&quot;,
>         &quot;prop2&quot;, &quot;value2&quot;);
408c413
< <h4><a href="#building-content-using-resourcebuilder" id="building-content-using-resourcebuilder">Building content using <code>ResourceBuilder</code></a></h4> 
---
> <h4>Building content using <code>ResourceBuilder</code></h4>
411c416
< <pre><code><!-- TODO syntax marker (#!java) disabled -->context.build().resource("/content/test1")
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->context.build().resource(&quot;/content/test1&quot;)
413,415c418,420
<         .resource("test1.1", "stringParam", "configValue1.1")
<         .resource("test1.2", "stringParam", "configValue1.2")
<         .resource("test1.2", "stringParam", "configValue1.3");
---
>         .resource(&quot;test1.1&quot;, &quot;stringParam&quot;, &quot;configValue1.1&quot;)
>         .resource(&quot;test1.2&quot;, &quot;stringParam&quot;, &quot;configValue1.2&quot;)
>         .resource(&quot;test1.2&quot;, &quot;stringParam&quot;, &quot;configValue1.3&quot;);
418c423
< <h3><a href="#context-plugins" id="context-plugins">Context Plugins</a></h3> 
---
> <h3><a href="#context-plugins" name="context-plugins">Context Plugins</a></h3>
422c427
< <p>Example:</p> 
---
> <p>Example: </p>
diff -b -B -r ./documentation/development/sling-testing-tools.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/sling-testing-tools.html
99c99,100
<   While this information is still valid, we recommend using the tools and techniques described in the newer "Junit Server-Side Tests Support" page instead, see link below. 
---
> While this information is still valid, we recommend using the tools and techniques described
> in the newer "Junit Server-Side Tests Support" page instead, see link below. 
101c102
< <p>As mentioned above, this is now replaced by the <a href="/documentation/bundles/org-apache-sling-junit-bundles.html">Junit Server-Side Tests Support</a> page.</p> 
---
> <p>As mentioned above, this is now replaced by the <a href="/documentation/bundles/org-apache-sling-junit-bundles.html">Junit Server-Side Tests Support</a> page. </p>
111c112
< <h2><a href="#required-bundles" id="required-bundles">Required bundles</a></h2> 
---
> <h2><a href="#required-bundles" name="required-bundles">Required bundles</a></h2>
113c114
< <h1><a href="#server-side-junit-tests-contributed-by-bundles" id="server-side-junit-tests-contributed-by-bundles">Server-side JUnit tests contributed by bundles</a></h1> 
---
> <h1><a href="#server-side-junit-tests-contributed-by-bundles" name="server-side-junit-tests-contributed-by-bundles">Server-side JUnit tests contributed by bundles</a></h1>
116c117
<   Note that the JUnitServlet does not require authentication, so it would allow any client to run tests. The servlet can be disabled by configuration if needed, but in general the `/system` path should not be accessible to website visitors anyway. 
---
> Note that the JUnitServlet does not require authentication, so it would allow any client to run tests. The servlet can be disabled by configuration if needed, but in general the `/system` path should not be accessible to website visitors anyway.
119c120
<   For tighter integration with Sling, the alternate `SlingJUnitServlet` is registered with the `sling/junit/testing` resource type and `.junit` selector, if the bundle is running in a Sling system. Using this servlet instead of the plain JUnitServlet also allows Sling authentication to be used for running the tests, and the standard Sling request processing is used, including servlet filters for example. 
---
> For tighter integration with Sling, the alternate `SlingJUnitServlet` is registered with the `sling/junit/testing` resource type and `.junit` selector, if the bundle is running in a Sling system. Using this servlet instead of the plain JUnitServlet also allows Sling authentication to be used for running the tests, and the standard Sling request processing is used, including servlet filters for example.
121c122
< <p>To try the JUnitServlet interactively, install a bundle that contains tests registered via the <code>Sling-Test-Regexp=.*Test</code> bundle header.</p> 
---
> <p>To try the JUnitServlet interactively, install a bundle that contains tests registered via the <code>Sling-Test-Regexp=.*Test</code> bundle header. </p>
126c127
< <h3><a href="#injection-of-osgi-services" id="injection-of-osgi-services">Injection of OSGi services</a></h3> 
---
> <h3><a href="#injection-of-osgi-services" name="injection-of-osgi-services">Injection of OSGi services</a></h3>
128c129
< <h2><a href="#curl-examples" id="curl-examples">Curl examples</a></h2> 
---
> <h2><a href="#curl-examples" name="curl-examples">Curl examples</a></h2>
132,133c133,134
<     "INFO_TYPE": "test",
<     "description": "testPasses(org.apache.sling.testing.samples.sampletests.JUnit3Test)"
---
>     &quot;INFO_TYPE&quot;: &quot;test&quot;,
>     &quot;description&quot;: &quot;testPasses(org.apache.sling.testing.samples.sampletests.JUnit3Test)&quot;
135,136c136,137
<     "INFO_TYPE": "test",
<     "description": "testPasses(org.apache.sling.testing.samples.sampletests.JUnit4Test)"
---
>     &quot;INFO_TYPE&quot;: &quot;test&quot;,
>     &quot;description&quot;: &quot;testPasses(org.apache.sling.testing.samples.sampletests.JUnit4Test)&quot;
138,139c139,140
<     "INFO_TYPE": "test",
<     "description": "testRequiresBefore(org.apache.sling.testing.samples.sampletests.JUnit4Test)"
---
>     &quot;INFO_TYPE&quot;: &quot;test&quot;,
>     &quot;description&quot;: &quot;testRequiresBefore(org.apache.sling.testing.samples.sampletests.JUnit4Test)&quot;
146c147
< <h1><a href="#scriptable-server-side-tests" id="scriptable-server-side-tests">Scriptable server-side tests</a></h1> 
---
> <h1><a href="#scriptable-server-side-tests" name="scriptable-server-side-tests">Scriptable server-side tests</a></h1>
165,168c166,169
<     "INFO_TYPE": "test",
<     "description": "verifyContent[0](org.apache.sling.junit.scriptable.TestAllPaths)",
<     "test_metadata": {
<       "test_execution_time_msec": 2
---
>     &quot;INFO_TYPE&quot;: &quot;test&quot;,
>     &quot;description&quot;: &quot;verifyContent[0](org.apache.sling.junit.scriptable.TestAllPaths)&quot;,
>     &quot;test_metadata&quot;: {
>       &quot;test_execution_time_msec&quot;: 2
173,174c174,175
< <p>Test failures would be included in this JSON representation - you can test that by modifying the script to fail and making the same request again.</p> 
< <h1><a href="#integration-tests-example" id="integration-tests-example">Integration tests example</a></h1> 
---
> <p>Test failures would be included in this JSON representation - you can test that by modifying the script to fail and making the same request again. </p>
> <h1><a href="#integration-tests-example" name="integration-tests-example">Integration tests example</a></h1>
179c180
<   The information below is outdated and needs an update, please rather directly check the source files linked above. 
---
> The information below is outdated and needs an update, please rather directly check the source files linked above.
194c195
< <h2><a href="#running-tests-against-existing-server" id="running-tests-against-existing-server">Running tests against existing server</a></h2> 
---
> <h2><a href="#running-tests-against-existing-server" name="running-tests-against-existing-server">Running tests against existing server</a></h2>
197c198
< <h1><a href="#remote-test-execution" id="remote-test-execution">Remote test execution</a></h1> 
---
> <h1><a href="#remote-test-execution" name="remote-test-execution">Remote test execution</a></h1>
199c200
< <h2><a href="#slingremotetestrunner" id="slingremotetestrunner">SlingRemoteTestRunner</a></h2> 
---
> <h2><a href="#slingremotetestrunner" name="slingremotetestrunner">SlingRemoteTestRunner</a></h2>
203c204
< <h2><a href="#slingremoteexecutionrule" id="slingremoteexecutionrule">SlingRemoteExecutionRule</a></h2> 
---
> <h2><a href="#slingremoteexecutionrule" name="slingremoteexecutionrule">SlingRemoteExecutionRule</a></h2>
206c207
< <h1><a href="#debugging-its" id="debugging-its">Debugging ITs</a></h1> 
---
> <h1><a href="#debugging-its" name="debugging-its">Debugging ITs</a></h1>
208,209c209,210
< <p>Then the <code>JarExecutor</code> is forking the VM a second time to start the server (this does not happen if connecting to an already running instance). The system environment variable <code>jar.executor.vm.options</code> can be used to start that VM with debug options. All debug options are described at the <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html#Invocation">JPDA documentation</a>. If running</p> 
< <pre><code>mvn test -Djar.executor.vm.options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000"
---
> <p>Then the <code>JarExecutor</code> is forking the VM a second time to start the server (this does not happen if connecting to an already running instance). The system environment variable <code>jar.executor.vm.options</code> can be used to start that VM with debug options. All debug options are described at the <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html#Invocation">JPDA documentation</a>. If running </p>
> <pre><code>mvn test -Djar.executor.vm.options=&quot;-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000&quot;
diff -b -B -r ./documentation/development/slingstart.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/slingstart.html
103,104c103,105
<   The 
<  <a href="/documentation/development/feature-model.html">OSGi Feature Model</a> is meant to eventually replace the Sling Provisioning Model. If you are starting a new Sling project, please ask on the Sling developers list about the status of the Feature Model to figure out which is best suited to your needs. 
---
>     The <a href="/documentation/development/feature-model.html">OSGi Feature Model</a> is
>     meant to eventually replace the Sling Provisioning Model. If you are starting a new Sling project, please ask on
>     the Sling developers list about the status of the Feature Model to figure out which is best suited to your needs.
109c110
< <h2><a href="#the-model" id="the-model">The Model</a></h2> 
---
> <h2><a href="#the-model" name="the-model">The Model</a></h2>
121c122
< <h3><a href="#run-modes" id="run-modes">Run Modes</a></h3> 
---
> <h3><a href="#run-modes" name="run-modes">Run Modes</a></h3>
129c130
< <h3><a href="#start-levels" id="start-levels">Start Levels</a></h3> 
---
> <h3><a href="#start-levels" name="start-levels">Start Levels</a></h3>
131c132
< <h3><a href="#artifacts" id="artifacts">Artifacts</a></h3> 
---
> <h3><a href="#artifacts" name="artifacts">Artifacts</a></h3>
144c145
< <h3><a href="#configurations" id="configurations">Configurations</a></h3> 
---
> <h3><a href="#configurations" name="configurations">Configurations</a></h3>
151c152
< <h4><a href="#bootstrap-command-file" id="bootstrap-command-file">Bootstrap Command File</a></h4> 
---
> <h4><a href="#bootstrap-command-file" name="bootstrap-command-file">Bootstrap Command File</a></h4>
164c165
< <h3><a href="#settings" id="settings">Settings</a></h3> 
---
> <h3><a href="#settings" name="settings">Settings</a></h3>
166c167
< <h3><a href="#features" id="features">Features</a></h3> 
---
> <h3><a href="#features" name="features">Features</a></h3>
172c173
< <h2><a href="#model-files" id="model-files">Model Files</a></h2> 
---
> <h2><a href="#model-files" name="model-files">Model Files</a></h2>
187c188
<           ignoreTopics=["myTopic"]
---
>           ignoreTopics=[&quot;myTopic&quot;]
204c205
<           ignoreTopics=["myTopic"]
---
>           ignoreTopics=[&quot;myTopic&quot;]
208c209
< <pre><code>section header ::= '[' &lt;section name&gt; { ' ' &lt;parameter-name&gt; '=' &lt;parameter-value&gt; } ']'
---
> <pre><code>section header ::= &#39;[&#39; &lt;section name&gt; { &#39; &#39; &lt;parameter-name&gt; &#39;=&#39; &lt;parameter-value&gt; } &#39;]&#39;
210c211
< <h3><a href="#feature" id="feature">Feature</a></h3> 
---
> <h3><a href="#feature" name="feature">Feature</a></h3>
212c213
< <h4><a href="#header-parameters" id="header-parameters">Header Parameters</a></h4> 
---
> <h4><a href="#header-parameters" name="header-parameters">Header Parameters</a></h4>
217,220c218,221
<    <th> Description </th>
<    <th> Default Value </th>
<    <th> Mandatory </th>
<    <th> Related JIRA Issue</th>
---
>       <th>Description </th>
>       <th>Default Value </th>
>       <th>Mandatory </th>
>       <th>Related JIRA Issue</th>
226,229c227,230
<    <td> The name of the feature. Arbitrary String, relevant for merging. </td>
<    <td> <code>-</code> </td>
<    <td> yes </td>
<    <td> <code>-</code></td>
---
>       <td>The name of the feature. Arbitrary String, relevant for merging. </td>
>       <td><code>-</code> </td>
>       <td>yes </td>
>       <td><code>-</code></td>
233,236c234,237
<    <td> One of <code>plain</code> (default), <code>osgi.subsystem.feature</code>, <code>osgi.subsystem.application</code>, <code>osgi.subsystem.composite</code>. </td>
<    <td> <code>plain</code> </td>
<    <td> no </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-5149">SLING-5149</a></td>
---
>       <td>One of <code>plain</code> (default), <code>osgi.subsystem.feature</code>, <code>osgi.subsystem.application</code>, <code>osgi.subsystem.composite</code>. </td>
>       <td><code>plain</code> </td>
>       <td>no </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-5149">SLING-5149</a></td>
240,243c241,244
<    <td> The version of the feature. Purely for information purposes, has no functional effect. </td>
<    <td> <code>-</code> </td>
<    <td> no </td>
<    <td> <a href="https://issues.apache.org/jira/browse/SLING-6181">SLING-6181</a></td>
---
>       <td>The version of the feature. Purely for information purposes, has no functional effect. </td>
>       <td><code>-</code> </td>
>       <td>no </td>
>       <td><a href="https://issues.apache.org/jira/browse/SLING-6181">SLING-6181</a></td>
247,250c248,251
<    <td> The name(s) of the run modes for which this feature is relevant. The value contains the required run modes separated by <code>,</code> </td>
<    <td> <code>-</code> </td>
<    <td> no </td>
<    <td> <code>-</code></td>
---
>       <td>The name(s) of the run modes for which this feature is relevant. The value contains the required run modes separated by <code>,</code> </td>
>       <td><code>-</code> </td>
>       <td>no </td>
>       <td><code>-</code></td>
254c255
< <h3><a href="#artifact" id="artifact">Artifact</a></h3> 
---
> <h3><a href="#artifact" name="artifact">Artifact</a></h3>
256c257
< <h4><a href="#header-parameters" id="header-parameters">Header Parameters</a></h4> 
---
> <h4><a href="#header-parameters" name="header-parameters">Header Parameters</a></h4>
261,264c262,265
<    <th> Description </th>
<    <th> Default Value </th>
<    <th> Mandatory </th>
<    <th> Related JIRA Issue</th>
---
>       <th>Description </th>
>       <th>Default Value </th>
>       <th>Mandatory </th>
>       <th>Related JIRA Issue</th>
270,273c271,274
<    <td> The start level on which to start this artifact. </td>
<    <td> 0 </td>
<    <td> no </td>
<    <td> <code>-</code></td>
---
>       <td>The start level on which to start this artifact. </td>
>       <td>0 </td>
>       <td>no </td>
>       <td><code>-</code></td>
278c279
< <h4><a href="#content" id="content">Content</a></h4> 
---
> <h4><a href="#content" name="content">Content</a></h4>
280c281
< <pre><code>artifactUrl ::= [ &lt;repository-url&gt; '!' ] &lt;group-id&gt; '/' &lt;artifact-id&gt; [ '/' [version] [ '/' [type] [ '/' classifier ] ] ] ]
---
> <pre><code>artifactUrl ::= [ &lt;repository-url&gt; &#39;!&#39; ] &lt;group-id&gt; &#39;/&#39; &lt;artifact-id&gt; [ &#39;/&#39; [version] [ &#39;/&#39; [type] [ &#39;/&#39; classifier ] ] ] ]
288c289
< <h3><a href="#variables" id="variables">Variables</a></h3> 
---
> <h3><a href="#variables" name="variables">Variables</a></h3>
290c291
< <h4><a href="#content" id="content">Content</a></h4> 
---
> <h4><a href="#content" name="content">Content</a></h4>
292c293
< <pre><code>&lt;variable-name&gt; '=' &lt;variable-value&gt;
---
> <pre><code>&lt;variable-name&gt; &#39;=&#39; &lt;variable-value&gt;
295,297c296,298
< <h3><a href="#settings" id="settings">Settings</a></h3> 
< <p>This section defines OSGi framework properties.</p> 
< <h4><a href="#header-parameters" id="header-parameters">Header Parameters</a></h4> 
---
> <h3><a href="#settings" name="settings">Settings</a></h3>
> <p>This section defines OSGi framework properties. </p>
> <h4><a href="#header-parameters" name="header-parameters">Header Parameters</a></h4>
299c300
< <h4><a href="#content" id="content">Content</a></h4> 
---
> <h4><a href="#content" name="content">Content</a></h4>
301c302
< <pre><code>&lt;framework-property-name&gt; '=' &lt;framework-property-value&gt;
---
> <pre><code>&lt;framework-property-name&gt; &#39;=&#39; &lt;framework-property-value&gt;
303,304c304,305
< <h3><a href="#configurations" id="configurations">Configurations</a></h3> 
< <h4><a href="#header-parameters" id="header-parameters">Header Parameters</a></h4> 
---
> <h3><a href="#configurations" name="configurations">Configurations</a></h3>
> <h4><a href="#header-parameters" name="header-parameters">Header Parameters</a></h4>
306c307
< <h4><a href="#content" id="content">Content</a></h4> 
---
> <h4><a href="#content" name="content">Content</a></h4>
308c309
< <pre><code>name ::= &lt;pid&gt; ( '-' &lt;subname&gt; )
---
> <pre><code>name ::= &lt;pid&gt; ( &#39;-&#39; &lt;subname&gt; )
318c319
< <h5><a href="#default-configuration-format" id="default-configuration-format">Default Configuration Format</a></h5> 
---
> <h5><a href="#default-configuration-format" name="default-configuration-format">Default Configuration Format</a></h5>
323,324c324,325
< comment ::= '#' &lt;any&gt;
< header ::= prop '=' value
---
> comment ::= &#39;#&#39; &lt;any&gt;
> header ::= prop &#39;=&#39; value
326,330c327,331
< symbolic-name ::= token { '.' token } 
< token ::= { [ 0..9 ] | [ a..z ] | [ A..Z ] | '_' | '-' }
< value ::= [ type ] ( '[' values ']' | '(' values ')' | simple ) 
< values ::= simple { ',' simple } 
< simple ::= '"' stringsimple '"'
---
> symbolic-name ::= token { &#39;.&#39; token } 
> token ::= { [ 0..9 ] | [ a..z ] | [ A..Z ] | &#39;_&#39; | &#39;-&#39; }
> value ::= [ type ] ( &#39;[&#39; values &#39;]&#39; | &#39;(&#39; values &#39;)&#39; | simple ) 
> values ::= simple { &#39;,&#39; simple } 
> simple ::= &#39;&quot;&#39; stringsimple &#39;&quot;&#39;
347c348
< <h5><a href="#configurations-defined-through-properties" id="configurations-defined-through-properties">Configurations Defined through Properties</a></h5> 
---
> <h5><a href="#configurations-defined-through-properties" name="configurations-defined-through-properties">Configurations Defined through Properties</a></h5>
353c354
< <h3><a href="#additional-section" id="additional-section">Additional Section</a></h3> 
---
> <h3><a href="#additional-section" name="additional-section">Additional Section</a></h3>
355c356
< <h3><a href="#comments" id="comments">Comments</a></h3> 
---
> <h3><a href="#comments" name="comments">Comments</a></h3>
357c358
< <h2><a href="#slingstart-and-slingfeature-projects" id="slingstart-and-slingfeature-projects">Slingstart and Slingfeature projects</a></h2> 
---
> <h2><a href="#slingstart-and-slingfeature-projects" name="slingstart-and-slingfeature-projects">Slingstart and Slingfeature projects</a></h2>
370,372c371,373
< <h2><a href="#model-merging" id="model-merging">Model Merging</a></h2> 
< <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> 
---
> <h2><a href="#model-merging" name="model-merging">Model Merging</a></h2>
> <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>
375c376
< <h3><a href="#removing-and-changing-of-artifacts" id="removing-and-changing-of-artifacts">Removing and Changing of Artifacts</a></h3> 
---
> <h3><a href="#removing-and-changing-of-artifacts" name="removing-and-changing-of-artifacts">Removing and Changing of Artifacts</a></h3>
402c403
< <h3><a href="#removing-and-changing-of-configurations" id="removing-and-changing-of-configurations">Removing and Changing of Configurations</a></h3> 
---
> <h3><a href="#removing-and-changing-of-configurations" name="removing-and-changing-of-configurations">Removing and Changing of Configurations</a></h3>
406c407
<       foo="bar"
---
>       foo=&quot;bar&quot;
408c409
<       x="y"
---
>       x=&quot;y&quot;
413c414
<       a="b"
---
>       a=&quot;b&quot;
418c419
< <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>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>
422c423
<       a="b"
---
>       a=&quot;b&quot;
426c427
< <h2><a href="#starting-a-server" id="starting-a-server">Starting a server</a></h2> 
---
> <h2><a href="#starting-a-server" name="starting-a-server">Starting a server</a></h2>
439,442c440,443
<    <th> Type </th>
<    <th> Description </th>
<    <th> Default Value </th>
<    <th> Mandatory</th>
---
>       <th>Type </th>
>       <th>Description </th>
>       <th>Default Value </th>
>       <th>Mandatory</th>
448,451c449,452
<    <td> String </td>
<    <td> The port on which the server is listening for HTTP requests. Arbitrary if not set. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The port on which the server is listening for HTTP requests. Arbitrary if not set. </td>
>       <td>(-) </td>
>       <td>no</td>
455,458c456,459
<    <td> String </td>
<    <td> The instance id for this server. If not set the id is automatically generated from the run modes and the port. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The instance id for this server. If not set the id is automatically generated from the run modes and the port. </td>
>       <td>(-) </td>
>       <td>no</td>
462,465c463,466
<    <td> String </td>
<    <td> The comma-separated list of <a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html#run-modes">run modes</a> to be set for this server. Those will be set in addition to the ones being defined by the underlying model. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The comma-separated list of <a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html#run-modes">run modes</a> to be set for this server. Those will be set in addition to the ones being defined by the underlying model. </td>
>       <td>(-) </td>
>       <td>no</td>
469,472c470,473
<    <td> String </td>
<    <td> The context path. If not set then Sling is deployed in the root context. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The context path. If not set then Sling is deployed in the root context. </td>
>       <td>(-) </td>
>       <td>no</td>
476,479c477,480
<    <td> String </td>
<    <td> The TCP <a href="/documentation/the-sling-engine/the-sling-launchpad.html#control-port">control port</a> on which the server is listening for control commands. Arbitrary if not set. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The TCP <a href="/documentation/the-sling-engine/the-sling-launchpad.html#control-port">control port</a> on which the server is listening for control commands. Arbitrary if not set. </td>
>       <td>(-) </td>
>       <td>no</td>
483,486c484,487
<    <td> int </td>
<    <td> The number of instances which should be created from this server element. In this case the configuration acts as template. The port and controlPort for all servers being generated from this configuration are random (except for the first server). </td>
<    <td> 1 </td>
<    <td> no</td>
---
>       <td>int </td>
>       <td>The number of instances which should be created from this server element. In this case the configuration acts as template. The port and controlPort for all servers being generated from this configuration are random (except for the first server). </td>
>       <td>1 </td>
>       <td>no</td>
490,493c491,494
<    <td> String </td>
<    <td> The folder from where to start Sling. If not set is a folder in the project's build directory named like the <code>id</code>. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The folder from where to start Sling. If not set is a folder in the project's build directory named like the <code>id</code>. </td>
>       <td>(-) </td>
>       <td>no</td>
497,500c498,501
<    <td> String </td>
<    <td> The JVM options to use. </td>
<    <td> <code>-Xmx1024m -XX:MaxPermSize=256m -Djava.awt.headless=true</code> </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The JVM options to use. </td>
>       <td><code>-Xmx1024m -XX:MaxPermSize=256m -Djava.awt.headless=true</code> </td>
>       <td>no</td>
504,507c505,508
<    <td> String </td>
<    <td> Additional application options. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>Additional application options. </td>
>       <td>(-) </td>
>       <td>no</td>
511,514c512,515
<    <td> String </td>
<    <td> See below for an explanation. </td>
<    <td> (-) </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>See below for an explanation. </td>
>       <td>(-) </td>
>       <td>no</td>
518,521c519,522
<    <td> String </td>
<    <td> The relative filename of the file which receives both the standard output (stdout) and standard error (stderr) of the server processes. If null or empty string the server process inherits stdout from the parent process (i.e. the Maven process). The given filename must be relative to the working directory of the according server. This was added with <a href="https://issues.apache.org/jira/browse/SLING-6545">SLING-6545</a>. </td>
<    <td> null </td>
<    <td> no</td>
---
>       <td>String </td>
>       <td>The relative filename of the file which receives both the standard output (stdout) and standard error (stderr) of the server processes. If null or empty string the server process inherits stdout from the parent process (i.e. the Maven process). The given filename must be relative to the working directory of the according server. This was added with <a href="https://issues.apache.org/jira/browse/SLING-6545">SLING-6545</a>. </td>
>       <td>null </td>
>       <td>no</td>
525c526
< <h3><a href="#debugging" id="debugging">Debugging</a></h3> 
---
> <h3><a href="#debugging" name="debugging">Debugging</a></h3>
527c528
< <h2><a href="#stopping-a-server" id="stopping-a-server">Stopping a server</a></h2> 
---
> <h2><a href="#stopping-a-server" name="stopping-a-server">Stopping a server</a></h2>
529,530c530,531
< <h2><a href="#known-issues" id="known-issues">Known Issues</a></h2> 
< <h3><a href="#support-of-configuration-formats" id="support-of-configuration-formats">Support of configuration formats</a></h3> 
---
> <h2><a href="#known-issues" name="known-issues">Known Issues</a></h2>
> <h3><a href="#support-of-configuration-formats" name="support-of-configuration-formats">Support of configuration formats</a></h3>
diff -b -B -r ./documentation/development/testing-paxexam.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/testing-paxexam.html
102c102
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#overview" id="overview">Overview</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#overview" name="overview">Overview</a></h2>
107c107
< <h2><a href="#features" id="features">Features</a></h2> 
---
> <h2><a href="#features" name="features">Features</a></h2>
114,115c114,115
< <h2><a href="#getting-started" id="getting-started">Getting Started</a></h2> 
< <h3><a href="#1-add-required-dependencies" id="1-add-required-dependencies">1. Add required dependencies</a></h3> 
---
> <h2><a href="#getting-started" name="getting-started">Getting Started</a></h2>
> <h3><a href="#1-add-required-dependencies" name="1-add-required-dependencies">1. Add required dependencies</a></h3>
172c172
< <h3><a href="#2-configure-the-build-artifact-to-use-in-integration-testing" id="2-configure-the-build-artifact-to-use-in-integration-testing">2. Configure the build artifact to use in integration testing</a></h3> 
---
> <h3><a href="#2-configure-the-build-artifact-to-use-in-integration-testing" name="2-configure-the-build-artifact-to-use-in-integration-testing">2. Configure the build artifact to use in integration testing</a></h3>
211c211
< <h3><a href="#3-create-a-test-class-and-provide-a-configuration" id="3-create-a-test-class-and-provide-a-configuration">3. Create a test class and provide a <em>Configuration</em></a></h3> 
---
> <h3>3. Create a test class and provide a <em>Configuration</em></h3>
219c219
<         testBundle("bundle.filename"), // from TestSupport
---
>         testBundle(&quot;bundle.filename&quot;), // from TestSupport
237c237
< <h2><a href="#overriding-or-adding-versions" id="overriding-or-adding-versions">Overriding or adding versions</a></h2> 
---
> <h2><a href="#overriding-or-adding-versions" name="overriding-or-adding-versions">Overriding or adding versions</a></h2>
242c242
< <pre><code>SlingOptions.versionResolver.setVersion(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server", "1.1.0");
---
> <pre><code>SlingOptions.versionResolver.setVersion(SLING_GROUP_ID, &quot;org.apache.sling.jcr.oak.server&quot;, &quot;1.1.0&quot;);
245c245
< <pre><code>SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server");
---
> <pre><code>SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, &quot;org.apache.sling.jcr.oak.server&quot;);
247,249c247,249
< <h2><a href="#examples" id="examples">Examples</a></h2> 
< <h3><a href="#set-up-a-tailored-sling-instance" id="set-up-a-tailored-sling-instance">Set up a tailored Sling instance</a></h3> 
< <p>The <code>FreemarkerTestSupport</code> below from <a href="https://github.com/apache/sling-org-apache-sling-scripting-freemarker">Scripting FreeMarker</a> shows how to set up a tailored Sling instance to test Scripting FreeMarker itself.</p> 
---
> <h2><a href="#examples" name="examples">Examples</a></h2>
> <h3><a href="#set-up-a-tailored-sling-instance" name="set-up-a-tailored-sling-instance">Set up a tailored Sling instance</a></h3>
> <p>The <code>FreemarkerTestSupport</code> below from <a href="https://github.com/apache/sling-org-apache-sling-scripting-freemarker">Scripting FreeMarker</a> shows how to set up a tailored Sling instance to test Scripting FreeMarker itself. </p>
267c267
<     @Filter(value = "(names=freemarker)")
---
>     @Filter(value = &quot;(names=freemarker)&quot;)
275,277c275,277
<             testBundle("bundle.filename"),
<             mavenBundle().groupId("org.freemarker").artifactId("freemarker").versionAsInProject(),
<             mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxp-api-1.4").versionAsInProject(),
---
>             testBundle(&quot;bundle.filename&quot;),
>             mavenBundle().groupId(&quot;org.freemarker&quot;).artifactId(&quot;freemarker&quot;).versionAsInProject(),
>             mavenBundle().groupId(&quot;org.apache.servicemix.specs&quot;).artifactId(&quot;org.apache.servicemix.specs.jaxp-api-1.4&quot;).versionAsInProject(),
280,281c280,281
<             mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
<             mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
---
>             mavenBundle().groupId(&quot;org.jsoup&quot;).artifactId(&quot;jsoup&quot;).versionAsInProject(),
>             mavenBundle().groupId(&quot;org.apache.servicemix.bundles&quot;).artifactId(&quot;org.apache.servicemix.bundles.hamcrest&quot;).versionAsInProject(),
288,292c288,292
<         testProbeBuilder.setHeader(Constants.EXPORT_PACKAGE, "org.apache.sling.scripting.freemarker.it.app");
<         testProbeBuilder.setHeader("Sling-Model-Packages", "org.apache.sling.scripting.freemarker.it.app");
<         testProbeBuilder.setHeader("Sling-Initial-Content", String.join(",",
<             "apps/freemarker;path:=/apps/freemarker;overwrite:=true;uninstall:=true",
<             "content;path:=/content;overwrite:=true;uninstall:=true"
---
>         testProbeBuilder.setHeader(Constants.EXPORT_PACKAGE, &quot;org.apache.sling.scripting.freemarker.it.app&quot;);
>         testProbeBuilder.setHeader(&quot;Sling-Model-Packages&quot;, &quot;org.apache.sling.scripting.freemarker.it.app&quot;);
>         testProbeBuilder.setHeader(&quot;Sling-Initial-Content&quot;, String.join(&quot;,&quot;,
>             &quot;apps/freemarker;path:=/apps/freemarker;overwrite:=true;uninstall:=true&quot;,
>             &quot;content;path:=/content;overwrite:=true;uninstall:=true&quot;
309c309
< <h3><a href="#provide-additional-osgi-services-for-testing" id="provide-additional-osgi-services-for-testing">Provide additional OSGi services for testing</a></h3> 
---
> <h3><a href="#provide-additional-osgi-services-for-testing" name="provide-additional-osgi-services-for-testing">Provide additional OSGi services for testing</a></h3>
316c316
<     @Filter("(name=bar)")
---
>     @Filter(&quot;(name=bar)&quot;)
334c334
<         final Object configuration = FieldUtils.readDeclaredField(scriptEngineFactory, "configuration", true);
---
>         final Object configuration = FieldUtils.readDeclaredField(scriptEngineFactory, &quot;configuration&quot;, true);
336c336
<         assertThat(configuration.getClass().getName(), is("org.apache.sling.scripting.freemarker.it.app.Ranked2Configuration"));
---
>         assertThat(configuration.getClass().getName(), is(&quot;org.apache.sling.scripting.freemarker.it.app.Ranked2Configuration&quot;));
345,346c345,346
<         "name=bar",
<         "service.ranking:Integer=2"
---
>         &quot;name=bar&quot;,
>         &quot;service.ranking:Integer=2&quot;
357c357
< <h3><a href="#testing-html-over-http-with-jsoup" id="testing-html-over-http-with-jsoup">Testing HTML over HTTP with jsoup</a></h3> 
---
> <h3><a href="#testing-html-over-http-with-jsoup" name="testing-html-over-http-with-jsoup">Testing HTML over HTTP with jsoup</a></h3>
366c366
<     @Filter(value = "(path=/apps/freemarker/page/simple/html.ftl)")
---
>     @Filter(value = &quot;(path=/apps/freemarker/page/simple/html.ftl)&quot;)
373,374c373,374
<             factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter")
<                 .put("path", "/apps/freemarker/page/simple/html.ftl")
---
>             factoryConfiguration(&quot;org.apache.sling.resource.presence.internal.ResourcePresenter&quot;)
>                 .put(&quot;path&quot;, &quot;/apps/freemarker/page/simple/html.ftl&quot;)
381c381
<         final String url = String.format("http://localhost:%s/freemarker/simple.html", httpPort());
---
>         final String url = String.format(&quot;http://localhost:%s/freemarker/simple.html&quot;, httpPort());
387c387
<         assertThat(document.title(), is("freemarker simple"));
---
>         assertThat(document.title(), is(&quot;freemarker simple&quot;));
392,393c392,393
<         final Element name = document.getElementById("name");
<         assertThat(name.text(), is("simple"));
---
>         final Element name = document.getElementById(&quot;name&quot;);
>         assertThat(name.text(), is(&quot;simple&quot;));
398c398
< <h2><a href="#logging" id="logging">Logging</a></h2> 
---
> <h2><a href="#logging" name="logging">Logging</a></h2>
diff -b -B -r ./documentation/development/version-policy.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development/version-policy.html
98c98
<   Please note that this page is currently in draft stage and still being discussed. 
---
> Please note that this page is currently in draft stage and still being discussed.
102c102
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
115c115
< <h3><a href="#big-sling-releases" id="big-sling-releases">Big Sling Releases</a></h3> 
---
> <h3><a href="#big-sling-releases" name="big-sling-releases">Big Sling Releases</a></h3>
117c117
< <h3><a href="#sling-bundles" id="sling-bundles">Sling Bundles</a></h3> 
---
> <h3><a href="#sling-bundles" name="sling-bundles">Sling Bundles</a></h3>
119c119
< <h3><a href="#package-exports" id="package-exports">Package Exports</a></h3> 
---
> <h3><a href="#package-exports" name="package-exports">Package Exports</a></h3>
141c141
< <h3><a href="#future" id="future">Future</a></h3> 
---
> <h3><a href="#future" name="future">Future</a></h3>
147c147
< @Export(version = "1.0")
---
> @Export(version = &quot;1.0&quot;)
152,153c152,153
< <h2><a href="#version-number-syntax" id="version-number-syntax">Version Number Syntax</a></h2> 
< <p>As a small reminder, this is how a version number is constructed: In OSGi version numbers are composed of four (4) segments: three integers and one string named <em>major</em>.<em>minor</em>.<em>micro</em>.<em>qualifier</em>.</p> 
---
> <h2><a href="#version-number-syntax" name="version-number-syntax">Version Number Syntax</a></h2>
> <p>As a small reminder, this is how a version number is constructed: In OSGi version numbers are composed of four (4) segments: three integers and one string named <em>major</em>._minor_._micro_._qualifier_.</p>
161c161
< <h2><a href="#evolution-of-exported-package-versions" id="evolution-of-exported-package-versions">Evolution of Exported Package Versions</a></h2> 
---
> <h2><a href="#evolution-of-exported-package-versions" name="evolution-of-exported-package-versions">Evolution of Exported Package Versions</a></h2>
171c171
< <h2><a href="#evolution-of-bundle-versions" id="evolution-of-bundle-versions">Evolution of Bundle Versions</a></h2> 
---
> <h2><a href="#evolution-of-bundle-versions" name="evolution-of-bundle-versions">Evolution of Bundle Versions</a></h2>
180,181c180,181
< <h2><a href="#examples" id="examples">Examples</a></h2> 
< <h3><a href="#pure-api-bundle" id="pure-api-bundle">Pure API Bundle</a></h3> 
---
> <h2><a href="#examples" name="examples">Examples</a></h2>
> <h3><a href="#pure-api-bundle" name="pure-api-bundle">Pure API Bundle</a></h3>
189,192c189,192
<    <th> Description </th>
<    <th> <code>api</code> package </th>
<    <th> <code>resource</code> package </th>
<    <th> bundle </th>
---
>       <th>Description </th>
>       <th><code>api</code> package </th>
>       <th><code>resource</code> package </th>
>       <th>bundle </th>
197,200c197,200
<    <td> Initial Release </td>
<    <td> 1.0.0 </td>
<    <td> 1.0.0 </td>
<    <td> 1.0.0 </td>
---
>       <td>Initial Release </td>
>       <td>1.0.0 </td>
>       <td>1.0.0 </td>
>       <td>1.0.0 </td>
203,206c203,206
<    <td> Bug fix in a <code>resource</code> class </td>
<    <td> 1.0.0 </td>
<    <td> 1.0.2 </td>
<    <td> 1.0.2 </td>
---
>       <td>Bug fix in a <code>resource</code> class </td>
>       <td>1.0.0 </td>
>       <td>1.0.2 </td>
>       <td>1.0.2 </td>
209,212c209,212
<    <td> New API in the <code>resource</code> package </td>
<    <td> 1.0.0 </td>
<    <td> 1.1.0 </td>
<    <td> 1.1.0 </td>
---
>       <td>New API in the <code>resource</code> package </td>
>       <td>1.0.0 </td>
>       <td>1.1.0 </td>
>       <td>1.1.0 </td>
215,218c215,218
<    <td> New API in the <code>api</code> package </td>
<    <td> 1.1.0 </td>
<    <td> 1.1.0 </td>
<    <td> 1.2.0 </td>
---
>       <td>New API in the <code>api</code> package </td>
>       <td>1.1.0 </td>
>       <td>1.1.0 </td>
>       <td>1.2.0 </td>
221,224c221,224
<    <td> API breakage in the <code>api</code> package </td>
<    <td> 2.0.0 </td>
<    <td> 1.1.0 </td>
<    <td> 2.0.0 </td>
---
>       <td>API breakage in the <code>api</code> package </td>
>       <td>2.0.0 </td>
>       <td>1.1.0 </td>
>       <td>2.0.0 </td>
228c228
< <h3><a href="#implementation-bundle-providing-api" id="implementation-bundle-providing-api">Implementation Bundle providing API</a></h3> 
---
> <h3><a href="#implementation-bundle-providing-api" name="implementation-bundle-providing-api">Implementation Bundle providing API</a></h3>
234,236c234,236
<    <th> Description </th>
<    <th> <code>engine</code> package </th>
<    <th> bundle </th>
---
>       <th>Description </th>
>       <th><code>engine</code> package </th>
>       <th>bundle </th>
241,243c241,243
<    <td> Initial Release </td>
<    <td> 1.0.0 </td>
<    <td> 1.0.0 </td>
---
>       <td>Initial Release </td>
>       <td>1.0.0 </td>
>       <td>1.0.0 </td>
246,248c246,248
<    <td> Bug fix in a <code>engine</code> class </td>
<    <td> 1.0.2 </td>
<    <td> 1.0.2 </td>
---
>       <td>Bug fix in a <code>engine</code> class </td>
>       <td>1.0.2 </td>
>       <td>1.0.2 </td>
251,253c251,253
<    <td> Bug fix in an internal calss </td>
<    <td> 1.0.2 </td>
<    <td> 1.0.4 </td>
---
>       <td>Bug fix in an internal calss </td>
>       <td>1.0.2 </td>
>       <td>1.0.4 </td>
256,258c256,258
<    <td> New API in the <code>engine</code> package </td>
<    <td> 1.1.0 </td>
<    <td> 1.1.0 </td>
---
>       <td>New API in the <code>engine</code> package </td>
>       <td>1.1.0 </td>
>       <td>1.1.0 </td>
261,263c261,263
<    <td> Implement new API from <code>api</code> 1.1.0 </td>
<    <td> 1.1.0 </td>
<    <td> 1.2.0 </td>
---
>       <td>Implement new API from <code>api</code> 1.1.0 </td>
>       <td>1.1.0 </td>
>       <td>1.2.0 </td>
266,268c266,268
<    <td> Refactor internal classes </td>
<    <td> 1.1.0 </td>
<    <td> 1.3.0 </td>
---
>       <td>Refactor internal classes </td>
>       <td>1.1.0 </td>
>       <td>1.3.0 </td>
271,273c271,273
<    <td> Implement API from <code>api</code> 2.0.0 </td>
<    <td> 1.1.0 </td>
<    <td> 2.0.0 </td>
---
>       <td>Implement API from <code>api</code> 2.0.0 </td>
>       <td>1.1.0 </td>
>       <td>2.0.0 </td>
277c277
< <h3><a href="#pure-implementation-bundle" id="pure-implementation-bundle">Pure Implementation Bundle</a></h3> 
---
> <h3><a href="#pure-implementation-bundle" name="pure-implementation-bundle">Pure Implementation Bundle</a></h3>
279c279
< <h2><a href="#importing-packages" id="importing-packages">Importing Packages</a></h2> 
---
> <h2><a href="#importing-packages" name="importing-packages">Importing Packages</a></h2>
294c294
< <h3><a href="#future" id="future">Future</a></h3> 
---
> <h3><a href="#future" name="future">Future</a></h3>
296c296
< <h2><a href="#references" id="references">References</a></h2> 
---
> <h2><a href="#references" name="references">References</a></h2>
diff -b -B -r ./documentation/development.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/development.html
95c95
< <h2><a href="#using-sling-as-your-development-framework" id="using-sling-as-your-development-framework">Using Sling as your Development Framework</a></h2> 
---
> <h2><a href="#using-sling-as-your-development-framework" name="using-sling-as-your-development-framework">Using Sling as your Development Framework</a></h2>
108c108
< <h2><a href="#testing-sling-based-applications" id="testing-sling-based-applications">Testing Sling-based Applications</a></h2> 
---
> <h2><a href="#testing-sling-based-applications" name="testing-sling-based-applications">Testing Sling-based Applications</a></h2>
119c119
< <h2><a href="#maven-stuff" id="maven-stuff">Maven Stuff</a></h2> 
---
> <h2><a href="#maven-stuff" name="maven-stuff">Maven Stuff</a></h2>
130c130
< <h2><a href="#sling-development" id="sling-development">Sling Development</a></h2> 
---
> <h2><a href="#sling-development" name="sling-development">Sling Development</a></h2>
diff -b -B -r ./documentation/getting-started/discover-sling-in-15-minutes.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/getting-started/discover-sling-in-15-minutes.html
99c99
< <h2><a href="#see-also" id="see-also">See Also</a></h2> 
---
> <h2><a href="#see-also" name="see-also">See Also</a></h2>
102c102
< <h2><a href="#prerequisites" id="prerequisites">Prerequisites</a></h2> 
---
> <h2><a href="#prerequisites" name="prerequisites">Prerequisites</a></h2>
105c105
< <h2><a href="#getting-started" id="getting-started">Getting Started</a></h2> 
---
> <h2><a href="#getting-started" name="getting-started">Getting Started</a></h2>
109c109
< <h2><a href="#create-some-content" id="create-some-content">Create some content</a></h2> 
---
> <h2><a href="#create-some-content" name="create-some-content">Create some content</a></h2>
112c112
< <pre><code>curl -u admin:admin -F"sling:resourceType=foo/bar" -F"title=some title" http://localhost:8080/content/mynode
---
> <pre><code>curl -u admin:admin -F&quot;sling:resourceType=foo/bar&quot; -F&quot;title=some title&quot; http://localhost:8080/content/mynode
117,118c117,118
< <p>This returns the properties of the <code>/content/mynode</code> in JSON format as we have created it above.</p> 
< <pre><code>{"title":"some title","sling:resourceType":"foo/bar","jcr:primaryType":"nt:unstructured"}
---
> <p>This returns the properties of the <code>/content/mynode</code> in JSON format as we have created it above. </p>
> <pre><code>{&quot;title&quot;:&quot;some title&quot;,&quot;sling:resourceType&quot;:&quot;foo/bar&quot;,&quot;jcr:primaryType&quot;:&quot;nt:unstructured&quot;}
122c122
< <h2><a href="#render-your-content-using-server-side-javascript-esp" id="render-your-content-using-server-side-javascript-esp">Render your content using server-side javascript (ESP)</a></h2> 
---
> <h2><a href="#render-your-content-using-server-side-javascript-esp-" name="render-your-content-using-server-side-javascript-esp-">Render your content using server-side javascript (ESP)</a></h2>
149c149
< <h2><a href="#what-next" id="what-next">What next?</a></h2> 
---
> <h2><a href="#what-next-" name="what-next-">What next?</a></h2>
152,153c152,153
< <h2><a href="#additional-examples" id="additional-examples">Additional examples</a></h2> 
< <h3><a href="#let-sling-generate-the-path-of-a-newly-created-node" id="let-sling-generate-the-path-of-a-newly-created-node">Let Sling generate the path of a newly created node.</a></h3> 
---
> <h2><a href="#additional-examples" name="additional-examples">Additional examples</a></h2>
> <h3><a href="#let-sling-generate-the-path-of-a-newly-created-node-" name="let-sling-generate-the-path-of-a-newly-created-node-">Let Sling generate the path of a newly created node.</a></h3>
157c157
< <pre><code>curl -X POST -u admin:admin "http://localhost:8080/content/blog"
---
> <pre><code>curl -X POST -u admin:admin &quot;http://localhost:8080/content/blog&quot;
160c160
< <pre><code>curl -D - -u admin:admin -F"title=Adventures with Sling" "http://localhost:8080/content/blog/"
---
> <pre><code>curl -D - -u admin:admin -F&quot;title=Adventures with Sling&quot; &quot;http://localhost:8080/content/blog/&quot;
168c168
< <h3><a href="#add-a-page-header-with-slinginclude" id="add-a-page-header-with-slinginclude">Add a page header with sling.include</a></h3> 
---
> <h3><a href="#add-a-page-header-with-sling-include" name="add-a-page-header-with-sling-include">Add a page header with sling.include</a></h3>
174,175c174,175
<   &lt;p style="color:blue;"&gt;
<     &lt;img src="/images/sling.jpg" align="right"/&gt;
---
>   &lt;p style=&quot;color:blue;&quot;&gt;
>     &lt;img src=&quot;/images/sling.jpg&quot; align=&quot;right&quot;/&gt;
185c185
< <pre><code>curl -u admin:admin -F"sling:resourceType=foo/header" -F"headline=Hello, Sling world" http://localhost:8080/content/header
---
> <pre><code>curl -u admin:admin -F&quot;sling:resourceType=foo/header&quot; -F&quot;headline=Hello, Sling world&quot; http://localhost:8080/content/header
195,196c195,196
<     &lt;div id="header"&gt;
<       &lt;% sling.include("/content/header"); %&gt;
---
>     &lt;div id=&quot;header&quot;&gt;
>       &lt;% sling.include(&quot;/content/header&quot;); %&gt;
diff -b -B -r ./documentation/getting-started.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/getting-started.html
92c92
< <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#run-the-sling-application" id="run-the-sling-application">Run the Sling Application</a></h1> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#run-the-sling-application" name="run-the-sling-application">Run the Sling Application</a></h1>
94c94
< <h2><a href="#sling-docker-image" id="sling-docker-image">Sling Docker Image</a></h2> 
---
> <h2><a href="#sling-docker-image" name="sling-docker-image">Sling Docker Image</a></h2>
101c101
< <h2><a href="#sling-download" id="sling-download">Sling Download</a></h2> 
---
> <h2><a href="#sling-download" name="sling-download">Sling Download</a></h2>
106c106
< <h2><a href="#sling-karaf" id="sling-karaf">Sling Karaf</a></h2> 
---
> <h2><a href="#sling-karaf" name="sling-karaf">Sling Karaf</a></h2>
108c108
< <h1><a href="#explore-sling" id="explore-sling">Explore Sling</a></h1> 
---
> <h1><a href="#explore-sling" name="explore-sling">Explore Sling</a></h1>
111,112c111,112
< <h1><a href="#where-to-head-from-here" id="where-to-head-from-here">Where to head from here</a></h1> 
< <p>We're on the way to update the documentation to make it more easy to get in touch with Sling. We recommend you read through following topics to get as fast as possible into Sling:</p> 
---
> <h1><a href="#where-to-head-from-here" name="where-to-head-from-here">Where to head from here</a></h1>
> <p>We're on the way to update the documentation to make it more easy to get in touch with Sling. We recommend you read through following topics to get as fast as possible into Sling: </p>
diff -b -B -r ./documentation/karaf.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/karaf.html
93c93
< <h2><a href="#sling-karaf-features" id="sling-karaf-features">Sling Karaf Features</a></h2> 
---
> <h2><a href="#sling-karaf-features" name="sling-karaf-features">Sling Karaf Features</a></h2>
96c96
< <h2><a href="#sling-karaf-configs" id="sling-karaf-configs">Sling Karaf Configs</a></h2> 
---
> <h2><a href="#sling-karaf-configs" name="sling-karaf-configs">Sling Karaf Configs</a></h2>
99c99
< <h2><a href="#sling-karaf-distribution" id="sling-karaf-distribution">Sling Karaf Distribution</a></h2> 
---
> <h2><a href="#sling-karaf-distribution" name="sling-karaf-distribution">Sling Karaf Distribution</a></h2>
102c102
< <h2><a href="#getting-started" id="getting-started">Getting Started</a></h2> 
---
> <h2><a href="#getting-started" name="getting-started">Getting Started</a></h2>
diff -b -B -r ./documentation/legacy/logging.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/legacy/logging.html
95,96c95,97
<   This document is for 3.x release of Sling Commons Log components. Refer to 
<  <a href="http://sling.apache.org/documentation/development/logging.html">Logging</a> for documentation related to newer version. 
---
> This document is for 3.x release of Sling Commons Log components. Refer to
> <a href="http://sling.apache.org/documentation/development/logging.html">Logging</a> for documentation related
> to newer version.
98c99
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
108c109,110
<   </ul> </li> 
---
>     </ul>
>   </li>
111c113
< <h2><a href="#initial-configuration" id="initial-configuration">Initial Configuration</a></h2> 
---
> <h2><a href="#initial-configuration" name="initial-configuration">Initial Configuration</a></h2>
116,118c118,120
<    <th> Property </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default </th>
>       <th>Description </th>
123,125c125,127
<    <td> <code>org.apache.sling.commons.log.level</code> </td>
<    <td> <code>INFO</code> </td>
<    <td> Sets the initial logging level of the root logger. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
---
>       <td><code>org.apache.sling.commons.log.level</code> </td>
>       <td><code>INFO</code> </td>
>       <td>Sets the initial logging level of the root logger. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
128,130c130,132
<    <td> <code>org.apache.sling.commons.log.file</code> </td>
<    <td> undefined </td>
<    <td> Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
---
>       <td><code>org.apache.sling.commons.log.file</code> </td>
>       <td>undefined </td>
>       <td>Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
133,135c135,137
<    <td> <code>org.apache.sling.commons.log.file.number</code> </td>
<    <td> 5 </td>
<    <td> The number of rotated files to keep. </td>
---
>       <td><code>org.apache.sling.commons.log.file.number</code> </td>
>       <td>5 </td>
>       <td>The number of rotated files to keep. </td>
138,140c140,142
<    <td> <code>org.apache.sling.commons.log.file.size</code> </td>
<    <td> '.'yyyy-MM-dd </td>
<    <td> Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
---
>       <td><code>org.apache.sling.commons.log.file.size</code> </td>
>       <td>'.'yyyy-MM-dd </td>
>       <td>Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
143,145c145,147
<    <td> <code>org.apache.sling.commons.log.pattern</code> </td>
<    <td> {0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
<    <td> The <code>MessageFormat</code> pattern to use for formatting log messages with the root logger. </td>
---
>       <td><code>org.apache.sling.commons.log.pattern</code> </td>
>       <td>{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
>       <td>The <code>MessageFormat</code> pattern to use for formatting log messages with the root logger. </td>
148,150c150,152
<    <td> <code>org.apache.sling.commons.log.julenabled</code> </td>
<    <td> n/a </td>
<    <td> Enables the <code>java.util.logging</code> support. </td>
---
>       <td><code>org.apache.sling.commons.log.julenabled</code> </td>
>       <td>n/a </td>
>       <td>Enables the <code>java.util.logging</code> support. </td>
154c156
< <h2><a href="#user-configuration" id="user-configuration">User Configuration</a></h2> 
---
> <h2><a href="#user-configuration" name="user-configuration">User Configuration</a></h2>
156c158
< <h3><a href="#logger-configuration" id="logger-configuration">Logger Configuration</a></h3> 
---
> <h3><a href="#logger-configuration" name="logger-configuration">Logger Configuration</a></h3>
162,165c164,167
<    <th> Property </th>
<    <th> Type </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Type </th>
>       <th>Default </th>
>       <th>Description </th>
170,191c172,187
<    <td> <code>org.apache.sling.commons.log.level</code> </td>
<    <td> <code>String</code> </td>
<    <td> <code>INFO</code> </td>
<    <td> Sets the logging level of the loggers. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
<   </tr> 
<   <tr>
<    <td> <code>org.apache.sling.commons.log.file</code> </td>
<    <td> <code>String</code> </td>
<    <td> undefined </td>
<    <td> Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. This property should refer to the file name of a configured Log Writer (see below). If no Log Writer is configured with the same file name an implicit Log Writer configuration with default configuration is created. </td>
<   </tr> 
<   <tr>
<    <td> <code>org.apache.sling.commons.log.pattern</code> </td>
<    <td> <code>String</code> </td>
<    <td> {0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
<    <td> The <code>java.util.MessageFormat</code> pattern to use for formatting log messages with the root logger. This is a <code>java.util.MessageFormat</code> pattern supporting up to six arguments: {0} The timestamp of type <code>java.util.Date</code>, {1} the log marker, {2} the name of the current thread, {3} the name of the logger, {4} the debug level and {5} the actual debug message. If the log call includes a Throwable, the stacktrace is just appended to the message regardless of the pattern. </td>
<   </tr> 
<   <tr>
<    <td> <code>org.apache.sling.commons.log.names</code> </td>
<    <td> <code>String\[\]</code> </td>
<    <td> -- </td>
<    <td> A list of logger names to which this configuration applies. </td>
---
>       <td><code>org.apache.sling.commons.log.level</code> </td>
>       <td><code>String</code> </td>
>       <td><code>INFO</code> </td>
>       <td>Sets the logging level of the loggers. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code> and <code>FATAL</code>. </td>
>     </tr>
>     <tr>
>       <td><code>org.apache.sling.commons.log.file</code> </td>
>       <td><code>String</code> </td>
>       <td>undefined </td>
>       <td>Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. This property should refer to the file name of a configured Log Writer (see below). If no Log Writer is configured with the same file name an implicit Log Writer configuration with default configuration is created. </td>
>     </tr>
>     <tr>
>       <td><code>org.apache.sling.commons.log.pattern</code> </td>
>       <td><code>String</code> </td>
>       <td>{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* {2} {3} {5} </td>
>       <td>The <code>java.util.MessageFormat</code> pattern to use for formatting log messages with the root logger. This is a <code>java.util.MessageFormat</code> pattern supporting up to six arguments: {0} The timestamp of type <code>java.util.Date</code>, {1} the log marker, {2} the name of the current thread, {3} the name of the logger, {4} the debug level and {5} the actual debug message. If the log call includes a Throwable, the stacktrace is just appended to the message regardless of the pattern. </td>
195,196c191,193
< <p>Note that multiple Logger Configurations may refer to the same Log Writer Configuration. If no Log Writer Configuration exists whose file name matches the file name set on the Logger Configuration an implicit Log Writer Configuration with default setup (daily log rotation) is internally created.</p> 
< <h3><a href="#log-writer-configuration" id="log-writer-configuration">Log Writer Configuration</a></h3> 
---
> <p>| <code>org.apache.sling.commons.log.names</code> | <code>String\[\]</code> | -- | A list of logger names to which this configuration applies. |</p>
> <p>Note that multiple Logger Configurations may refer to the same Log Writer Configuration. If no Log Writer Configuration exists whose file name matches the file name set on the Logger Configuration an implicit Log Writer Configuration with default setup (daily log rotation) is internally created. </p>
> <h3><a href="#log-writer-configuration" name="log-writer-configuration">Log Writer Configuration</a></h3>
202,204c199,201
<    <th> Property </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default </th>
>       <th>Description </th>
209,211c206,208
<    <td> <code>org.apache.sling.commons.log.file</code> </td>
<    <td> undefined </td>
<    <td> Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
---
>       <td><code>org.apache.sling.commons.log.file</code> </td>
>       <td>undefined </td>
>       <td>Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to <code>System.out</code>. </td>
214,216c211,213
<    <td> <code>org.apache.sling.commons.log.file.number</code> </td>
<    <td> 5 </td>
<    <td> The number of rotated files to keep. </td>
---
>       <td><code>org.apache.sling.commons.log.file.number</code> </td>
>       <td>5 </td>
>       <td>The number of rotated files to keep. </td>
219,221c216,218
<    <td> <code>org.apache.sling.commons.log.file.size</code> </td>
<    <td> '.'yyyy-MM-dd </td>
<    <td> Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
---
>       <td><code>org.apache.sling.commons.log.file.size</code> </td>
>       <td>'.'yyyy-MM-dd </td>
>       <td>Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <em>Log File Rotation</em> below for full details on log file rotation. </td>
226c223
< <h2><a href="#log-file-rotation" id="log-file-rotation">Log File Rotation</a></h2> 
---
> <h2><a href="#log-file-rotation" name="log-file-rotation">Log File Rotation</a></h2>
228,229c225,226
< <p>As of version 2.0.6 of the Sling Commons Log bundle, the default value for log file scheduling is <code>'.'yyyy-MM-dd</code> causing daily log rotation. Previously log rotation defaulted to a 10MB file size limit.</p> 
< <h3><a href="#scheduled-rotation" id="scheduled-rotation">Scheduled Rotation</a></h3> 
---
> <p>As of version 2.0.6 of the Sling Commons Log bundle, the default value for log file scheduling is <code>&#39;.&#39;yyyy-MM-dd</code> causing daily log rotation. Previously log rotation defaulted to a 10MB file size limit.</p>
> <h3><a href="#scheduled-rotation" name="scheduled-rotation">Scheduled Rotation</a></h3>
231c228
< <p>For example, if the log file is configured as <code>/foo/bar.log</code> and the pattern set to <code>'.'yyyy-MM-dd</code>, on 2001-02-16 at midnight, the logging file <code>/foo/bar.log</code> will be renamed to <code>/foo/bar.log.2001-02-16</code> and logging for 2001-02-17 will continue in a new <code>/foo/bar.log</code> file until it rolls over the next day.</p> 
---
> <p>For example, if the log file is configured as <code>/foo/bar.log</code> and the pattern set to <code>&#39;.&#39;yyyy-MM-dd</code>, on 2001-02-16 at midnight, the logging file <code>/foo/bar.log</code> will be renamed to <code>/foo/bar.log.2001-02-16</code> and logging for 2001-02-17 will continue in a new <code>/foo/bar.log</code> file until it rolls over the next day.</p>
236,238c233,235
<    <th> DatePattern </th>
<    <th> Rollover schedule </th>
<    <th> Example </th>
---
>       <th>DatePattern </th>
>       <th>Rollover schedule </th>
>       <th>Example </th>
243,245c240,242
<    <td> <code>'.'yyyy-MM</code> </td>
<    <td> Rollover at the beginning of each month </td>
<    <td> At midnight of May 31st, 2002 <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-05</code>. Logging for the month of June will be output to <code>/foo/bar.log</code> until it is also rolled over the next month. </td>
---
>       <td><code>&#39;.&#39;yyyy-MM</code> </td>
>       <td>Rollover at the beginning of each month </td>
>       <td>At midnight of May 31st, 2002 <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-05</code>. Logging for the month of June will be output to <code>/foo/bar.log</code> until it is also rolled over the next month. </td>
248,250c245,247
<    <td> <code>'.'yyyy-ww</code> </td>
<    <td> Rollover at the first day of each week. The first day of the week depends on the locale. </td>
<    <td> Assuming the first day of the week is Sunday, on Saturday midnight, June 9th 2002, the file <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-23</code>. Logging for the 24th week of 2002 will be output to <code>/foo/bar.log</code> until it is rolled over the next week. </td>
---
>       <td><code>&#39;.&#39;yyyy-ww</code> </td>
>       <td>Rollover at the first day of each week. The first day of the week depends on the locale. </td>
>       <td>Assuming the first day of the week is Sunday, on Saturday midnight, June 9th 2002, the file <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-23</code>. Logging for the 24th week of 2002 will be output to <code>/foo/bar.log</code> until it is rolled over the next week. </td>
253,255c250,252
<    <td> <code>'.'yyyy-MM-dd</code> </td>
<    <td> Rollover at midnight each day.</td>
<    <td> At midnight, on March 8th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-08</code>. Logging for the 9th day of March will be output to <code>/foo/bar.log</code> until it is rolled over the next day.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd</code> </td>
>       <td>Rollover at midnight each day.</td>
>       <td>At midnight, on March 8th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-08</code>. Logging for the 9th day of March will be output to <code>/foo/bar.log</code> until it is rolled over the next day.</td>
258,260c255,257
<    <td> <code>'.'yyyy-MM-dd-a</code> </td>
<    <td> Rollover at midnight and midday of each day.</td>
<    <td> at noon, on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-AM</code>. Logging for the afternoon of the 9th will be output to <code>/foo/bar.log</code> until it is rolled over at midnight.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd-a</code> </td>
>       <td>Rollover at midnight and midday of each day.</td>
>       <td>at noon, on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-AM</code>. Logging for the afternoon of the 9th will be output to <code>/foo/bar.log</code> until it is rolled over at midnight.</td>
263,265c260,262
<    <td> <code>'.'yyyy-MM-dd-HH</code> </td>
<    <td> Rollover at the top of every hour.</td>
<    <td> At approximately 11:00.000 o'clock on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-10</code>. Logging for the 11th hour of the 9th of March will be output to <code>/foo/bar.log</code> until it is rolled over at the beginning of the next hour.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd-HH</code> </td>
>       <td>Rollover at the top of every hour.</td>
>       <td>At approximately 11:00.000 o'clock on March 9th, 2002, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2002-03-09-10</code>. Logging for the 11th hour of the 9th of March will be output to <code>/foo/bar.log</code> until it is rolled over at the beginning of the next hour.</td>
268,270c265,267
<    <td> <code>'.'yyyy-MM-dd-HH-mm</code> </td>
<    <td> Rollover at the beginning of every minute.</td>
<    <td> At approximately 11:23,000, on March 9th, 2001, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2001-03-09-10-22</code>. Logging for the minute of 11:23 (9th of March) will be output to <code>/foo/bar.log</code> until it is rolled over the next minute.</td>
---
>       <td><code>&#39;.&#39;yyyy-MM-dd-HH-mm</code> </td>
>       <td>Rollover at the beginning of every minute.</td>
>       <td>At approximately 11:23,000, on March 9th, 2001, <code>/foo/bar.log</code> will be copied to <code>/foo/bar.log.2001-03-09-10-22</code>. Logging for the minute of 11:23 (9th of March) will be output to <code>/foo/bar.log</code> until it is rolled over the next minute.</td>
276c273
< <h3><a href="#size-rotation" id="size-rotation">Size Rotation</a></h3> 
---
> <h3><a href="#size-rotation" name="size-rotation">Size Rotation</a></h3>
diff -b -B -r ./documentation/the-sling-engine/adapters.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/adapters.html
100c100
< <h1><a href="#adaptable" id="adaptable">Adaptable</a></h1> 
---
> <h1><a href="#adaptable" name="adaptable">Adaptable</a></h1>
124c124
< <h1><a href="#listing-adaptation-possibilities" id="listing-adaptation-possibilities">Listing Adaptation Possibilities</a></h1> 
---
> <h1><a href="#listing-adaptation-possibilities" name="listing-adaptation-possibilities">Listing Adaptation Possibilities</a></h1>
127c127
< <h1><a href="#implementing-adaptable" id="implementing-adaptable">Implementing Adaptable</a></h1> 
---
> <h1><a href="#implementing-adaptable" name="implementing-adaptable">Implementing Adaptable</a></h1>
137,141c137,141
<   "org.apache.sling.api.resource.Resource" : {
<     "If the adaptable is a AuthorizableResource." : [
<       "java.util.Map",
<       "org.apache.sling.api.resource.ValueMap",
<       "org.apache.jackrabbit.api.security.user.Authorizable"
---
>   &quot;org.apache.sling.api.resource.Resource&quot; : {
>     &quot;If the adaptable is a AuthorizableResource.&quot; : [
>       &quot;java.util.Map&quot;,
>       &quot;org.apache.sling.api.resource.ValueMap&quot;,
>       &quot;org.apache.jackrabbit.api.security.user.Authorizable&quot;
143,144c143,144
<     "If the resource is an AuthorizableResource and represents a JCR User" : "org.apache.jackrabbit.api.security.user.User",
<     "If the resource is an AuthorizableResource and represents a JCR Group" : "org.apache.jackrabbit.api.security.user.Group"
---
>     &quot;If the resource is an AuthorizableResource and represents a JCR User&quot; : &quot;org.apache.jackrabbit.api.security.user.User&quot;,
>     &quot;If the resource is an AuthorizableResource and represents a JCR Group&quot; : &quot;org.apache.jackrabbit.api.security.user.Group&quot;
149c149
< <h1><a href="#extending-adapters" id="extending-adapters">Extending Adapters</a></h1> 
---
> <h1><a href="#extending-adapters" name="extending-adapters">Extending Adapters</a></h1>
156c156
< <h2><a href="#adapterfactory" id="adapterfactory">AdapterFactory</a></h2> 
---
> <h2><a href="#adapterfactory" name="adapterfactory">AdapterFactory</a></h2>
187c187
< <h2><a href="#adaptermanager" id="adaptermanager">AdapterManager</a></h2> 
---
> <h2><a href="#adaptermanager" name="adaptermanager">AdapterManager</a></h2>
209c209
< <h2><a href="#slingadaptable" id="slingadaptable">SlingAdaptable</a></h2> 
---
> <h2><a href="#slingadaptable" name="slingadaptable">SlingAdaptable</a></h2>
diff -b -B -r ./documentation/the-sling-engine/architecture.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/architecture.html
96,101c96,101
<  <li><strong><a href="#osgi">OSGi</a></strong> — The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.</li> 
<  <li><strong><a href="#sling-api">Sling API</a></strong> — To implement content based Web applications with Sling, an API has been defined, this extends the Servlet API and provides more functionality to work on the content.</li> 
<  <li><strong><a href="#request-processing">Request Processing</a></strong> — Sling takes a unique approach to handling requests in that a request URL is first resolved to a resource, then based on the resource (and only the resource) it selects the actual servlet or script to handle the request.</li> 
<  <li><strong><a href="#resources">Resources</a></strong> — The central mantra of Sling is the <em>Resource</em>, which represents the resource addressed by any request URL. It is the resource that is first resolved when handling a request. Based on the resource, a first servlet or script is then accessed to actually handle the request.</li> 
<  <li><strong><a href="#servlets-and-scripts">Servlets and Scripts</a></strong> — Servlets and Scripts are handled uniformly in that they are represented as resources themselves and are accessible by a resource path.</li> 
<  <li><strong><a href="#launchpad">Launchpad</a></strong> — Sling uses a very thin launcher to integrate with an existing servlet container, launching Sling as a Web application or providing a main class to represent a standalone Java application.</li> 
---
>   <li><strong><a href="#osgi">OSGi</a></strong> &mdash; The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.</li>
>   <li><strong><a href="#sling-api">Sling API</a></strong> &mdash; To implement content based Web applications with Sling, an API has been defined, this extends the Servlet API and provides more functionality to work on the content.</li>
>   <li><strong><a href="#request-processing">Request Processing</a></strong> &mdash; Sling takes a unique approach to handling requests in that a request URL is first resolved to a resource, then based on the resource (and only the resource) it selects the actual servlet or script to handle the request.</li>
>   <li><strong><a href="#resources">Resources</a></strong> &mdash; The central mantra of Sling is the <em>Resource</em>, which represents the resource addressed by any request URL. It is the resource that is first resolved when handling a request. Based on the resource, a first servlet or script is then accessed to actually handle the request.</li>
>   <li><strong><a href="#servlets-and-scripts">Servlets and Scripts</a></strong> &mdash; Servlets and Scripts are handled uniformly in that they are represented as resources themselves and are accessible by a resource path.</li>
>   <li><strong><a href="#launchpad">Launchpad</a></strong> &mdash; Sling uses a very thin launcher to integrate with an existing servlet container, launching Sling as a Web application or providing a main class to represent a standalone Java application.</li>
104c104
< <h2><a href="#osgi" id="osgi">OSGi</a></h2> 
---
> <h2><a href="#osgi" name="osgi">OSGi</a></h2>
106,107c106,107
< <h3><a href="#osgi-framework" id="osgi-framework">OSGi Framework</a></h3> 
< <p>The OSGi Framework is made up of three layers – Module, Lifecycle, and Services – that define how extensible applications are built and deployed. The responsibilities of the layers are:</p> 
---
> <h3><a href="#osgi-framework" name="osgi-framework">OSGi Framework</a></h3>
> <p>The OSGi Framework is made up of three layers &ndash; Module, Lifecycle, and Services &ndash; that define how extensible applications are built and deployed. The responsibilities of the layers are:</p>
109,111c109,111
<  <li><strong>Module</strong> — Defines how a module, or a <em>Bundle</em> in OSGi-speak, is defined. Basically, a bundle is just a plain old JAR file, whose manifest file has some defined entries. These entries identify the bundle with a symbolic name, a version and more. In addition there are headers which define what a bundle provides <code>Export-Package</code> and what a bundle requires to be operative <code>Import-Package</code> and <code>Require-Bundle</code>.</li> 
<  <li><strong>Lifecycle</strong> — The lifecycle layer defines the states a bundle may be in and describes the state changes. By providing a class, which implements the <code>BundleActivator</code> interface and which is named in the <code>Bundle-Activator</code> manifest header, a bundle may hook into the lifecycle process when the bundle is started and stopped.</li> 
<  <li><strong>Services</strong> — For the application to be able to interact, the OSGi Core Specification defines the service layer. This describes a registry for services, which may be shared.</li> 
---
>   <li><strong>Module</strong> &mdash; Defines how a module, or a <em>Bundle</em> in OSGi-speak, is defined. Basically, a bundle is just a plain old JAR file, whose manifest file has some defined entries. These entries identify the bundle with a symbolic name, a version and more. In addition there are headers which define what a bundle provides <code>Export-Package</code> and what a bundle requires to be operative <code>Import-Package</code> and <code>Require-Bundle</code>.</li>
>   <li><strong>Lifecycle</strong> &mdash; The lifecycle layer defines the states a bundle may be in and describes the state changes. By providing a class, which implements the <code>BundleActivator</code> interface and which is named in the <code>Bundle-Activator</code> manifest header, a bundle may hook into the lifecycle process when the bundle is started and stopped.</li>
>   <li><strong>Services</strong> &mdash; For the application to be able to interact, the OSGi Core Specification defines the service layer. This describes a registry for services, which may be shared.</li>
113c113
< <h3><a href="#compendium-services" id="compendium-services">Compendium Services</a></h3> 
---
> <h3><a href="#compendium-services" name="compendium-services">Compendium Services</a></h3>
116,121c116,121
<  <li><strong>Log Service</strong> — Sling comes with its own implementation of the OSGi Log Service specification. The respective bundle not only provides this implementation, it also exports the SLF4J, Log4J and Commons Logging APIs needed for the Sling application to perform logging.</li> 
<  <li><strong>Http Service</strong> — Sling leverages the OSGi Http Service to hook into a servlet container to provide the Web Application Framework mechanism.</li> 
<  <li><strong>Configuration Admin Service</strong> — To simplify configuration of services in Sling, the OSGi Configuration Admin service is used. This provides a uniform API to configure services and to build configuration management agents.</li> 
<  <li><strong>Metatype Service</strong> — The OSGi Metatype Service defines a way to describe the data types. Sling uses this service to describe the configurations that may be created using the Configuration Admin Service. These meta type descriptions are used by configuration management agents to present to user interface to manage the configurations.</li> 
<  <li><strong>Event Admin Service</strong> — Sling uses the OSGi EventAdmin service to dispatch events when scheduling tasks.</li> 
<  <li><strong>Declarative Services</strong> — One of the most important (beside the Log Service) services used by Sling is the Declarative Services Specification. This specification defines how to declaratively create components and services to have the Declarative Services runtime actually manage the lifecycle, configuration and references of components.</li> 
---
>   <li><strong>Log Service</strong> &mdash; Sling comes with its own implementation of the OSGi Log Service specification. The respective bundle not only provides this implementation, it also exports the SLF4J, Log4J and Commons Logging APIs needed for the Sling application to perform logging.</li>
>   <li><strong>Http Service</strong> &mdash; Sling leverages the OSGi Http Service to hook into a servlet container to provide the Web Application Framework mechanism.</li>
>   <li><strong>Configuration Admin Service</strong> &mdash; To simplify configuration of services in Sling, the OSGi Configuration Admin service is used. This provides a uniform API to configure services and to build configuration management agents.</li>
>   <li><strong>Metatype Service</strong> &mdash; The OSGi Metatype Service defines a way to describe the data types. Sling uses this service to describe the configurations that may be created using the Configuration Admin Service. These meta type descriptions are used by configuration management agents to present to user interface to manage the configurations.</li>
>   <li><strong>Event Admin Service</strong> &mdash; Sling uses the OSGi EventAdmin service to dispatch events when scheduling tasks.</li>
>   <li><strong>Declarative Services</strong> &mdash; One of the most important (beside the Log Service) services used by Sling is the Declarative Services Specification. This specification defines how to declaratively create components and services to have the Declarative Services runtime actually manage the lifecycle, configuration and references of components.</li>
123c123
< <h2><a href="#sling-api" id="sling-api">Sling API</a></h2> 
---
> <h2><a href="#sling-api" name="sling-api">Sling API</a></h2>
125c125
< <h2><a href="#request-processing" id="request-processing">Request Processing</a></h2> 
---
> <h2><a href="#request-processing" name="request-processing">Request Processing</a></h2>
129c129
< <h2><a href="#resources" id="resources">Resources</a></h2> 
---
> <h2><a href="#resources" name="resources">Resources</a></h2>
133c133
< <h2><a href="#servlets-and-scripts" id="servlets-and-scripts">Servlets and Scripts</a></h2> 
---
> <h2><a href="#servlets-and-scripts" name="servlets-and-scripts">Servlets and Scripts</a></h2>
140c140
< <h2><a href="#launchpad" id="launchpad">Launchpad</a></h2> 
---
> <h2><a href="#launchpad" name="launchpad">Launchpad</a></h2>
diff -b -B -r ./documentation/the-sling-engine/authentication/authentication-actors.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/authentication/authentication-actors.html
99c99
< <h2><a href="#osgi-http-service-specification" id="osgi-http-service-specification">OSGi Http Service Specification</a></h2> 
---
> <h2><a href="#osgi-http-service-specification" name="osgi-http-service-specification">OSGi Http Service Specification</a></h2>
103c103
< <h2><a href="#sling-engine" id="sling-engine">Sling Engine</a></h2> 
---
> <h2><a href="#sling-engine" name="sling-engine">Sling Engine</a></h2>
107c107
< <h2><a href="#sling-auth-core" id="sling-auth-core">Sling Auth Core</a></h2> 
---
> <h2><a href="#sling-auth-core" name="sling-auth-core">Sling Auth Core</a></h2>
114c114
< <h2><a href="#jcr-repository" id="jcr-repository">JCR Repository</a></h2> 
---
> <h2><a href="#jcr-repository" name="jcr-repository">JCR Repository</a></h2>
126c126
< <h2><a href="#sling-applications" id="sling-applications">Sling Applications</a></h2> 
---
> <h2><a href="#sling-applications" name="sling-applications">Sling Applications</a></h2>
129,130c129,132
<  <li> <p><code>login</code> -- allows the application to ensure requests are authenticated. This involves selecting an <code>AuthenticationHandler</code> to request credentials for authentication.</p> </li> 
<  <li> <p><code>logout</code> -- allows the application to forget about any authentication. This involves selecting an <code>AuthenticationHandler</code> to forget about credentials in the request.</p> </li> 
---
>   <li>
>   <p><code>login</code> -- allows the application to ensure requests are authenticated. This involves selecting an <code>AuthenticationHandler</code> to request credentials for authentication.</p></li>
>   <li>
>   <p><code>logout</code> -- allows the application to forget about any authentication. This involves selecting an <code>AuthenticationHandler</code> to forget about credentials in the request.</p></li>
134,136c136
<   If you want to know whether a request is authenticated or not, you can inspect the result of the 
<  <code>HttpServletRequest.getAuthType</code> method: If this method returns 
<  <code>null</code> the request is not authenticated. 
---
> If you want to know whether a request is authenticated or not, you can inspect the result of the <code>HttpServletRequest.getAuthType</code> method: If this method returns <code>null</code> the request is not authenticated.
diff -b -B -r ./documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
111c111
< <h3><a href="#authenticationhandler-implementation" id="authenticationhandler-implementation">AuthenticationHandler implementation</a></h3> 
---
> <h3><a href="#authenticationhandler-implementation" name="authenticationhandler-implementation">AuthenticationHandler implementation</a></h3>
117c117
< <h3><a href="#authenticationfeedbackhandler-implementation" id="authenticationfeedbackhandler-implementation">AuthenticationFeedbackHandler implementation</a></h3> 
---
> <h3><a href="#authenticationfeedbackhandler-implementation" name="authenticationfeedbackhandler-implementation">AuthenticationFeedbackHandler implementation</a></h3>
122c122
< <h3><a href="#phase-1-form-submission" id="phase-1-form-submission">Phase 1: Form Submission</a></h3> 
---
> <h3><a href="#phase-1-form-submission" name="phase-1-form-submission">Phase 1: Form Submission</a></h3>
142,143c142,143
<    <th> Status </th>
<    <th> Description </th>
---
>       <th>Status </th>
>       <th>Description </th>
148,149c148,149
<    <td> <code>200 OK</code> </td>
<    <td> Authentication succeeded; credentials are valid for login; the Cookie or HTTP Session attribute is now set </td>
---
>       <td><code>200 OK</code> </td>
>       <td>Authentication succeeded; credentials are valid for login; the Cookie or HTTP Session attribute is now set </td>
152,153c152,153
<    <td> <code>403 FORBIDDEN</code> </td>
<    <td> Authentication failed; credentials are invalid for login; the Cookie or HTTP Session attribute is not set (if it was set, it is now cleared) </td>
---
>       <td><code>403 FORBIDDEN</code> </td>
>       <td>Authentication failed; credentials are invalid for login; the Cookie or HTTP Session attribute is not set (if it was set, it is now cleared) </td>
161,162c161,162
<    <th> Authentication </th>
<    <th> Description </th>
---
>       <th>Authentication </th>
>       <th>Description </th>
167,168c167,168
<    <td> Success </td>
<    <td> Client is redirected to the authenticated resource; the Cookie or HTTP Session attribute is now set. </td>
---
>       <td>Success </td>
>       <td>Client is redirected to the authenticated resource; the Cookie or HTTP Session attribute is now set. </td>
171,172c171,172
<    <td> Failure </td>
<    <td> The request is redirected to the login form again; the Cookie or HTTP Session attribute is not set (if it was set, it is now cleared) </td>
---
>       <td>Failure </td>
>       <td>The request is redirected to the login form again; the Cookie or HTTP Session attribute is not set (if it was set, it is now cleared) </td>
178c178
< <h3><a href="#phase-2-authenticated-requests" id="phase-2-authenticated-requests">Phase 2: Authenticated Requests</a></h3> 
---
> <h3><a href="#phase-2-authenticated-requests" name="phase-2-authenticated-requests">Phase 2: Authenticated Requests</a></h3>
196c196
< <h3><a href="#configuration" id="configuration">Configuration</a></h3> 
---
> <h3><a href="#configuration" name="configuration">Configuration</a></h3>
201,203c201,203
<    <th> Parameter </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Parameter </th>
>       <th>Default </th>
>       <th>Description </th>
208,210c208,210
<    <td> <code>form.login.form</code> </td>
<    <td> <code>/system/sling/form/login</code> </td>
<    <td> The URL (without any context path prefix) to redirect the client to to present the login form. </td>
---
>       <td><code>form.login.form</code> </td>
>       <td><code>/system/sling/form/login</code> </td>
>       <td>The URL (without any context path prefix) to redirect the client to to present the login form. </td>
213,215c213,215
<    <td> <code>form.auth.storage</code> </td>
<    <td> <code>cookie</code> </td>
<    <td> The type of storage used to provide the authentication state. Valid values are <code>cookie</code> and <code>session</code>. The default value also applies if any setting other than the supported values is configured. </td>
---
>       <td><code>form.auth.storage</code> </td>
>       <td><code>cookie</code> </td>
>       <td>The type of storage used to provide the authentication state. Valid values are <code>cookie</code> and <code>session</code>. The default value also applies if any setting other than the supported values is configured. </td>
218,220c218,220
<    <td> <code>form.auth.name</code> </td>
<    <td> <code>sling.formauth</code> </td>
<    <td> The name of the Cookie or HTTP Session attribute providing the authentication state. </td>
---
>       <td><code>form.auth.name</code> </td>
>       <td><code>sling.formauth</code> </td>
>       <td>The name of the Cookie or HTTP Session attribute providing the authentication state. </td>
223,224c223,224
<    <td> <code>form.auth.timeout</code> </td>
<    <td> <code>30</code> </td>
---
>       <td><code>form.auth.timeout</code> </td>
>       <td><code>30</code> </td>
228,230c228,230
<    <td> <code>form.credentials.name</code> </td>
<    <td> <code>sling.formauth</code> </td>
<    <td> The name of the <code>SimpleCredentials</code> attribute used to provide the authentication data to the <code>LoginModulePlugin</code>. </td>
---
>       <td><code>form.credentials.name</code> </td>
>       <td><code>sling.formauth</code> </td>
>       <td>The name of the <code>SimpleCredentials</code> attribute used to provide the authentication data to the <code>LoginModulePlugin</code>. </td>
233,235c233,235
<    <td> <code>form.token.file</code> </td>
<    <td> <code>cookie-tokens.bin</code> </td>
<    <td> The name of the file used to persist the security tokens. </td>
---
>       <td><code>form.token.file</code> </td>
>       <td><code>cookie-tokens.bin</code> </td>
>       <td>The name of the file used to persist the security tokens. </td>
238c238
<    <td> <code>form.default.cookie.domain</code> </td>
---
>       <td><code>form.default.cookie.domain</code> </td>
240c240
<    <td> The domain on which cookies will be set, unless overridden in the <code>AuthenticationInfo</code> object. </td>
---
>       <td>The domain on which cookies will be set, unless overridden in the <code>AuthenticationInfo</code> object. </td>
245c245
< <h3><a href="#security-considerations" id="security-considerations">Security Considerations</a></h3> 
---
> <h3><a href="#security-considerations" name="security-considerations">Security Considerations</a></h3>
diff -b -B -r ./documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
105,106c105
<   This module has been deprecated and retired. It can be found in the 
<  <a href="https://svn.apache.org/repos/asf/sling/attic/openid/">Sling attic: OpenID module</a> but is no longer maintained or supported. 
---
> This module has been deprecated and retired. It can be found in the <a href="https://svn.apache.org/repos/asf/sling/attic/openid/">Sling attic: OpenID module</a> but is no longer maintained or supported.
111c110
< <h3><a href="#credentials-extraction" id="credentials-extraction">Credentials Extraction</a></h3> 
---
> <h3><a href="#credentials-extraction" name="credentials-extraction">Credentials Extraction</a></h3>
114c113
< <h3><a href="#phase-1-form-submission" id="phase-1-form-submission">Phase 1: Form Submission</a></h3> 
---
> <h3><a href="#phase-1-form-submission" name="phase-1-form-submission">Phase 1: Form Submission</a></h3>
120,121c119,120
<    <th> Request Parameter </th>
<    <th> Description </th>
---
>       <th>Request Parameter </th>
>       <th>Description </th>
126,127c125,126
<    <td> <code>resource</code> </td>
<    <td> The location to which the user initially requested access and that caused the <code>requestCredentials</code> method to be called. This may not be set (or be set to an empty string). </td>
---
>       <td><code>resource</code> </td>
>       <td>The location to which the user initially requested access and that caused the <code>requestCredentials</code> method to be called. This may not be set (or be set to an empty string). </td>
130,131c129,130
<    <td> <code>j_reason</code> </td>
<    <td> The reason why an earlier attempt at authentication with the OpenID authentication handler failed. This request parameter is only set if the same named request attribute has been set by the <code>extractCredentials</code> or the <code>authenticationFailed</code> method. The value of the parameter is the name of one of the <code>OpenIDFailure</code> constants. </td>
---
>       <td><code>j_reason</code> </td>
>       <td>The reason why an earlier attempt at authentication with the OpenID authentication handler failed. This request parameter is only set if the same named request attribute has been set by the <code>extractCredentials</code> or the <code>authenticationFailed</code> method. The value of the parameter is the name of one of the <code>OpenIDFailure</code> constants. </td>
134,135c133,134
<    <td> <code>j_openid_identity</code> </td>
<    <td> The OpenID identity which could not successfully be associated with an existing JCR user. This request parameter is only set if the <code>authenticationFailed</code> method has been called due to inability to associate an existing and validated OpenID identity with an existing JCR user. </td>
---
>       <td><code>j_openid_identity</code> </td>
>       <td>The OpenID identity which could not successfully be associated with an existing JCR user. This request parameter is only set if the <code>authenticationFailed</code> method has been called due to inability to associate an existing and validated OpenID identity with an existing JCR user. </td>
146c145
< <h3><a href="#configuration" id="configuration">Configuration</a></h3> 
---
> <h3><a href="#configuration" name="configuration">Configuration</a></h3>
151,153c150,152
<    <th> Parameter </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Parameter </th>
>       <th>Default </th>
>       <th>Description </th>
156,207d154
<  <tbody> 
<   <tr>
<    <td> <code>path</code> </td>
<    <td> -- </td>
<    <td> Repository path for which this authentication handler should be used by Sling. If this is empty, the authentication handler will be disabled. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.login.form</code> </td>
<    <td> <code>/system/sling/openid/login</code> </td>
<    <td> This should provide a way to capture the user's OpenID identifier. This is not the OpenID Provider's login page, however, it does not have to be a local URL. If it is a local Sling URL, it must be accessible by the anonymous user. The user is HTTP Redirect'ed to this URL. This page should POST back the user's OpenID identifier (as named by the "OpenID identifier form field" property) to the originally requested URL set in the "resource" request parameter. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.login.identifier</code> </td>
<    <td> <code>openid_identifier</code> </td>
<    <td> The name of the form parameter that provides the user's OpenID identifier. By convention this is <code>openid_identifier</code>. Only change this if you have a very good reason to do so. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.external.url.prefix</code> </td>
<    <td> -- </td>
<    <td> The prefix of URLs generated for the <code>ReturnTo</code> and <code>TrustRoot</code> properties of the OpenID request to the OpenID provider. Thus this URL prefix should bring back the authenticated user to this Sling instance. Configuring this property is usually necessary when running Sling behind a proxy (like Apache) since proxy mapping is not performed on the OpenID ReturnTo and TrustRoot URLs as they are sent to the OpenID Provider as form parameters. If this property is empty, the URLs are generated using the hostname found in the original request.</td>
<   </tr> 
<   <tr>
<    <td> <code>openid.use.cookie</code> </td>
<    <td> <code>true</code> </td>
<    <td> Whether to use a regular Cookie or an HTTP Session to cache the OpenID authentication details. By default a regular cookie is used to prevent use of HTTP Sessions. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.cookie.domain</code> </td>
<    <td> -- </td>
<    <td> Domain of cookie used to persist authentication. This defaults to the host name of the Sling server but may be set to a different value to share the cookie amongst a server farm or if the server is running behind a proxy. Only used if 'Use Cookie' is checked. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.cookie.name</code> </td>
<    <td> <code>sling.openid</code> </td>
<    <td> Name of cookie used to persist authentication. Only used if 'Use Cookie' is checked. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.cookie.secret.key</code> </td>
<    <td> <code>secret</code> </td>
<    <td> Secret key used to create a signature of the cookie value to prevent tampering. Only used if 'Use Cookie' is true. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.user.attr</code> </td>
<    <td> <code>openid.user</code> </td>
<    <td> Name of the JCR SimpleCredentials attribute to to set with the OpenID User data. This attribute is used by the OpenID LoginModule to validate the OpenID user authentication data. </td>
<   </tr> 
<   <tr>
<    <td> <code>openid.property.identity</code> </td>
<    <td> <code>openid.identity</code> </td>
<    <td> The name of the JCR User attribute listing one or more OpenID Identity URLs with which a user is associated. The property may be a multi- or single-valued. To resolve a JCR user ID from an OpenID identity a user is searched who lists the identity in this property. </td>
<   </tr> 
<  </tbody> 
209,210c156,158
< <h3><a href="#authenticationhandler-implementation" id="authenticationhandler-implementation">AuthenticationHandler implementation</a></h3> 
< <h4><a href="#extractcredentials" id="extractcredentials">extractCredentials</a></h4> 
---
> <p>| <code>path</code> | -- | Repository path for which this authentication handler should be used by Sling. If this is empty, the authentication handler will be disabled. | | <code>openid.login.form</code> | <code>/system/sling/openid/login</code> | This should provide a way to capture the user's OpenID identifier. This is not the OpenID Provider's login page, however, it does not have to be a local URL. If it is a local Sling URL, it must be accessible by the anonymous user. The user is HTTP Redirect'ed to this URL. This page should POST back the user's OpenID identifier (as named by the "OpenID identifier form field" property) to the originally requested URL set in the "resource" request parameter. | | <code>openid.login.identifier</code> | <code>openid_identifier</code> | The name of the form parameter that provides the user's OpenID identifier. By convention this is <code>openid_identifier</code>. Only change this if you have a very good reason to do so. | | <code>openid.external.url.prefix</code> | -- | The prefix of URLs generated for the <code>ReturnTo</code> and <code>TrustRoot</code> properties of the OpenID request to the OpenID provider. Thus this URL prefix should bring back the authenticated user to this Sling instance. Configuring this property is usually necessary when running Sling behind a proxy (like Apache) since proxy mapping is not performed on the OpenID ReturnTo and TrustRoot URLs as they are sent to the OpenID Provider as form parameters. If this property is empty, the URLs are generated using the hostname found in the original request.| | <code>openid.use.cookie</code> | <code>true</code> | Whether to use a regular Cookie or an HTTP Session to cache the OpenID authentication details. By default a regular cookie is used to prevent use of HTTP Sessions. | | <code>openid.cookie.domain</code> | -- | Domain of cookie used to persist authentication. This defaults to the host name of the Sling server but may be set to a different value to share the cookie amongst a server farm or if the server is running behind a proxy. Only used if 'Use Cookie' is checked. | | <code>openid.cookie.name</code> | <code>sling.openid</code> | Name of cookie used to persist authentication. Only used if 'Use Cookie' is checked. | | <code>openid.cookie.secret.key</code> | <code>secret</code> | Secret key used to create a signature of the cookie value to prevent tampering. Only used if 'Use Cookie' is true. | | <code>openid.user.attr</code> | <code>openid.user</code> | Name of the JCR SimpleCredentials attribute to to set with the OpenID User data. This attribute is used by the OpenID LoginModule to validate the OpenID user authentication data. | | <code>openid.property.identity</code> | <code>openid.identity</code> | The name of the JCR User attribute listing one or more OpenID Identity URLs with which a user is associated. The property may be a multi- or single-valued. To resolve a JCR user ID from an OpenID identity a user is searched who lists the identity in this property. |</p>
> <h3><a href="#authenticationhandler-implementation" name="authenticationhandler-implementation">AuthenticationHandler implementation</a></h3>
> <h4><a href="#extractcredentials" name="extractcredentials">extractCredentials</a></h4>
220c168
< <h4><a href="#requestcredentials" id="requestcredentials">requestCredentials</a></h4> 
---
> <h4><a href="#requestcredentials" name="requestcredentials">requestCredentials</a></h4>
226,227c174,175
<    <th> Request Parameter </th>
<    <th> Description </th>
---
>       <th>Request Parameter </th>
>       <th>Description </th>
232,233c180,181
<    <td> <code>resource</code> </td>
<    <td> The location to which the user initially requested access and that caused the <code>requestCredentials</code> method to be called. </td>
---
>       <td><code>resource</code> </td>
>       <td>The location to which the user initially requested access and that caused the <code>requestCredentials</code> method to be called. </td>
236,237c184,185
<    <td> <code>j_reason</code> </td>
<    <td> The reason why an earlier attempt at authentication with the OpenID authentication handler failed. This request parameter is only set if the same named request attribute has been set by the <code>extractCredentials</code> or the <code>authenticationFailed</code> method. The value of the parameter is the name of one of the <code>OpenIDFailure</code> constants. </td>
---
>       <td><code>j_reason</code> </td>
>       <td>The reason why an earlier attempt at authentication with the OpenID authentication handler failed. This request parameter is only set if the same named request attribute has been set by the <code>extractCredentials</code> or the <code>authenticationFailed</code> method. The value of the parameter is the name of one of the <code>OpenIDFailure</code> constants. </td>
240,241c188,189
<    <td> <code>j_openid_identity</code> </td>
<    <td> The OpenID identity which could not successfully be associated with an existing JCR user. This request parameter is only set if the <code>authenticationFailed</code> method has been called due to inability to associate an existing and validated OpenID identity with an existing JCR user. </td>
---
>       <td><code>j_openid_identity</code> </td>
>       <td>The OpenID identity which could not successfully be associated with an existing JCR user. This request parameter is only set if the <code>authenticationFailed</code> method has been called due to inability to associate an existing and validated OpenID identity with an existing JCR user. </td>
245c193
< <h4><a href="#dropcredentials" id="dropcredentials">dropCredentials</a></h4> 
---
> <h4><a href="#dropcredentials" name="dropcredentials">dropCredentials</a></h4>
247,248c195,196
< <h3><a href="#authenticationfeedbackhandler-implementation" id="authenticationfeedbackhandler-implementation">AuthenticationFeedbackHandler implementation</a></h3> 
< <h4><a href="#authenticationfailed" id="authenticationfailed">authenticationFailed</a></h4> 
---
> <h3><a href="#authenticationfeedbackhandler-implementation" name="authenticationfeedbackhandler-implementation">AuthenticationFeedbackHandler implementation</a></h3>
> <h4><a href="#authenticationfailed" name="authenticationfailed">authenticationFailed</a></h4>
253c201
< <h4><a href="#authenticationsucceeded" id="authenticationsucceeded">authenticationSucceeded</a></h4> 
---
> <h4><a href="#authenticationsucceeded" name="authenticationsucceeded">authenticationSucceeded</a></h4>
255c203
< <h3><a href="#integration-with-jackrabbit" id="integration-with-jackrabbit">Integration with Jackrabbit</a></h3> 
---
> <h3><a href="#integration-with-jackrabbit" name="integration-with-jackrabbit">Integration with Jackrabbit</a></h3>
258c206
< <h3><a href="#security-considerations" id="security-considerations">Security Considerations</a></h3> 
---
> <h3><a href="#security-considerations" name="security-considerations">Security Considerations</a></h3>
diff -b -B -r ./documentation/the-sling-engine/authentication/authentication-authenticationhandler.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
103,104c103,104
<    <th> Property </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Description </th>
109,110c109,110
<    <td> <code>path</code> </td>
<    <td> One or more (array or vector) string values indicating the request URLs to which the <code>AuthenticationHandler</code> is applicable. </td>
---
>       <td><code>path</code> </td>
>       <td>One or more (array or vector) string values indicating the request URLs to which the <code>AuthenticationHandler</code> is applicable. </td>
113,114c113,114
<    <td> <code>authtype</code> </td>
<    <td> The authentication type implemented by this handler. This is a string value property and should be the same as will be used as the authentication type of the <code>AuthenticationInfo</code> object provided by the <code>extractCredentials</code> method. If this property is set, the <code>requestCredentials</code> method of the authentication handler is only called if the <code>sling:authRequestLogin</code> request parameter is either not set or is set to the same value as the <code>authtype</code> of the handler. This property is optional. If not set, the <code>requestCredentials</code> method is always called regardless of the value of the <code>sling:authRequestLogin</code> request parameter. </td>
---
>       <td><code>authtype</code> </td>
>       <td>The authentication type implemented by this handler. This is a string value property and should be the same as will be used as the authentication type of the <code>AuthenticationInfo</code> object provided by the <code>extractCredentials</code> method. If this property is set, the <code>requestCredentials</code> method of the authentication handler is only called if the <code>sling:authRequestLogin</code> request parameter is either not set or is set to the same value as the <code>authtype</code> of the handler. This property is optional. If not set, the <code>requestCredentials</code> method is always called regardless of the value of the <code>sling:authRequestLogin</code> request parameter. </td>
122,125c122,125
<    <th> URL part </th>
<    <th> Scheme </th>
<    <th> Host/Port </th>
<    <th> Path </th>
---
>       <th>URL part </th>
>       <th>Scheme </th>
>       <th>Host/Port </th>
>       <th>Path </th>
130,145c130,145
<    <td> Absolute URL </td>
<    <td> must match </td>
<    <td> must match </td>
<    <td> request URL path is prefixed with the path </td>
<   </tr> 
<   <tr>
<    <td> Host/Port with Path </td>
<    <td> ignored </td>
<    <td> must match </td>
<    <td> request URL path is prefixed with the path </td>
<   </tr> 
<   <tr>
<    <td> Path </td>
<    <td> ignored </td>
<    <td> ignored </td>
<    <td> request URL path is prefixed with the path </td>
---
>       <td>Absolute URL </td>
>       <td>must match </td>
>       <td>must match </td>
>       <td>request URL path is prefixed with the path </td>
>     </tr>
>     <tr>
>       <td>Host/Port with Path </td>
>       <td>ignored </td>
>       <td>must match </td>
>       <td>request URL path is prefixed with the path </td>
>     </tr>
>     <tr>
>       <td>Path </td>
>       <td>ignored </td>
>       <td>ignored </td>
>       <td>request URL path is prefixed with the path </td>
152c152
< <h3><a href="#implementations-provided-by-sling" id="implementations-provided-by-sling">Implementations provided by Sling</a></h3> 
---
> <h3><a href="#implementations-provided-by-sling" name="implementations-provided-by-sling">Implementations provided by Sling</a></h3>
157,158c157,158
< <h3><a href="#sample-implementations" id="sample-implementations">Sample implementations</a></h3> 
< <h4><a href="#http-basic-authentication-handler" id="http-basic-authentication-handler">HTTP Basic Authentication Handler</a></h4> 
---
> <h3><a href="#sample-implementations" name="sample-implementations">Sample implementations</a></h3>
> <h4><a href="#http-basic-authentication-handler" name="http-basic-authentication-handler">HTTP Basic Authentication Handler</a></h4>
165c165
< <h4><a href="#form-based-authentication-handler" id="form-based-authentication-handler">Form Based Authentication Handler</a></h4> 
---
> <h4><a href="#form-based-authentication-handler" name="form-based-authentication-handler">Form Based Authentication Handler</a></h4>
diff -b -B -r ./documentation/the-sling-engine/authentication/authentication-framework.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/authentication/authentication-framework.html
107c107
< <h2><a href="#authenticationsupport" id="authenticationsupport">AuthenticationSupport</a></h2> 
---
> <h2><a href="#authenticationsupport" name="authenticationsupport">AuthenticationSupport</a></h2>
125,127c125,127
<    <th> Credentials </th>
<    <th> Login </th>
<    <th> Consequence </th>
---
>       <th>Credentials </th>
>       <th>Login </th>
>       <th>Consequence </th>
132,134c132,134
<    <td> present </td>
<    <td> successful </td>
<    <td> Continue with an authenticated request </td>
---
>       <td>present </td>
>       <td>successful </td>
>       <td>Continue with an authenticated request </td>
137,139c137,139
<    <td> present </td>
<    <td> failed </td>
<    <td> Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method </td>
---
>       <td>present </td>
>       <td>failed </td>
>       <td>Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method </td>
142,144c142,144
<    <td> missing </td>
<    <td> anonymous allowed </td>
<    <td> Continue with a non authenticated request using anonymous access to the repository </td>
---
>       <td>missing </td>
>       <td>anonymous allowed </td>
>       <td>Continue with a non authenticated request using anonymous access to the repository </td>
147,149c147,149
<    <td> missing </td>
<    <td> anonymous forbidden </td>
<    <td> Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method </td>
---
>       <td>missing </td>
>       <td>anonymous forbidden </td>
>       <td>Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method </td>
154,156c154
<   Only one 
<  <code>AuthenticationHandler</code> is able to provide credentials for a given request. If the credentials provided by the handler cannot be used to login to the repository, authentication fails and no further 
<  <code>AuthenticationHandler</code> is consulted. 
---
>     Only one <code>AuthenticationHandler</code> is able to provide credentials for a given request. If the credentials provided by the handler cannot be used to login to the repository, authentication fails and no further <code>AuthenticationHandler</code> is consulted.
158c156
< <h4><a href="#request-attributes-on-successful-login" id="request-attributes-on-successful-login">Request Attributes on Successful Login</a></h4> 
---
> <h4><a href="#request-attributes-on-successful-login" name="request-attributes-on-successful-login">Request Attributes on Successful Login</a></h4>
163,164c161,162
<    <th> Attribute </th>
<    <th> Description </th>
---
>       <th>Attribute </th>
>       <th>Description </th>
169,170c167,168
<    <td> <code>org.osgi.service.http.authentication.remote.user</code> </td>
<    <td> The user ID of the JCR Session. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getRemoteUser</code> method. </td>
---
>       <td><code>org.osgi.service.http.authentication.remote.user</code> </td>
>       <td>The user ID of the JCR Session. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getRemoteUser</code> method. </td>
173,174c171,172
<    <td> <code>org.osgi.service.http.authentication.type</code> </td>
<    <td> The authentication type defined by the <code>AuthenticationHandler</code>. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getAuthType</code> method. </td>
---
>       <td><code>org.osgi.service.http.authentication.type</code> </td>
>       <td>The authentication type defined by the <code>AuthenticationHandler</code>. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getAuthType</code> method. </td>
177,178c175,176
<    <td> <code>org.apache.sling.auth.core.ResourceResolver</code> </td>
<    <td> The <code>ResourceResolver</code> created from the credentials and the logged in JCR Session. This attribute may be used by servlets to access the repository. Namely the <code>SlingMainServlet</code> uses this request attribute to provide the <code>ResourceResolver</code> to handle the request. </td>
---
>       <td><code>org.apache.sling.auth.core.ResourceResolver</code> </td>
>       <td>The <code>ResourceResolver</code> created from the credentials and the logged in JCR Session. This attribute may be used by servlets to access the repository. Namely the <code>SlingMainServlet</code> uses this request attribute to provide the <code>ResourceResolver</code> to handle the request. </td>
181,182c179,180
<    <td> <code>javax.jcr.Session</code> </td>
<    <td> The JCR Session. This attribute is for backwards compatibility only. <em>Its use is deprecated and the attribute will be removed in future versions</em>. </td>
---
>       <td><code>javax.jcr.Session</code> </td>
>       <td>The JCR Session. This attribute is for backwards compatibility only. <em>Its use is deprecated and the attribute will be removed in future versions</em>. </td>
185,186c183,184
<    <td> <code>org.apache.sling.auth.core.spi.AuthenticationInfo</code> </td>
<    <td> The <code>AuthenticationInfo</code> object produced from the <code>AuthenticationHandler</code>. </td>
---
>       <td><code>org.apache.sling.auth.core.spi.AuthenticationInfo</code> </td>
>       <td>The <code>AuthenticationInfo</code> object produced from the <code>AuthenticationHandler</code>. </td>
193c191
< <h4><a href="#anonymous-login" id="anonymous-login">Anonymous Login</a></h4> 
---
> <h4><a href="#anonymous-login" name="anonymous-login">Anonymous Login</a></h4>
203c201
<  <li>The <code>LoginServlet</code> contained in the Sling Auth Core bundle registers itself with the service registration property <code>sling.auth.requirements = "-/system/sling/login"</code> to ensure the servlet can be accessed without requiring authentication (checks for <code>slash</code> or <code>dot</code> or <code>end of string</code>). The following request urls would work then without authentication: 
---
>   <li>The <code>LoginServlet</code> contained in the Sling Auth Core bundle registers itself with the service registration property <code>sling.auth.requirements = &quot;-/system/sling/login&quot;</code> to ensure the servlet can be accessed without requiring authentication (checks for <code>slash</code> or <code>dot</code> or <code>end of string</code>). The following request urls would work then without authentication:
208c206,207
<   </ul> </li> 
---
>     </ul>
>   </li>
210c209,211
< <p>While the following request will still require authentication</p> 
---
> <p>While the following request will still require authentication </p>
> <pre><code>* /system/sling/login-test 
> </code></pre>
212,213c213
<  <li> <p>/system/sling/login-test</p> </li> 
<  <li> <p>An authentication handler may register itself with the service registration property <code>sling.auth.requirements = "-/apps/sample/loginform"</code> to ensure the login form can be rendered without requiring authentication.</p> </li> 
---
>   <li>An authentication handler may register itself with the service registration property <code>sling.auth.requirements = &quot;-/apps/sample/loginform&quot;</code> to ensure the login form can be rendered without requiring authentication.</li>
215c215
< <h2><a href="#authenticator-implementation" id="authenticator-implementation">Authenticator implementation</a></h2> 
---
> <h2><a href="#authenticator-implementation" name="authenticator-implementation">Authenticator implementation</a></h2>
227,228c227,228
<    <th> Exit State </th>
<    <th> Description </th>
---
>       <th>Exit State </th>
>       <th>Description </th>
233,234c233,234
<    <td> Normal </td>
<    <td> An <code>AuthenticationHandler</code> could be selected to which the login request could be forwarded. </td>
---
>       <td>Normal </td>
>       <td>An <code>AuthenticationHandler</code> could be selected to which the login request could be forwarded. </td>
237,238c237,238
<    <td> <code>NoAuthenticationHandlerException</code> </td>
<    <td> No <code>AuthenticationHandler</code> could be selected to forward the login request to. In this case, the caller can proceed as appropriate. For example a servlet, which should just login a user may send back a 403/FORBIDDEN status because login is not possible. Or a 404/NOT FOUND handler, which tried to login as a fallback, may continue and send back the regular 404/NOT FOUND response. </td>
---
>       <td><code>NoAuthenticationHandlerException</code> </td>
>       <td>No <code>AuthenticationHandler</code> could be selected to forward the login request to. In this case, the caller can proceed as appropriate. For example a servlet, which should just login a user may send back a 403/FORBIDDEN status because login is not possible. Or a 404/NOT FOUND handler, which tried to login as a fallback, may continue and send back the regular 404/NOT FOUND response. </td>
241,242c241,242
<    <td> <code>IllegalStateException</code> </td>
<    <td> The response has already been committed and the login request cannot be processed. Normally to request login, the current response must be reset and a new response has to be prepared. This is only possible if the request has not yet been committed. </td>
---
>       <td><code>IllegalStateException</code> </td>
>       <td>The response has already been committed and the login request cannot be processed. Normally to request login, the current response must be reset and a new response has to be prepared. This is only possible if the request has not yet been committed. </td>
diff -b -B -r ./documentation/the-sling-engine/authentication/authentication-tasks.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/authentication/authentication-tasks.html
99c99
< <h2><a href="#extract-credentials-from-the-request" id="extract-credentials-from-the-request">Extract Credentials from the Request</a></h2> 
---
> <h2><a href="#extract-credentials-from-the-request" name="extract-credentials-from-the-request">Extract Credentials from the Request</a></h2>
106c106
< <h2><a href="#login-to-the-jcr-repository" id="login-to-the-jcr-repository">Login to the JCR Repository</a></h2> 
---
> <h2><a href="#login-to-the-jcr-repository" name="login-to-the-jcr-repository">Login to the JCR Repository</a></h2>
diff -b -B -r ./documentation/the-sling-engine/authentication.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/authentication.html
97c97
< <p>Let's look at generic request processing of Sling: Sling is linked into the outside world by registering the Sling Main Servlet – implemented by the <code>SlingMainServlet</code> class in the Sling Engine bundle – with an OSGi <code>HttpService</code>. This registration is accompanied with an implementation instance of the OSGi <code>HttpContext</code> interface, which defines a method to authenticate requests: <code>handleSecurity</code>.</p> 
---
> <p>Let's look at generic request processing of Sling: Sling is linked into the outside world by registering the Sling Main Servlet &ndash; implemented by the <code>SlingMainServlet</code> class in the Sling Engine bundle &ndash; with an OSGi <code>HttpService</code>. This registration is accompanied with an implementation instance of the OSGi <code>HttpContext</code> interface, which defines a method to authenticate requests: <code>handleSecurity</code>.</p>
99c99,101
< <p><a href="authentication.png" style="float:left;padding-right:5%"> <img src="http://sling.apache.org/authentication.png" title="Authentication Flow" alt="Authentication Flow"> </a></p> 
---
> <a href="authentication.png" style="float:left;padding-right:5%">
>     <img src="authentication.png" title="Authentication Flow" alt="Authentication Flow" />
> </a>
diff -b -B -r ./documentation/the-sling-engine/dispatching-requests.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/dispatching-requests.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#main-process" id="main-process">Main process</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#main-process" name="main-process">Main process</a></h2>
99,102c99,106
<  <li> <p>The client sends the request</p> </li> 
<  <li> <p>This step applies only if a Servlet Container is installed and Sling is embedded: Servlet Container gets request and forwards to OSGi HttpService</p> </li> 
<  <li> <p>OSGi HttpService looks for responsible registered Servlet or resource (see 102.4 of the OSGi compendium)</p> </li> 
<  <li> <p>OSGi HttpService calls <code>handleSecurity</code> of the HttpContext associated with the servlet/resource. In case of Sling this calls into SlingMainServlet.handleSecurity and then into SlingAuthenticator.authenticate</p> 
---
>   <li>
>   <p>The client sends the request</p></li>
>   <li>
>   <p>This step applies only if a Servlet Container is installed and Sling is embedded: Servlet Container gets request and forwards to OSGi HttpService</p></li>
>   <li>
>   <p>OSGi HttpService looks for responsible registered Servlet or resource (see 102.4 of the OSGi compendium)</p></li>
>   <li>
>     <p>OSGi HttpService calls <code>handleSecurity</code> of the HttpContext associated with the servlet/resource. In case of Sling this calls into SlingMainServlet.handleSecurity and then into SlingAuthenticator.authenticate</p>
104,109c108,119
<    <li> <p>SlingAuthenticator selects an authentication handler for the request and forwards the authenticate call. On success a <code>javax.jcr.Session</code> is created, the request attributes required by the HTTP Service spec are set (like <code>org.osgi.service.http.authentication.remote.user</code> and <code>org.osgi.service.http.authentication.type</code>and also the <code>javax.jcr.Session</code> which is used later is set in the request attributes. On success, continue with step 5.</p> </li> 
<    <li> <p>If authentication fails either an anonymous session is acquired (if anonymous is allowed per configuration) or the login method is called. If anonymous is allowed, continue with step 5.</p> </li> 
<    <li> <p>The login method selects an AuthenticationHandler and forwards the login call to the AuthenticationHandler.requestAuthentication method to cause the client to authenticate. Request processing stops here (<code>SlingMainServlet.handleSecurity</code> returns false).</p> </li> 
<   </ol> </li> 
<  <li> <p>After getting a response the HttpService either terminates the request (if authentication failed and <code>SlingMainServlet.handleSecurity</code> returned false) or continues by either spooling the resource or in the case of Sling calling the <code>SlingMainServlet.service</code> method.</p> </li> 
<  <li> <p>The <code>SlingMainServlet.service</code> method is the entry point into the Sling proper. This method sets up the request:</p> 
---
>       <li>
>       <p>SlingAuthenticator selects an authentication handler for the request and forwards the authenticate call. On success a <code>javax.jcr.Session</code> is created, the request attributes required by the HTTP Service spec are set (like <code>org.osgi.service.http.authentication.remote.user</code> and <code>org.osgi.service.http.authentication.type</code>and also the <code>javax.jcr.Session</code> which is used later is set in the request attributes. On success, continue with step 5.</p></li>
>       <li>
>       <p>If authentication fails either an anonymous session is acquired (if anonymous is allowed per configuration) or the login method is called. If anonymous is allowed, continue with step 5.</p></li>
>       <li>
>       <p>The login method selects an AuthenticationHandler and forwards the login call to the AuthenticationHandler.requestAuthentication method to cause the client to authenticate. Request processing stops here (<code>SlingMainServlet.handleSecurity</code> returns false).</p></li>
>     </ol>
>   </li>
>   <li>
>   <p>After getting a response the HttpService either terminates the request (if authentication failed and <code>SlingMainServlet.handleSecurity</code> returned false) or continues by either spooling the resource or in the case of Sling calling the <code>SlingMainServlet.service</code> method.</p></li>
>   <li>
>     <p>The <code>SlingMainServlet.service</code> method is the entry point into the Sling proper. This method sets up the request:</p>
116,119c126,133
<   </ul> </li> 
<  <li> <p>After this setup, the request level filters are called (the ones registered as <code>javax.servlet.Filter</code> with the property <code>filter.scope=request</code>, see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details). If any called filter doesn't call <code>FilterChain.doFilter</code> at the end of the <code>Filter.doFilter</code> method request processing stops here.</p> </li> 
<  <li> <p>After having called all request level filters, the component level filters (registered with the property <code>filter.scope=component</code>, see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details) are called.</p> </li> 
<  <li> <p>After having called the component level filters, the request servlet or script is finally called to process the request.</p> </li> 
---
>     </ul>
>   </li>
>   <li>
>   <p>After this setup, the request level filters are called (the ones registered as <code>javax.servlet.Filter</code> with the property <code>filter.scope=request</code>, see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details). If any called filter doesn't call <code>FilterChain.doFilter</code> at the end of the <code>Filter.doFilter</code> method request processing stops here.</p></li>
>   <li>
>   <p>After having called all request level filters, the component level filters (registered with the property <code>filter.scope=component</code>, see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details) are called.</p></li>
>   <li>
>   <p>After having called the component level filters, the request servlet or script is finally called to process the request.</p></li>
121c135
< <h2><a href="#includeforward" id="includeforward">Include/Forward</a></h2> 
---
> <h2><a href="#include-forward" name="include-forward">Include/Forward</a></h2>
124,128c138,147
<  <li> <p>Code in the processing servlet or script calls <code>RequestDispatcher.include</code> or <code>RequestDispatcher.forward</code>.</p> </li> 
<  <li> <p>The resource is resolved though ResourceResolver.getResource (if the RequestDispatcher has not been created with a resource already)</p> </li> 
<  <li> <p>The servlet or script to handle the resource is resolved calling the <code>ServletResolver.resolverServlet</code> method.</p> </li> 
<  <li> <p>The component level filters (registered with the property <code>filter.scope=component</code>) are called again (see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details).</p> </li> 
<  <li> <p>The servlet or script is called to process the request.</p> </li> 
---
>   <li>
>   <p>Code in the processing servlet or script calls <code>RequestDispatcher.include</code> or <code>RequestDispatcher.forward</code>.</p></li>
>   <li>
>   <p>The resource is resolved though ResourceResolver.getResource (if the RequestDispatcher has not been created with a resource already)</p></li>
>   <li>
>   <p>The servlet or script to handle the resource is resolved calling the <code>ServletResolver.resolverServlet</code> method.</p></li>
>   <li>
>   <p>The component level filters (registered with the property <code>filter.scope=component</code>) are called again (see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details).</p></li>
>   <li>
>   <p>The servlet or script is called to process the request.</p></li>
131c150
< <h2><a href="#included-request-attributes" id="included-request-attributes">Included Request Attributes</a></h2> 
---
> <h2><a href="#included-request-attributes" name="included-request-attributes">Included Request Attributes</a></h2>
136,137c155,156
<    <th> Attribute Name <br> Attribute Type </th>
<    <th> Description </th>
---
>       <th>Attribute Name <br> Attribute Type </th>
>       <th>Description </th>
142,143c161,162
<    <td> <code>org.apache.sling.api.include.servlet</code> <br> <code>javax.servlet.Servlet</code> </td>
<    <td> The name of the request attribute containing the <code>Servlet</code> which included the servlet currently being active. </td>
---
>       <td><code>org.apache.sling.api.include.servlet</code> <br> <code>javax.servlet.Servlet</code> </td>
>       <td>The name of the request attribute containing the <code>Servlet</code> which included the servlet currently being active. </td>
146,147c165,166
<    <td> <code>org.apache.sling.api.include.resource</code> <br><code>org.apache.sling.api.resource.Resource</code> </td>
<    <td> The name of the request attribute containing the <code>Resource</code> underlying the <code>Servlet</code> which included the servlet currently being active. </td>
---
>       <td><code>org.apache.sling.api.include.resource</code> <br><code>org.apache.sling.api.resource.Resource</code> </td>
>       <td>The name of the request attribute containing the <code>Resource</code> underlying the <code>Servlet</code> which included the servlet currently being active. </td>
150,151c169,170
<    <td> <code>org.apache.sling.api.include.request_path_info</code> <br> <code>org.apache.sling.api.request.RequestPathInfo</code> </td>
<    <td> The name of the request attribute containing the <code>RequestPathInfo</code> underlying the <code>Servlet</code> which included the servlet currently being active </td>
---
>       <td><code>org.apache.sling.api.include.request_path_info</code> <br> <code>org.apache.sling.api.request.RequestPathInfo</code> </td>
>       <td>The name of the request attribute containing the <code>RequestPathInfo</code> underlying the <code>Servlet</code> which included the servlet currently being active </td>
154,155c173,174
<    <td> <code>javax.servlet.include.request_uri</code> <br> <code>String</code> </td>
<    <td> The name of the request attribute containing the <code>HttpServletRequest.getRequestURI()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getRequestURI()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
---
>       <td><code>javax.servlet.include.request_uri</code> <br> <code>String</code> </td>
>       <td>The name of the request attribute containing the <code>HttpServletRequest.getRequestURI()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br>**Note:** In Sling, the <code>HttpServletRequest.getRequestURI()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
158,159c177,178
<    <td> <code>javax.servlet.include.context_path</code> <br> <code>String</code> </td>
<    <td> The name of the request attribute containing the <code>HttpServletRequest.getContextPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getContextPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
---
>       <td><code>javax.servlet.include.context_path</code> <br> <code>String</code> </td>
>       <td>The name of the request attribute containing the <code>HttpServletRequest.getContextPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br>**Note:** In Sling, the <code>HttpServletRequest.getContextPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
162,163c181,182
<    <td> <code>javax.servlet.include.servlet_path</code> <br> <code>String</code> </td>
<    <td> The name of the request attribute containing the <code>HttpServletRequest.getServletPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getServletPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
---
>       <td><code>javax.servlet.include.servlet_path</code> <br> <code>String</code> </td>
>       <td>The name of the request attribute containing the <code>HttpServletRequest.getServletPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br>**Note:** In Sling, the <code>HttpServletRequest.getServletPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
166,167c185,186
<    <td> <code>javax.servlet.include.path_info</code> <br> <code>String</code> </td>
<    <td> The name of the request attribute containing the <code>HttpServletRequest.getPathInfo()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getPathInfo()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
---
>       <td><code>javax.servlet.include.path_info</code> <br> <code>String</code> </td>
>       <td>The name of the request attribute containing the <code>HttpServletRequest.getPathInfo()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br>**Note:** In Sling, the <code>HttpServletRequest.getPathInfo()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
170,171c189,190
<    <td> <code>javax.servlet.include.query_string</code> <br> <code>String</code> </td>
<    <td> The name of the request attribute containing the <code>HttpServletRequest.getQueryString()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getQueryString()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
---
>       <td><code>javax.servlet.include.query_string</code> <br> <code>String</code> </td>
>       <td>The name of the request attribute containing the <code>HttpServletRequest.getQueryString()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br>**Note:** In Sling, the <code>HttpServletRequest.getQueryString()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification. </td>
diff -b -B -r ./documentation/the-sling-engine/errorhandling.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/errorhandling.html
102c102
< <h2><a href="#resetting-the-response" id="resetting-the-response">Resetting the Response</a></h2> 
---
> <h2><a href="#resetting-the-response" name="resetting-the-response">Resetting the Response</a></h2>
111c111,112
<   </ul> </li> 
---
>     </ul>
>   </li>
116c117,118
<   </ul> </li> 
---
>     </ul>
>   </li>
118c120
< <h2><a href="#http-status-codes" id="http-status-codes">HTTP Status Codes</a></h2> 
---
> <h2><a href="#http-status-codes" name="http-status-codes">HTTP Status Codes</a></h2>
130c132
< <h2><a href="#uncaught-throwables" id="uncaught-throwables">Uncaught Throwables</a></h2> 
---
> <h2><a href="#uncaught-throwables" name="uncaught-throwables">Uncaught Throwables</a></h2>
134c136
< <h2><a href="#default-handler" id="default-handler">Default Handler</a></h2> 
---
> <h2><a href="#default-handler" name="default-handler">Default Handler</a></h2>
141,145c143
< <p>Starting with Sling Servlet Resolver version 2.0.10 the default error handler servlet is looked up using the string <code>default</code> as the request extension and the provided default servlet is registered as <code>&lt;prefix&gt;/sling/servlet/errorhandler/default.servlet</code> where 
<  <prefix>
<    is the last entry in the resource resolver search path, 
<   <code>/libs</code> by default.
<  </prefix></p> 
---
> <p>Starting with Sling Servlet Resolver version 2.0.10 the default error handler servlet is looked up using the string <code>default</code> as the request extension and the provided default servlet is registered as <code>&lt;prefix&gt;/sling/servlet/errorhandler/default.servlet</code> where <prefix> is the last entry in the resource resolver search path, <code>/libs</code> by default.</p>
diff -b -B -r ./documentation/the-sling-engine/featureflags.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/featureflags.html
110,111c110,111
<    <th> Property </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Description </th>
116,117c116,117
<    <td> <code>name</code> </td>
<    <td> Short name of this feature. This name is used to refer to this feature when checking for it to be enabled or not. This property is required and defaults to a name derived from the feature's class name and object identity. It is strongly recommended to define a useful and unique for the feature</td>
---
>       <td><code>name</code> </td>
>       <td>Short name of this feature. This name is used to refer to this feature when checking for it to be enabled or not. This property is required and defaults to a name derived from the feature's class name and object identity. It is strongly recommended to define a useful and unique for the feature</td>
120,121c120,121
<    <td> <code>description</code> </td>
<    <td> Description for the feature. The intent is to descibe the behaviour of the application if this feature would be enabled. It is recommended to define this property. The default value is the value of the name property. </td>
---
>       <td><code>description</code> </td>
>       <td>Description for the feature. The intent is to descibe the behaviour of the application if this feature would be enabled. It is recommended to define this property. The default value is the value of the name property. </td>
124,125c124,125
<    <td> <code>enabled</code> </td>
<    <td> Boolean flag indicating whether the feature is enabled or not by this configuration</td>
---
>       <td><code>enabled</code> </td>
>       <td>Boolean flag indicating whether the feature is enabled or not by this configuration</td>
diff -b -B -r ./documentation/the-sling-engine/filters.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/filters.html
98,102c98,103
<   See 
<  <a href="https://issues.apache.org/jira/browse/SLING-1213">SLING-1213</a>, 
<  <a href="https://issues.apache.org/jira/browse/SLING-1734">SLING-1734</a>, and 
<  <a href="http://markmail.org/message/quxhm7d5s6u66crr">Registering filters with Sling</a> for more details. The 
<  <a href="https://github.com/apache/sling-org-apache-sling-launchpad-test-services/blob/master/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java">NoPropertyFilter</a> from our integration tests shows an example Sling Filter. 
---
> See <a href="https://issues.apache.org/jira/browse/SLING-1213">SLING-1213</a>,
> <a href="https://issues.apache.org/jira/browse/SLING-1734">SLING-1734</a>, and
> <a href="http://markmail.org/message/quxhm7d5s6u66crr">Registering filters with Sling</a>
>  for more details. The 
> <a href="https://github.com/apache/sling-org-apache-sling-launchpad-test-services/blob/master/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java">NoPropertyFilter</a>
> from our integration tests shows an example Sling Filter.
108,112c109,113
<    <th> Property </th>
<    <th> Type </th>
<    <th> Default Value </th>
<    <th> Valid Values </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Type </th>
>       <th>Default Value </th>
>       <th>Valid Values </th>
>       <th>Description </th>
117,135c118,136
<    <td> <code>sling.filter.scope</code> </td>
<    <td> <code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code> </td>
<    <td> <code>request</code> </td>
<    <td> <code>REQUEST</code>, <code>INCLUDE</code>, <code>FORWARD</code>, <code>ERROR</code>, <code>COMPONENT</code> </td>
<    <td> Indication of which chain the filter should be added to. This property is required. If it is missing from the service, the service is ignored because it is assumed another consumer will be interested in using the service. Any unknown values of this property are also ignored causing the service to be completely ignored if none of the values provided by the property are valid. See below for the description of the filter chains. </td>
<   </tr> 
<   <tr>
<    <td> <code>sling.filter.pattern</code> </td>
<    <td> <code>String</code></td>
<    <td> <code>(-)</code> </td>
<    <td> Any <code>String</code> value </td>
<    <td> Restrict the filter to paths that match the supplied regular expression. Requires Sling Engine 2.4.0. </td>
<   </tr> 
<   <tr>
<    <td> <code>service.ranking</code> </td>
<    <td> <code>Integer</code> </td>
<    <td> <code>0</code> </td>
<    <td> Any <code>Integer</code> value </td>
<    <td> Indication of where to place the filter in the filter chain. The higher the number the earlier in the filter chain. This value may span the whole range of integer values. Two filters with equal <code>service.ranking</code> property value (explicitly set or default value of zero) will be ordered according to their <code>service.id</code> service property as described in section 5.2.5, Service Properties, of the OSGi Core Specification R 4.2. </td>
---
>       <td><code>sling.filter.scope</code> </td>
>       <td><code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code> </td>
>       <td><code>request</code> </td>
>       <td><code>REQUEST</code>, <code>INCLUDE</code>, <code>FORWARD</code>, <code>ERROR</code>, <code>COMPONENT</code> </td>
>       <td>Indication of which chain the filter should be added to. This property is required. If it is missing from the service, the service is ignored because it is assumed another consumer will be interested in using the service. Any unknown values of this property are also ignored causing the service to be completely ignored if none of the values provided by the property are valid. See below for the description of the filter chains. </td>
>     </tr>
>     <tr>
>       <td><code>sling.filter.pattern</code> </td>
>       <td><code>String</code></td>
>       <td><code>(-)</code> </td>
>       <td>Any <code>String</code> value </td>
>       <td>Restrict the filter to paths that match the supplied regular expression. Requires Sling Engine 2.4.0. </td>
>     </tr>
>     <tr>
>       <td><code>service.ranking</code> </td>
>       <td><code>Integer</code> </td>
>       <td><code>0</code> </td>
>       <td>Any <code>Integer</code> value </td>
>       <td>Indication of where to place the filter in the filter chain. The higher the number the earlier in the filter chain. This value may span the whole range of integer values. Two filters with equal <code>service.ranking</code> property value (explicitly set or default value of zero) will be ordered according to their <code>service.id</code> service property as described in section 5.2.5, Service Properties, of the OSGi Core Specification R 4.2. </td>
139c140
< <h2><a href="#filter-chains" id="filter-chains">Filter Chains</a></h2> 
---
> <h2><a href="#filter-chains" name="filter-chains">Filter Chains</a></h2>
145,147c146,148
<    <th> <code>sling.filter.scope</code> </th>
<    <th> Servlet API Correspondence </th>
<    <th> Description </th>
---
>       <th><code>sling.filter.scope</code> </th>
>       <th>Servlet API Correspondence </th>
>       <th>Description </th>
152,154c153,155
<    <td> <code>REQUEST</code> </td>
<    <td> <code>REQUEST</code> </td>
<    <td> Filters are called once per request hitting Sling from the outside. These filters are called after the resource addressed by the request URL and the Servlet or script to process the request has been resolved before the <code>COMPONENT</code> filters (if any) and the Servlet or script are called. </td>
---
>       <td><code>REQUEST</code> </td>
>       <td><code>REQUEST</code> </td>
>       <td>Filters are called once per request hitting Sling from the outside. These filters are called after the resource addressed by the request URL and the Servlet or script to process the request has been resolved before the <code>COMPONENT</code> filters (if any) and the Servlet or script are called. </td>
157,159c158,160
<    <td> <code>INCLUDE</code> </td>
<    <td> <code>INCLUDE</code> </td>
<    <td> Filters are called upon calling the <code>RequestDispatcher.include</code> method after the included resource and the Servlet or script to process the include have been resolved before the Servlet or script is called. </td>
---
>       <td><code>INCLUDE</code> </td>
>       <td><code>INCLUDE</code> </td>
>       <td>Filters are called upon calling the <code>RequestDispatcher.include</code> method after the included resource and the Servlet or script to process the include have been resolved before the Servlet or script is called. </td>
162,164c163,165
<    <td> <code>FORWARD</code> </td>
<    <td> <code>FORWARD</code> </td>
<    <td> Filters are called upon calling the <code>RequestDispatcher.forward</code> method after the included resource and the Servlet or script to process the include have been resolved before the Servlet or script is called. </td>
---
>       <td><code>FORWARD</code> </td>
>       <td><code>FORWARD</code> </td>
>       <td>Filters are called upon calling the <code>RequestDispatcher.forward</code> method after the included resource and the Servlet or script to process the include have been resolved before the Servlet or script is called. </td>
167,169c168,170
<    <td> <code>ERROR</code> </td>
<    <td> <code>ERROR</code> </td>
<    <td> Filters are called upon <code>HttpServletResponse.sendError</code> or any uncaught <code>Throwable</code> before resolving the error handler Servlet or script. </td>
---
>       <td><code>ERROR</code> </td>
>       <td><code>ERROR</code> </td>
>       <td>Filters are called upon <code>HttpServletResponse.sendError</code> or any uncaught <code>Throwable</code> before resolving the error handler Servlet or script. </td>
172,174c173,175
<    <td> <code>COMPONENT</code> </td>
<    <td> <code>REQUEST,INCLUDE,FORWARD</code> </td>
<    <td> The <code>COMPONENT</code> scoped filters are present for backwards compatibility with earlier Sling Engine releases. These filters will be called among the <code>INCLUDE</code> and <code>FORWARD</code> filters upon <code>RequestDispatcher.include</code> or <code>RequestDispatcher.forward</code> as well as before calling the request level Servlet or script after the <code>REQUEST</code> filters. </td>
---
>       <td><code>COMPONENT</code> </td>
>       <td><code>REQUEST,INCLUDE,FORWARD</code> </td>
>       <td>The <code>COMPONENT</code> scoped filters are present for backwards compatibility with earlier Sling Engine releases. These filters will be called among the <code>INCLUDE</code> and <code>FORWARD</code> filters upon <code>RequestDispatcher.include</code> or <code>RequestDispatcher.forward</code> as well as before calling the request level Servlet or script after the <code>REQUEST</code> filters. </td>
179c180
< <h2><a href="#filter-processing" id="filter-processing">Filter Processing</a></h2> 
---
> <h2><a href="#filter-processing" name="filter-processing">Filter Processing</a></h2>
188c189,190
<   </ul> </li> 
---
>     </ul>
>   </li>
196c198,199
<   </ul> </li> 
---
>     </ul>
>   </li>
206c209,210
<   </ul> </li> 
---
>     </ul>
>   </li>
209c213
< <h2><a href="#disabling-filters" id="disabling-filters">Disabling Filters</a></h2> 
---
> <h2><a href="#disabling-filters" name="disabling-filters">Disabling Filters</a></h2>
211c215
< <h2><a href="#troubleshooting" id="troubleshooting">Troubleshooting</a></h2> 
---
> <h2><a href="#troubleshooting" name="troubleshooting">Troubleshooting</a></h2>
213c217
< <h3><a href="#recent-requests-plugin" id="recent-requests-plugin">Recent Requests plugin</a></h3> 
---
> <h3><a href="#recent-requests-plugin" name="recent-requests-plugin">Recent Requests plugin</a></h3>
229c233
< <h3><a href="#config-status-plugin" id="config-status-plugin">Config Status plugin</a></h3> 
---
> <h3><a href="#config-status-plugin" name="config-status-plugin">Config Status plugin</a></h3>
252c256
< <h2><a href="#support-in-sling-engine-210" id="support-in-sling-engine-210">Support in Sling Engine 2.1.0</a></h2> 
---
> <h2><a href="#support-in-sling-engine-2-1-0" name="support-in-sling-engine-2-1-0">Support in Sling Engine 2.1.0</a></h2>
diff -b -B -r ./documentation/the-sling-engine/mappings-for-resource-resolution.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/mappings-for-resource-resolution.html
100,101c100,101
< <h2><a href="#configuration" id="configuration">Configuration</a></h2> 
< <h3><a href="#properties" id="properties">Properties</a></h3> 
---
> <h2><a href="#configuration" name="configuration">Configuration</a></h2>
> <h3><a href="#properties" name="properties">Properties</a></h3>
105,109c105,109
<  <li><code>sling:match</code> – This property when set on a node in the <code>/etc/map</code> tree (see below) defines a partial regular expression which is used instead of the node's name to match the incoming request. This property is only needed if the regular expression includes characters which are not valid JCR name characters. The list of invalid characters for JCR names is: <code>/, :, [, ], *, ', ", \, |</code> and any whitespace except blank space. In addition a name without a name space may not be <code>.</code> or <code>..</code> and a blank space is only allowed inside the name.</li> 
<  <li><code>sling:redirect</code> – This property when set on a node in the <code>/etc/map</code> tree (see below) causes a redirect response to be sent to the client, which causes the client to send in a new request with the modified location. The value of this property is applied to the actual request and sent back as the value of <code>Location</code> response header.</li> 
<  <li><code>sling:status</code> – This property defines the HTTP status code sent to the client with the <code>sling:redirect</code> response. If this property is not set, it defaults to 302 (Found). Other status codes supported are 300 (Multiple Choices), 301 (Moved Permanently), 303 (See Other), and 307 (Temporary Redirect).</li> 
<  <li><code>sling:internalRedirect</code> – This property when set on a node in the <code>/etc/map</code> tree (see below) causes the current path to be modified internally to continue with resource resolution. This is a multi-value property, i.e. multiple paths can be given here, which are tried one after another until one resolved to a resource.</li> 
<  <li><code>sling:alias</code> – The property may be set on any resource to indicate an alias name for the resource. For example the resource <code>/content/visitors</code> may have the <code>sling:alias</code> property set to <code>besucher</code> allowing the resource to be addressed in an URL as <code>/content/besucher</code>.</li> 
---
>   <li><code>sling:match</code> &ndash; This property when set on a node in the <code>/etc/map</code> tree (see below) defines a partial regular expression which is used instead of the node's name to match the incoming request. This property is only needed if the regular expression includes characters which are not valid JCR name characters. The list of invalid characters for JCR names is: <code>/, :, [, ], *, &#39;, &quot;, \, |</code> and any whitespace except blank space. In addition a name without a name space may not be <code>.</code> or <code>..</code> and a blank space is only allowed inside the name.</li>
>   <li><code>sling:redirect</code> &ndash; This property when set on a node in the <code>/etc/map</code> tree (see below) causes a redirect response to be sent to the client, which causes the client to send in a new request with the modified location. The value of this property is applied to the actual request and sent back as the value of <code>Location</code> response header.</li>
>   <li><code>sling:status</code> &ndash; This property defines the HTTP status code sent to the client with the <code>sling:redirect</code> response. If this property is not set, it defaults to 302 (Found). Other status codes supported are 300 (Multiple Choices), 301 (Moved Permanently), 303 (See Other), and 307 (Temporary Redirect).</li>
>   <li><code>sling:internalRedirect</code> &ndash; This property when set on a node in the <code>/etc/map</code> tree (see below) causes the current path to be modified internally to continue with resource resolution. This is a multi-value property, i.e. multiple paths can be given here, which are tried one after another until one resolved to a resource.</li>
>   <li><code>sling:alias</code> &ndash; The property may be set on any resource to indicate an alias name for the resource. For example the resource <code>/content/visitors</code> may have the <code>sling:alias</code> property set to <code>besucher</code> allowing the resource to be addressed in an URL as <code>/content/besucher</code>.</li>
111c111
< <h4><a href="#limitation-of-slingalias-for-principal-with-a-limited-access" id="limitation-of-slingalias-for-principal-with-a-limited-access">Limitation of <code>sling:alias</code> for Principal with a limited access</a></h4> 
---
> <h4>Limitation of <code>sling:alias</code> for Principal with a limited access</h4>
119c119
< <h3><a href="#node-types" id="node-types">Node Types</a></h3> 
---
> <h3><a href="#node-types" name="node-types">Node Types</a></h3>
122,124c122,124
<  <li><code>sling:ResourceAlias</code> – This mixin node type defines the <code>sling:alias</code> property and may be attached to any node, which does not otherwise allow setting a property named <code>sling:alias</code></li> 
<  <li><code>sling:MappingSpec</code> – This mixin node type defines the <code>sling:match</code>, <code>sling:redirect</code>, <code>sling:status</code>, and <code>sling:internaleRedirect</code> properties to define a matching and redirection inside the <code>/etc/map</code> hierarchy.</li> 
<  <li><code>sling:Mapping</code> – Primary node type which may be used to easily construct entries in the <code>/etc/map</code> tree. The node type extends the <code>sling:MappingSpec</code> mixin node type to allow setting the required matching and redirection. In addition the <code>sling:Resource</code> mixin node type is extended to allow setting a resource type and the <code>nt:hierarchyNode</code> node type is extended to allow locating nodes of this node type below <code>nt:folder</code> nodes.</li> 
---
>   <li><code>sling:ResourceAlias</code> &ndash; This mixin node type defines the <code>sling:alias</code> property and may be attached to any node, which does not otherwise allow setting a property named <code>sling:alias</code></li>
>   <li><code>sling:MappingSpec</code> &ndash; This mixin node type defines the <code>sling:match</code>, <code>sling:redirect</code>, <code>sling:status</code>, and <code>sling:internaleRedirect</code> properties to define a matching and redirection inside the <code>/etc/map</code> hierarchy.</li>
>   <li><code>sling:Mapping</code> &ndash; Primary node type which may be used to easily construct entries in the <code>/etc/map</code> tree. The node type extends the <code>sling:MappingSpec</code> mixin node type to allow setting the required matching and redirection. In addition the <code>sling:Resource</code> mixin node type is extended to allow setting a resource type and the <code>nt:hierarchyNode</code> node type is extended to allow locating nodes of this node type below <code>nt:folder</code> nodes.</li>
127,128c127,128
< <h2><a href="#namespace-mangling" id="namespace-mangling">Namespace Mangling</a></h2> 
< <p>There are systems accessing Sling, which have a hard time handling URLs containing colons – <code>:</code> – in the path part correctly. Since URLs produced and supported by Sling may contain colons because JCR Item based resources may be namespaced (e.g. <code>jcr:content</code>), a special namespace mangling feature is built into the <code>ResourceResolver.resolve</code> and <code>ResourceResolver(map)</code> methods.</p> 
---
> <h2><a href="#namespace-mangling" name="namespace-mangling">Namespace Mangling</a></h2>
> <p>There are systems accessing Sling, which have a hard time handling URLs containing colons &ndash; <code>:</code> &ndash; in the path part correctly. Since URLs produced and supported by Sling may contain colons because JCR Item based resources may be namespaced (e.g. <code>jcr:content</code>), a special namespace mangling feature is built into the <code>ResourceResolver.resolve</code> and <code>ResourceResolver(map)</code> methods.</p>
132,133c132,133
< <p><em>Example</em>: The path <code>/content/*a*sample/*jcr*content/*jcr*data.png{*</code>} <em>is modified by namespace mangling in the</em> <code>{*}resolve{*</code>} <em>method to get</em> <code>*/content/*a*sample/jcr:content/jcr:data.png{*}{</code>}<em>. The prefix</em> <code>*\*a{*}{</code>}<code>{</code>} is not modified because there is no registered namespace with prefix <code>a</code>. On the other hand the prefix <code>{*}jcr{*</code>} is modified because there is of course a registered namespace with prefix <code>jcr</code>.</p> 
< <h2><a href="#root-level-mappings" id="root-level-mappings">Root Level Mappings</a></h2> 
---
> <p><em>Example</em>: The path <code>/content/*a*sample/*jcr*content/*jcr*data.png{*</code>} <em>is modified by namespace mangling in the</em> <code>{*}resolve{*</code>} <em>method to get</em> <code>*/content/*a*sample/jcr:content/jcr:data.png{*}{</code>}*. The prefix* <code>*\*a{*}{</code>}<code>{</code>} is not modified because there is no registered namespace with prefix <code>a</code>. On the other hand the prefix <code>{*}jcr{*</code>} is modified because there is of course a registered namespace with prefix <code>jcr</code>.</p>
> <h2><a href="#root-level-mappings" name="root-level-mappings">Root Level Mappings</a></h2>
135c135
< <h3><a href="#mapping-entry-specification" id="mapping-entry-specification">Mapping Entry Specification</a></h3> 
---
> <h3><a href="#mapping-entry-specification" name="mapping-entry-specification">Mapping Entry Specification</a></h3>
142c142
<            |    +-- sling:redirect = "http://www.example.com/"
---
>            |    +-- sling:redirect = &quot;http://www.example.com/&quot;
144c144
<            |    +-- sling:internalRedirect = "/example"
---
>            |    +-- sling:internalRedirect = &quot;/example&quot;
146,147c146,147
<            |    +-- sling:match = ".+\.example\.com\.80"
<            |    +-- sling:redirect = "http://www.example.com/"
---
>            |    +-- sling:match = &quot;.+\.example\.com\.80&quot;
>            |    +-- sling:redirect = &quot;http://www.example.com/&quot;
149,150c149,150
<            |    +-- sling:match = "localhost\.\d*"
<            |    +-- sling:internalRedirect = "/content"
---
>            |    +-- sling:match = &quot;localhost\.\d*&quot;
>            |    +-- sling:internalRedirect = &quot;/content&quot;
152c152
<            |    |    +-- sling:internalRedirect = "/scripts"
---
>            |    |    +-- sling:internalRedirect = &quot;/scripts&quot;
154c154
<            |    |    +-- sling:internalRedirect = "http://gbiv.com"
---
>            |    |    +-- sling:internalRedirect = &quot;http://gbiv.com&quot;
156c156
<            |         +-- sling:internalRedirect = "/anecdotes/$1"
---
>            |         +-- sling:internalRedirect = &quot;/anecdotes/$1&quot;
158,159c158,159
<                 +-- sling:match = "$1.example.com/$2"
<                 +-- sling:internalRedirect = "/content/([^/]+)/(.*)"
---
>                 +-- sling:match = &quot;$1.example.com/$2&quot;
>                 +-- sling:internalRedirect = &quot;/content/([^/]+)/(.*)&quot;
165,168c165,168
<    <th> Regular Expression </th>
<    <th> Redirect </th>
<    <th> Internal </th>
<    <th> Description </th>
---
>       <th>Regular Expression </th>
>       <th>Redirect </th>
>       <th>Internal </th>
>       <th>Description </th>
173,176c173,176
<    <td> http/example.com.80 </td>
<    <td> http://www.example.com </td>
<    <td> no </td>
<    <td> Redirect all requests to the Second Level Domain to www </td>
---
>       <td>http/example.com.80 </td>
>       <td>http://www.example.com </td>
>       <td>no </td>
>       <td>Redirect all requests to the Second Level Domain to www </td>
179,182c179,182
<    <td> http/www.example.com.80 </td>
<    <td> /example </td>
<    <td> yes </td>
<    <td> Prefix the URI paths of the requests sent to this domain with the string <code>/example</code> </td>
---
>       <td>http/www.example.com.80 </td>
>       <td>/example </td>
>       <td>yes </td>
>       <td>Prefix the URI paths of the requests sent to this domain with the string <code>/example</code> </td>
185,188c185,188
<    <td> http/.+.example.com.80 </td>
<    <td> http://www.example.com </td>
<    <td> no </td>
<    <td> Redirect all requests to sub domains to www. The actual regular expression for the host.port segment is taken from the <code>sling:match</code> property. </td>
---
>       <td>http/.+.example.com.80 </td>
>       <td>http://www.example.com </td>
>       <td>no </td>
>       <td>Redirect all requests to sub domains to www. The actual regular expression for the host.port segment is taken from the <code>sling:match</code> property. </td>
191,194c191,194
<    <td> http/localhost.\d* </td>
<    <td> /content </td>
<    <td> yes </td>
<    <td> Prefix the URI paths with <code>/content</code> for requests to localhost, regardless of actual port the request was received on. This entry only applies if the URI path does not start with <code>/cgi-bin</code>, <code>gateway</code> or <code>stories</code> because there are longer match entries. The actual regular expression for the host.port segment is taken from the <code>sling:match</code> property. </td>
---
>       <td>http/localhost.\d* </td>
>       <td>/content </td>
>       <td>yes </td>
>       <td>Prefix the URI paths with <code>/content</code> for requests to localhost, regardless of actual port the request was received on. This entry only applies if the URI path does not start with <code>/cgi-bin</code>, <code>gateway</code> or <code>stories</code> because there are longer match entries. The actual regular expression for the host.port segment is taken from the <code>sling:match</code> property. </td>
197,200c197,200
<    <td> http/localhost.\d*/cgi-bin </td>
<    <td> /scripts </td>
<    <td> yes </td>
<    <td> Replace the <code>/cgi-bin</code> prefix in the URI path with <code>/scripts</code> for requests to localhost, regardless of actual port the request was received on. </td>
---
>       <td>http/localhost.\d*/cgi-bin </td>
>       <td>/scripts </td>
>       <td>yes </td>
>       <td>Replace the <code>/cgi-bin</code> prefix in the URI path with <code>/scripts</code> for requests to localhost, regardless of actual port the request was received on. </td>
203,206c203,206
<    <td> http/localhost.\d*/gateway </td>
<    <td> http://gbiv.com </td>
<    <td> yes </td>
<    <td> Replace the <code>/gateway</code> prefix in the URI path with <code>http://gbiv.com</code> for requests to localhost, regardless of actual port the request was received on. </td>
---
>       <td>http/localhost.\d*/gateway </td>
>       <td>http://gbiv.com </td>
>       <td>yes </td>
>       <td>Replace the <code>/gateway</code> prefix in the URI path with <code>http://gbiv.com</code> for requests to localhost, regardless of actual port the request was received on. </td>
209,212c209,212
<    <td> http/localhost.\d*/(stories) </td>
<    <td> /anecdotes/stories </td>
<    <td> yes </td>
<    <td> Prepend the URI paths starting with <code>/stories</code> with <code>/anecdotes</code> for requests to localhost, regardless of actual port the request was received on. </td>
---
>       <td>http/localhost.\d*/(stories) </td>
>       <td>/anecdotes/stories </td>
>       <td>yes </td>
>       <td>Prepend the URI paths starting with <code>/stories</code> with <code>/anecdotes</code> for requests to localhost, regardless of actual port the request was received on. </td>
216c216
< <h3><a href="#regular-expression-matching" id="regular-expression-matching">Regular Expression Matching</a></h3> 
---
> <h3><a href="#regular-expression-matching" name="regular-expression-matching">Regular Expression Matching</a></h3>
219,220c219,220
< <pre><code><!-- TODO syntax marker (#!java) disabled -->String path = request.getScheme + "/" + request.getServerName()
<         + "." + request.getServerPort() + "/" + request.getPathInfo();
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->String path = request.getScheme + &quot;/&quot; + request.getServerName()
>         + &quot;.&quot; + request.getServerPort() + &quot;/&quot; + request.getPathInfo();
235,238c235,238
< <h4><a href="#regular-expressions-for-reverse-mappings" id="regular-expressions-for-reverse-mappings">Regular Expressions for Reverse Mappings</a></h4> 
< <p>By default using regular expressions with wildcards will prevent to use the mapping entry for reverse mappings (see above).</p> 
< <p>There is one exception though: If there is a <code>sling:internalRedirect</code> property containing a regular expression the map entry will be <em>exclusively used for reverse mappings</em> (i.e. used only for <code>ResourceResolver.map(...)</code>) (see also <a href="https://issues.apache.org/jira/browse/SLING-2560">SLING-2560</a>). The same resource may carry a <code>sling:match</code> property with wildcards and groups referring to the groups being defined in the <code>sling:internalRedirect</code> property.</p> 
< <p>This example</p> 
---
> <h4><a href="#regular-expressions-for-reverse-mappings" name="regular-expressions-for-reverse-mappings">Regular Expressions for Reverse Mappings</a></h4>
> <p>By default using regular expressions with wildcards will prevent to use the mapping entry for reverse mappings (see above). </p>
> <p>There is one exception though: If there is a <code>sling:internalRedirect</code> property containing a regular expression the map entry will be <em>exclusively used for reverse mappings</em> (i.e. used only for <code>ResourceResolver.map(...)</code>) (see also <a href="https://issues.apache.org/jira/browse/SLING-2560">SLING-2560</a>). The same resource may carry a <code>sling:match</code> property with wildcards and groups referring to the groups being defined in the <code>sling:internalRedirect</code> property. </p>
> <p>This example </p>
242,243c242,243
<            |    +-- sling:internalRedirect = "/content/([^/]+)/home/(.*)"
<            |    +-- sling:match = "$1/index/$2"
---
>            |    +-- sling:internalRedirect = &quot;/content/([^/]+)/home/(.*)&quot;
>            |    +-- sling:match = &quot;$1/index/$2&quot;
249,250c249,250
<    <th> Pattern </th>
<    <th> Replacement </th>
---
>       <th>Pattern </th>
>       <th>Replacement </th>
255,256c255,256
<    <td> /content/([^/]+)/home/(.*) </td>
<    <td> http://example.com/$1/index/$2 </td>
---
>       <td>/content/([^/]+)/home/(.*) </td>
>       <td>http://example.com/$1/index/$2 </td>
260c260
< <h3><a href="#redirection-values" id="redirection-values">Redirection Values</a></h3> 
---
> <h3><a href="#redirection-values" name="redirection-values">Redirection Values</a></h3>
270,271c270,271
< <h2><a href="#resource-tree-access" id="resource-tree-access">Resource Tree Access</a></h2> 
< <p>The result of Root Level Mapping is an absolute or relative path to a resource. If the path is relative – e.g. <code>myproject/docroot/sample.gif</code> – the resource resolver search path (<code>ResourceResolver.getSearchPath()</code> is used to build absolute paths and resolve the resource. In this case the first resource found is used. If the result of Root Level Mapping is an absolute path, the path is used as is.</p> 
---
> <h2><a href="#resource-tree-access" name="resource-tree-access">Resource Tree Access</a></h2>
> <p>The result of Root Level Mapping is an absolute or relative path to a resource. If the path is relative &ndash; e.g. <code>myproject/docroot/sample.gif</code> &ndash; the resource resolver search path (<code>ResourceResolver.getSearchPath()</code> is used to build absolute paths and resolve the resource. In this case the first resource found is used. If the result of Root Level Mapping is an absolute path, the path is used as is.</p>
279c279
< <h3><a href="#drilling-down-the-resource-tree" id="drilling-down-the-resource-tree">Drilling Down the Resource Tree</a></h3> 
---
> <h3><a href="#drilling-down-the-resource-tree" name="drilling-down-the-resource-tree">Drilling Down the Resource Tree</a></h3>
283,284c283,284
< Resource current = getResource("/");
< String[] segments = path.split("/");
---
> Resource current = getResource(&quot;/&quot;);
> String[] segments = path.split(&quot;/&quot;);
306c306
< <h2><a href="#rebuild-the-vanity-bloom-filter" id="rebuild-the-vanity-bloom-filter">Rebuild The Vanity Bloom Filter</a></h2> 
---
> <h2><a href="#rebuild-the-vanity-bloom-filter" name="rebuild-the-vanity-bloom-filter">Rebuild The Vanity Bloom Filter</a></h2>
316c316
< <h2><a href="#debugging-issues" id="debugging-issues">Debugging Issues</a></h2> 
---
> <h2><a href="#debugging-issues" name="debugging-issues">Debugging Issues</a></h2>
diff -b -B -r ./documentation/the-sling-engine/request-listeners.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/request-listeners.html
99c99
< 	static final String SERVICE_NAME = "org.apache.sling.api.request.SlingRequestListener";	
---
>     static final String SERVICE_NAME = &quot;org.apache.sling.api.request.SlingRequestListener&quot;;    
113,114c113,114
< <p>There are no special properties to set.</p> 
< <h2><a href="#supported-types-of-events" id="supported-types-of-events">Supported types of events</a></h2> 
---
> <p>There are no special properties to set. </p>
> <h2><a href="#supported-types-of-events" name="supported-types-of-events">Supported types of events</a></h2>
119,120c119,120
<    <th> events types (<code>SlingRequestEvent.EventType</code>) </th>
<    <th> point in time </th>
---
>       <th>events types (<code>SlingRequestEvent.EventType</code>) </th>
>       <th>point in time </th>
125,126c125,126
<    <td> EVENT_INIT </td>
<    <td> after entering the <code>service</code> method in <code>SlingMainServlet</code>. Note that this will be <strong>after</strong> the <code>handleSecurity</code> call. </td>
---
>       <td>EVENT_INIT </td>
>       <td>after entering the <code>service</code> method in <code>SlingMainServlet</code>. Note that this will be <strong>after</strong> the <code>handleSecurity</code> call. </td>
129,130c129,130
<    <td> EVENT_DESTROY </td>
<    <td> at the end of the <code>service</code> method in <code>SlingMainServlet</code> </td>
---
>       <td>EVENT_DESTROY </td>
>       <td>at the end of the <code>service</code> method in <code>SlingMainServlet</code> </td>
diff -b -B -r ./documentation/the-sling-engine/request-parameters.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/request-parameters.html
96c96
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#servlet-api" id="servlet-api">Servlet API</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#servlet-api" name="servlet-api">Servlet API</a></h2>
101,102c101,102
<    <th> Method </th>
<    <th> Description </th>
---
>       <th>Method </th>
>       <th>Description </th>
107,108c107,108
<    <td> <code>HttpServletRequest.getQueryString()</code> </td>
<    <td> Returns the query part of the request URL </td>
---
>       <td><code>HttpServletRequest.getQueryString()</code> </td>
>       <td>Returns the query part of the request URL </td>
111,112c111,112
<    <td> <code>ServletRequest.getParameter(String)</code> </td>
<    <td> Returns the (first) named parameter </td>
---
>       <td><code>ServletRequest.getParameter(String)</code> </td>
>       <td>Returns the (first) named parameter </td>
115,116c115,116
<    <td> <code>ServletRequest.getParameterValues(String)</code> </td>
<    <td> Returns all parameters of that name </td>
---
>       <td><code>ServletRequest.getParameterValues(String)</code> </td>
>       <td>Returns all parameters of that name </td>
119,120c119,120
<    <td> <code>ServletRequest.getParameterMap()</code> </td>
<    <td> Returns all parameters as a map of <code>String[]</code> </td>
---
>       <td><code>ServletRequest.getParameterMap()</code> </td>
>       <td>Returns all parameters as a map of <code>String[]</code> </td>
123,124c123,124
<    <td> <code>ServletRequest.getParameterNames()</code> </td>
<    <td> Returns an enumeration of the names of the parameters </td>
---
>       <td><code>ServletRequest.getParameterNames()</code> </td>
>       <td>Returns an enumeration of the names of the parameters </td>
127,128c127,128
<    <td> <code>ServletRequest.getParts()</code> </td>
<    <td> Returns all parts of the multipart request (since v3.0) </td>
---
>       <td><code>ServletRequest.getParts()</code> </td>
>       <td>Returns all parts of the multipart request (since v3.0) </td>
131,132c131,132
<    <td> <code>ServletRequest.getPart(String)</code> </td>
<    <td> Returns the request part with that name in case of multipart requests (since v3.0) </td>
---
>       <td><code>ServletRequest.getPart(String)</code> </td>
>       <td>Returns the request part with that name in case of multipart requests (since v3.0) </td>
136,137c136,137
< <p>The actual encoding of the parameters is all but safe because the encoding of URLs is not very well defined and browsers do not set the character encoding when sending post data. Fortunately, they use the same character encoding for sending back form content as was used by the server to send the form.</p> 
< <h2><a href="#sling-api" id="sling-api">Sling API</a></h2> 
---
> <p>The actual encoding of the parameters is all but safe because the encoding of URLs is not very well defined and browsers do not set the character encoding when sending post data. Fortunately, they use the same character encoding for sending back form content as was used by the server to send the form. </p>
> <h2><a href="#sling-api" name="sling-api">Sling API</a></h2>
142,143c142,143
<    <th> Type </th>
<    <th> Description </th>
---
>       <th>Type </th>
>       <th>Description </th>
148,149c148,149
<    <td> Raw Content </td>
<    <td> Byte array and <code>InputStream</code> representation of the request parameter values. You will generally use the <code>InputStream</code> to handle uploaded files. </td>
---
>       <td>Raw Content </td>
>       <td>Byte array and <code>InputStream</code> representation of the request parameter values. You will generally use the <code>InputStream</code> to handle uploaded files. </td>
152,153c152,153
<    <td> String Content </td>
<    <td> Access the values as strings is some given encoding (see below) or by requesting the conversion using an explicit encoding. </td>
---
>       <td>String Content </td>
>       <td>Access the values as strings is some given encoding (see below) or by requesting the conversion using an explicit encoding. </td>
156,157c156,157
<    <td> File Uploads </td>
<    <td> Find out whether a parameter is a file upload, get the size in bytes of the parameter value and client side file name as sent by the browser. </td>
---
>       <td>File Uploads </td>
>       <td>Find out whether a parameter is a file upload, get the size in bytes of the parameter value and client side file name as sent by the browser. </td>
165,166c165,166
<    <th> Method </th>
<    <th> Description </th>
---
>       <th>Method </th>
>       <th>Description </th>
171,172c171,172
<    <td> <code>getRequestParameter(String)</code> </td>
<    <td> Returns the (first) named parameter as a <code>RequestParameter</code> instance </td>
---
>       <td><code>getRequestParameter(String)</code> </td>
>       <td>Returns the (first) named parameter as a <code>RequestParameter</code> instance </td>
175,176c175,176
<    <td> <code>getRequestParameters(String)</code> </td>
<    <td> Returns the named parameter as an array of <code>RequestParameter</code> instances </td>
---
>       <td><code>getRequestParameters(String)</code> </td>
>       <td>Returns the named parameter as an array of <code>RequestParameter</code> instances </td>
179,180c179,180
<    <td> <code>getRequestParameterMap()</code> </td>
<    <td> Returns <code>RequestParameterMap</code> being a map of <code>RequestParameter</code> arrays indexed by parameter names </td>
---
>       <td><code>getRequestParameterMap()</code> </td>
>       <td>Returns <code>RequestParameterMap</code> being a map of <code>RequestParameter</code> arrays indexed by parameter names </td>
191c191
< <h3><a href="#effects-of-sling-on-servlet-api-parameter-methods" id="effects-of-sling-on-servlet-api-parameter-methods">Effects of Sling on Servlet API parameter methods</a></h3> 
---
> <h3><a href="#effects-of-sling-on-servlet-api-parameter-methods" name="effects-of-sling-on-servlet-api-parameter-methods">Effects of Sling on Servlet API parameter methods</a></h3>
203c203
< <h2><a href="#character-encoding" id="character-encoding">Character Encoding</a></h2> 
---
> <h2><a href="#character-encoding" name="character-encoding">Character Encoding</a></h2>
217,223c217,218
<   Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the 
<  <code>_charset_</code> request parameter is missing. As of Sling Engine 2.2.4 the 
<  <code>_charset_</code> request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the 
<  <code>_charset_</code> request parameter is missing. To enable this functionality set the 
<  <code>sling.default.parameter.encoding</code> parameter of the Sling Main Servlet (PID 
<  <code>org.apache.sling.engine.impl.SlingMainServlet</code>) configuration (for Sling Engine &lt; 2.3.0) or the same parameter of the Sling Request Parameter Handling (PID 
<  <code>org.apache.sling.engine.parameters</code>) configuration (for Sling Engine &gt;= 2.3.0 ) to the desired encoding, which of course must be supported by the actual Java Platform. 
---
> Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the <code>_charset_</code> request parameter is missing. As of Sling Engine 2.2.4 the <code>_charset_</code> request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the <code>_charset_</code> request parameter is missing. 
> To enable this functionality set the <code>sling.default.parameter.encoding</code> parameter of the Sling Main Servlet (PID <code>org.apache.sling.engine.impl.SlingMainServlet</code>) configuration (for Sling Engine < 2.3.0) or the same parameter of the Sling Request Parameter Handling (PID <code>org.apache.sling.engine.parameters</code>) configuration (for Sling Engine >= 2.3.0 ) to the desired encoding, which of course must be supported by the actual Java Platform.
diff -b -B -r ./documentation/the-sling-engine/resources.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/resources.html
98c98
< <h2><a href="#what-is-a-resource" id="what-is-a-resource">What is a Resource</a></h2> 
---
> <h2><a href="#what-is-a-resource" name="what-is-a-resource">What is a Resource</a></h2>
100c100
< <h3><a href="#resource-properties" id="resource-properties">Resource Properties</a></h3> 
---
> <h3><a href="#resource-properties" name="resource-properties">Resource Properties</a></h3>
105,106c105,106
<    <th> Property </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Description </th>
111,112c111,112
<    <td> Path </td>
<    <td> Resources are part of a Resource Tree. As such each Resource has a path which is formed by concatenating the names of all Resources along the root to the Resource separated by a slash. Ok, really, this is much like a URL path or a file system path where the slash (<code>/</code>) is the separator character. </td>
---
>       <td>Path </td>
>       <td>Resources are part of a Resource Tree. As such each Resource has a path which is formed by concatenating the names of all Resources along the root to the Resource separated by a slash. Ok, really, this is much like a URL path or a file system path where the slash (<code>/</code>) is the separator character. </td>
115,116c115,116
<    <td> Name </td>
<    <td> The name of the Resource is the last element (or segment) in the path. </td>
---
>       <td>Name </td>
>       <td>The name of the Resource is the last element (or segment) in the path. </td>
119,120c119,120
<    <td> Resource Type </td>
<    <td> Each resource has a resource type which is used by the Servlet and Script resolver to find the appropriate Servlet or Script to handle the request for the Resource. </td>
---
>       <td>Resource Type </td>
>       <td>Each resource has a resource type which is used by the Servlet and Script resolver to find the appropriate Servlet or Script to handle the request for the Resource. </td>
123,124c123,124
<    <td> Resource Super Type </td>
<    <td> The (optional explicit) super type of the Resource. See the section <em>Resource Types</em> below for more details. </td>
---
>       <td>Resource Super Type </td>
>       <td>The (optional explicit) super type of the Resource. See the section <em>Resource Types</em> below for more details. </td>
127,128c127,128
<    <td> Adapters </td>
<    <td> Resources are always <code>Adaptable</code> and therefore can be adapted to a different view. See the section <em>Resource Adapters</em> below for more details. </td>
---
>       <td>Adapters </td>
>       <td>Resources are always <code>Adaptable</code> and therefore can be adapted to a different view. See the section <em>Resource Adapters</em> below for more details. </td>
131,132c131,132
<    <td> Metadata </td>
<    <td> Resources in general support <a href="http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/ResourceMetadata.html" title="ResourceMetadata">link text</a> providing access to values such as the length of a binary resource (which can be streamed) or the Resource's content type. </td>
---
>       <td>Metadata </td>
>       <td>Resources in general support <a href="http://sling.apache.org/apidocs/sling8/org/apache/sling/api/resource/ResourceMetadata.html" title="ResourceMetadata">link text</a> providing access to values such as the length of a binary resource (which can be streamed) or the Resource's content type. </td>
137c137
< <h3><a href="#resource-types" id="resource-types">Resource Types</a></h3> 
---
> <h3><a href="#resource-types" name="resource-types">Resource Types</a></h3>
142,144c142,144
<    <th> Provider </th>
<    <th> Resource Type </th>
<    <th> Resource Super Type </th>
---
>       <th>Provider </th>
>       <th>Resource Type </th>
>       <th>Resource Super Type </th>
149,151c149,151
<    <td> JCR </td>
<    <td> The value of the <code>sling:resourceType</code> property or the primary node type if the property is not set (a namespace separator colon is replaced by a slash, e.g. the <code>nt:file</code> primary node type is mapped to the <code>nt/file</code> resource type </td>
<    <td> The value of the <code>sling:resourceSuperType</code> of the Resource node or resource super type of the resource pointed to by the resource type (when accessed with <code>ResourceResolver.getResource(String)</code> </td>
---
>       <td>JCR </td>
>       <td>The value of the <code>sling:resourceType</code> property or the primary node type if the property is not set (a namespace separator colon is replaced by a slash, e.g. the <code>nt:file</code> primary node type is mapped to the <code>nt/file</code> resource type </td>
>       <td>The value of the <code>sling:resourceSuperType</code> of the Resource node or resource super type of the resource pointed to by the resource type (when accessed with <code>ResourceResolver.getResource(String)</code> </td>
154,156c154,156
<    <td> File System </td>
<    <td> File based resources are of type <code>nt/file</code>; folder based resources are of type <code>nt/folder</code> corresponding to the respective JCR primary node type </td>
<    <td> none </td>
---
>       <td>File System </td>
>       <td>File based resources are of type <code>nt/file</code>; folder based resources are of type <code>nt/folder</code> corresponding to the respective JCR primary node type </td>
>       <td>none </td>
159,161c159,161
<    <td> Bundle </td>
<    <td> File based resources are of type <code>nt/file</code>; folder based resources are of type <code>nt/folder</code> corresponding to the respective JCR primary node type </td>
<    <td> none </td>
---
>       <td>Bundle </td>
>       <td>File based resources are of type <code>nt/file</code>; folder based resources are of type <code>nt/folder</code> corresponding to the respective JCR primary node type </td>
>       <td>none </td>
164,166c164,166
<    <td> Servlet </td>
<    <td> The absolute path of the resource appended with the suffix <code>.servlet</code> </td>
<    <td> <code>sling/bundle/resource</code> </td>
---
>       <td>Servlet </td>
>       <td>The absolute path of the resource appended with the suffix <code>.servlet</code> </td>
>       <td><code>sling/bundle/resource</code> </td>
171c171
< <h3><a href="#adapters" id="adapters">Adapters</a></h3> 
---
> <h3><a href="#adapters" name="adapters">Adapters</a></h3>
174c174
< <h2><a href="#how-to-get-a-resource" id="how-to-get-a-resource">How to get a Resource</a></h2> 
---
> <h2><a href="#how-to-get-a-resource" name="how-to-get-a-resource">How to get a Resource</a></h2>
182c182
< <h3><a href="#absolute-path-mapping" id="absolute-path-mapping">Absolute Path Mapping</a></h3> 
---
> <h3><a href="#absolute-path-mapping" name="absolute-path-mapping">Absolute Path Mapping</a></h3>
189c189
<  <li>If no mapping created a mapped path addressing an existing Resource, the method fails and returns a <code>NonExistingResource</code> (for the<br> <code>resolve(String)</code> and <code>resolve(HttpServletRequest,String)</code>) or null (for the <code>getResource(String path)</code> and <code>getResource(Resource base, String path)</code> methods).</li> 
---
>   <li>If no mapping created a mapped path addressing an existing Resource, the method fails and returns a <code>NonExistingResource</code> (for the<br/><code>resolve(String)</code> and <code>resolve(HttpServletRequest,String)</code>) or null (for the <code>getResource(String path)</code> and <code>getResource(Resource base, String path)</code> methods).</li>
195c195
< <h3><a href="#relative-path-resolution" id="relative-path-resolution">Relative Path Resolution</a></h3> 
---
> <h3><a href="#relative-path-resolution" name="relative-path-resolution">Relative Path Resolution</a></h3>
199c199
< <h3><a href="#querying-resources" id="querying-resources">Querying Resources</a></h3> 
---
> <h3><a href="#querying-resources" name="querying-resources">Querying Resources</a></h3>
208c208
< <h2><a href="#providing-resources" id="providing-resources">Providing Resources</a></h2> 
---
> <h2><a href="#providing-resources" name="providing-resources">Providing Resources</a></h2>
218c218
< <h3><a href="#jcr-based-resources" id="jcr-based-resources">JCR-based Resources</a></h3> 
---
> <h3><a href="#jcr-based-resources" name="jcr-based-resources">JCR-based Resources</a></h3>
220c220
< <h3><a href="#bundle-based-resources" id="bundle-based-resources">Bundle-based Resources</a></h3> 
---
> <h3><a href="#bundle-based-resources" name="bundle-based-resources">Bundle-based Resources</a></h3>
222c222
< <p>The <code>BundleResourceProvider</code> supporting bundle-based Resources provides directories as Resources of type <code>nt:folder</code> and files as Resources of type <code>nt:file</code>. This matches the default primary node types intended to be used for directories and files in JCR repositories.</p> 
---
> <p>The <code>BundleResourceProvider</code> supporting bundle-based Resources provides directories as Resources of type <code>nt:folder</code> and files as Resources of type <code>nt:file</code>. This matches the default primary node types intended to be used for directories and files in JCR repositories. </p>
224c224
< <h3><a href="#servlet-resources" id="servlet-resources">Servlet Resources</a></h3> 
---
> <h3><a href="#servlet-resources" name="servlet-resources">Servlet Resources</a></h3>
226,227c226,227
< <h3><a href="#file-system-resources" id="file-system-resources">File System Resources</a></h3> 
< <p>The Filesystem Resource Provider provides access to the operating system's filesystem through the Sling ResourceResolver. Multiple locations may be mapped into the resource tree by configuring the filesystem location and the resource tree root path for each location to be mapped.</p> 
---
> <h3><a href="#file-system-resources" name="file-system-resources">File System Resources</a></h3>
> <p>The Filesystem Resource Provider provides access to the operating system's filesystem through the Sling ResourceResolver. Multiple locations may be mapped into the resource tree by configuring the filesystem location and the resource tree root path for each location to be mapped. </p>
229c229
< <h3><a href="#merged-resources" id="merged-resources">Merged Resources</a></h3> 
---
> <h3><a href="#merged-resources" name="merged-resources">Merged Resources</a></h3>
232c232
< <h3><a href="#custom-resource-providers" id="custom-resource-providers">Custom Resource providers</a></h3> 
---
> <h3><a href="#custom-resource-providers" name="custom-resource-providers">Custom Resource providers</a></h3>
235c235
< <h2><a href="#writeable-resources" id="writeable-resources">Writeable Resources</a></h2> 
---
> <h2><a href="#writeable-resources" name="writeable-resources">Writeable Resources</a></h2>
239c239
< <h2><a href="#resource-observation" id="resource-observation">Resource Observation</a></h2> 
---
> <h2><a href="#resource-observation" name="resource-observation">Resource Observation</a></h2>
241c241
< <h3><a href="#resource-observation-api-resourcechangelistener" id="resource-observation-api-resourcechangelistener">Resource Observation API (ResourceChangeListener)</a></h3> 
---
> <h3><a href="#resource-observation-api-resourcechangelistener-" name="resource-observation-api-resourcechangelistener-">Resource Observation API (ResourceChangeListener)</a></h3>
244,245c244,245
< <h3><a href="#osgi-event-admin" id="osgi-event-admin">OSGi Event Admin</a></h3> 
< <p>Resource events are sent out via the OSGi Event Admin. You can subscribe to those event by registering an OSGi service for <a href="https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/EventHandler.html"><code>org.osgi.service.event.EventHandler</code></a>. Several properties should be used to restrict the subscription to only the relevant event. The event topics which are used for resources are listed as constants in <a href="http://sling.apache.org/apidocs/sling8/org/apache/sling/api/SlingConstants.html"><code>org.apache.sling.api.SlingConstants</code></a> starting with the prefix <code>TOPIC_</code>.</p> 
---
> <h3><a href="#osgi-event-admin" name="osgi-event-admin">OSGi Event Admin</a></h3>
> <p>Resource events are sent out via the OSGi Event Admin. You can subscribe to those event by registering an OSGi service for <a href="https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/EventHandler.html"><code>org.osgi.service.event.EventHandler</code></a>. Several properties should be used to restrict the subscription to only the relevant event. The event topics which are used for resources are listed as constants in <a href="http://sling.apache.org/apidocs/sling8/org/apache/sling/api/SlingConstants.html"><code>org.apache.sling.api.SlingConstants</code></a> starting with the prefix <code>TOPIC_</code>. </p>
248c248
< <h2><a href="#wrapdecorate-resources" id="wrapdecorate-resources">Wrap/Decorate Resources</a></h2> 
---
> <h2><a href="#wrap-decorate-resources" name="wrap-decorate-resources">Wrap/Decorate Resources</a></h2>
diff -b -B -r ./documentation/the-sling-engine/service-authentication.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/service-authentication.html
98c98
< <h2><a href="#problem" id="problem">Problem</a></h2> 
---
> <h2><a href="#problem" name="problem">Problem</a></h2>
100c100
< <p>On the other hand there are also some background tasks to be executed with access to the resources. Such tasks cannot in general be configured with user names and passwords: Neither hard coding the passwords in the code nor having the passwords in – more or less – plain text in some configuration is considered good practice.</p> 
---
> <p>On the other hand there are also some background tasks to be executed with access to the resources. Such tasks cannot in general be configured with user names and passwords: Neither hard coding the passwords in the code nor having the passwords in &ndash; more or less &ndash; plain text in some configuration is considered good practice.</p>
109c109
< <h2><a href="#concept" id="concept">Concept</a></h2> 
---
> <h2><a href="#concept" name="concept">Concept</a></h2>
114c114
< <pre><code>service-id = service-name [ ":" subservice-name ] .
---
> <pre><code>service-id = service-name [ &quot;:&quot; subservice-name ] .
117c117
< <h3><a href="#example-tenant-administration" id="example-tenant-administration">Example: Tenant Administration</a></h3> 
---
> <h3><a href="#example-tenant-administration" name="example-tenant-administration">Example: Tenant Administration</a></h3>
119c119
< <h3><a href="#example-mail-transfer-system" id="example-mail-transfer-system">Example: Mail Transfer System</a></h3> 
---
> <h3><a href="#example-mail-transfer-system" name="example-mail-transfer-system">Example: Mail Transfer System</a></h3>
122c122
<  <li>Accepting mail for processing — for example the SMTP server daemon</li> 
---
>   <li>Accepting mail for processing &mdash; for example the SMTP server daemon</li>
128,129c128,129
< <p>Thus the SMTP server daemon would be represented by a user for the <code>mta:smtp</code> Service. queueing with <code>mta:queue</code>, and delivery with <code>mta:deliver</code>.</p> 
< <h2><a href="#implementation" id="implementation">Implementation</a></h2> 
---
> <p>Thus the SMTP server daemon would be represented by a user for the <code>mta:smtp</code> Service. queueing with <code>mta:queue</code>, and delivery with <code>mta:deliver</code>. </p>
> <h2><a href="#implementation" name="implementation">Implementation</a></h2>
131c131
< <h3><a href="#serviceusermapper" id="serviceusermapper"><code>ServiceUserMapper</code></a></h3> 
---
> <h3><a href="#serviceusermapper" name="serviceusermapper">ServiceUserMapper</a></h3>
143c143
< <h3><a href="#resourceresolverfactory" id="resourceresolverfactory"><code>ResourceResolverFactory</code></a></h3> 
---
> <h3><a href="#resourceresolverfactory" name="resourceresolverfactory">ResourceResolverFactory</a></h3>
151c151
< <h3><a href="#slingrepository" id="slingrepository"><code>SlingRepository</code></a></h3> 
---
> <h3><a href="#slingrepository" name="slingrepository">SlingRepository</a></h3>
157,158c157,158
< <h2><a href="#configuration" id="configuration">Configuration</a></h2> 
< <h3><a href="#service-user-mappings" id="service-user-mappings">Service User Mappings</a></h3> 
---
> <h2><a href="#configuration" name="configuration">Configuration</a></h2>
> <h3><a href="#service-user-mappings" name="service-user-mappings">Service User Mappings</a></h3>
166,167c166,167
<         // this waits with the activation of this component until a service user mapping with the service name = current bundle's id and the sub service name 'my-subservice-name' is available.
<         // you can leave out "target" if the sub service name is not used.
---
>         // this waits with the activation of this component until a service user mapping with the service name = current bundle&#39;s id and the sub service name &#39;my-subservice-name&#39; is available.
>         // you can leave out &quot;target&quot; if the sub service name is not used.
169c169
<         @Reference(name ="scriptsServiceUser", target="(subServiceName=my-subservice-name)", service=ServiceUserMapped.class)
---
>         @Reference(name =&quot;scriptsServiceUser&quot;, target=&quot;(subServiceName=my-subservice-name)&quot;, service=ServiceUserMapped.class)
175c175
< <h2><a href="#deprecation-of-administrative-authentication" id="deprecation-of-administrative-authentication">Deprecation of administrative authentication</a></h2> 
---
> <h2><a href="#deprecation-of-administrative-authentication" name="deprecation-of-administrative-authentication">Deprecation of administrative authentication</a></h2>
185,188c185,188
< <h3><a href="#whitelisting-bundles-for-administrative-login" id="whitelisting-bundles-for-administrative-login">Whitelisting bundles for administrative login</a></h3> 
< <p>In order to be able to manage few (hopefully legit) uses of the above deprecated methods, a whitelisting mechanism was introduced with <a href="https://issues.apache.org/jira/browse/SLING-5135">SLING-5153</a> (<em>JCR Base 2.4.2</em>).</p> 
< <p>The recommended way to whitelist a bundle for administrative login is via a <em>whitelist fragment configuration</em>. It can be created as an OSGi factory configuration with the factoryPID <code>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment</code>. E.g. a typical configuration file might be called <code>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-myapp.config</code> and could look as follows:</p> 
< <pre><code>whitelist.name="myapp"
---
> <h3><a href="#whitelisting-bundles-for-administrative-login" name="whitelisting-bundles-for-administrative-login">Whitelisting bundles for administrative login</a></h3>
> <p>In order to be able to manage few (hopefully legit) uses of the above deprecated methods, a whitelisting mechanism was introduced with <a href="https://issues.apache.org/jira/browse/SLING-5135">SLING-5153</a> (*JCR Base 2.4.2*).</p>
> <p>The recommended way to whitelist a bundle for administrative login is via a <em>whitelist fragment configuration</em>. It can be created as an OSGi factory configuration with the factoryPID <code>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment</code>. E.g. a typical configuration file might be called <code>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-myapp.config</code> and could look as follows: </p>
> <pre><code>whitelist.name=&quot;myapp&quot;
190,191c190,191
<     "com.myapp.core",
<     "com.myapp.commons"
---
>     &quot;com.myapp.core&quot;,
>     &quot;com.myapp.commons&quot;
197,200c197,200
<    <th> Property </th>
<    <th> Type </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Type </th>
>       <th>Default </th>
>       <th>Description </th>
205,208c205,208
<    <td> <code>whitelist.name</code> </td>
<    <td> String </td>
<    <td> <code>[unnamed]</code> </td>
<    <td> Purely informational property that allows easy identification of different fragments. </td>
---
>       <td><code>whitelist.name</code> </td>
>       <td>String </td>
>       <td><code>[unnamed]</code> </td>
>       <td>Purely informational property that allows easy identification of different fragments. </td>
211,214c211,214
<    <td> <code>whitelist.bundles</code> </td>
<    <td> String[] </td>
<    <td> [] </td>
<    <td> An array of bundle symbolic names that should be allowed to make use of the administrative login functionality. </td>
---
>       <td><code>whitelist.bundles</code> </td>
>       <td>String[] </td>
>       <td>[] </td>
>       <td>An array of bundle symbolic names that should be allowed to make use of the administrative login functionality. </td>
223,224c223,224
< <pre><code>whitelist.bypass=B"false"
< whitelist.bundles.regexp="^PAXEXAM.*$"
---
> <pre><code>whitelist.bypass=B&quot;false&quot;
> whitelist.bundles.regexp=&quot;^PAXEXAM.*$&quot;
230,233c230,233
<    <th> Property </th>
<    <th> Type </th>
<    <th> Default </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Type </th>
>       <th>Default </th>
>       <th>Description </th>
238,241c238,241
<    <td> <code>whitelist.bypass</code> </td>
<    <td> Boolean </td>
<    <td> false </td>
<    <td> Allow all bundles to use administrative login. This is <strong>NOT</strong> recommended for production and warnings will be logged. </td>
---
>       <td><code>whitelist.bypass</code> </td>
>       <td>Boolean </td>
>       <td>false </td>
>       <td>Allow all bundles to use administrative login. This is <strong>NOT</strong> recommended for production and warnings will be logged. </td>
244,247c244,247
<    <td> <code>whitelist.bundles.regexp</code> </td>
<    <td> String </td>
<    <td> "" </td>
<    <td> A regular expression that whitelists all matching bundle symbolic names. This is <strong>NOT</strong> recommended for production and warnings will be logged. </td>
---
>       <td><code>whitelist.bundles.regexp</code> </td>
>       <td>String </td>
>       <td>"" </td>
>       <td>A regular expression that whitelists all matching bundle symbolic names. This is <strong>NOT</strong> recommended for production and warnings will be logged. </td>
diff -b -B -r ./documentation/the-sling-engine/servlets.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/servlets.html
99c99
< <h2><a href="#servlet-registration" id="servlet-registration">Servlet Registration</a></h2> 
---
> <h2><a href="#servlet-registration" name="servlet-registration">Servlet Registration</a></h2>
104,105c104,105
<    <th> Name </th>
<    <th> Description </th>
---
>       <th>Name </th>
>       <th>Description </th>
110,111c110,111
<    <td> <code>sling.servlet.paths</code> </td>
<    <td> A list of absolute paths under which the servlet is accessible as a Resource. The property value must either be a single String, an array of Strings or a Vector of Strings.<br>A servlet using this property might be ignored unless its path is included in the <em>Execution Paths</em> (<code>servletresolver.paths</code>) configuration setting of the <code>SlingServletResolver</code> service. Either this property or the <code>sling.servlet.resourceTypes</code> property must be set, or the servlet is ignored. If both are set, the servlet is registered using both ways.<br>Binding resources by paths is discouraged, see <a href="#caveats-when-binding-servlets-by-path">caveats when binding servlets by path</a> below. </td>
---
>       <td><code>sling.servlet.paths</code> </td>
>       <td>A list of absolute paths under which the servlet is accessible as a Resource. The property value must either be a single String, an array of Strings or a Vector of Strings.<br>A servlet using this property might be ignored unless its path is included in the <em>Execution Paths</em> (<code>servletresolver.paths</code>) configuration setting of the <code>SlingServletResolver</code> service. Either this property or the <code>sling.servlet.resourceTypes</code> property must be set, or the servlet is ignored. If both are set, the servlet is registered using both ways.<br>Binding resources by paths is discouraged, see <a href="#caveats-when-binding-servlets-by-path">caveats when binding servlets by path</a> below. </td>
114,115c114,115
<    <td> <code>sling.servlet.resourceTypes</code> </td>
<    <td> The resource type(s) supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. Either this property or the <code>sling.servlet.paths</code> property must be set, or the servlet is ignored. If both are set, the servlet is registered using both ways. </td>
---
>       <td><code>sling.servlet.resourceTypes</code> </td>
>       <td>The resource type(s) supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. Either this property or the <code>sling.servlet.paths</code> property must be set, or the servlet is ignored. If both are set, the servlet is registered using both ways. </td>
118,119c118,119
<    <td> <code>sling.servlet.selectors</code> </td>
<    <td> The request URL selectors supported by the servlet. The selectors must be configured as they would be specified in the URL that is as a list of dot-separated strings such as <em>print.a4</em>. In case this is not empty the first selector(s) (i.e. the one(s) on the left) in the request URL must match, otherwise the servlet is not executed. After that may follow arbitrarily many non-registered selectors. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is only considered for the registration with <code>sling.servlet.resourceTypes</code>. </td>
---
>       <td><code>sling.servlet.selectors</code> </td>
>       <td>The request URL selectors supported by the servlet. The selectors must be configured as they would be specified in the URL that is as a list of dot-separated strings such as <em>print.a4</em>. In case this is not empty the first selector(s) (i.e. the one(s) on the left) in the request URL must match, otherwise the servlet is not executed. After that may follow arbitrarily many non-registered selectors. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is only considered for the registration with <code>sling.servlet.resourceTypes</code>. </td>
122,123c122,123
<    <td> <code>sling.servlet.extensions</code> </td>
<    <td> The request URL extensions supported by the servlet for requests. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is only considered for the registration with <code>sling.servlet.resourceTypes</code>. </td>
---
>       <td><code>sling.servlet.extensions</code> </td>
>       <td>The request URL extensions supported by the servlet for requests. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is only considered for the registration with <code>sling.servlet.resourceTypes</code>. </td>
126,127c126,127
<    <td> <code>sling.servlet.methods</code> </td>
<    <td> The request methods supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is only considered for the registration with <code>sling.servlet.resourceTypes</code>. If this property is missing, the value defaults to GET and HEAD, regardless of which methods are actually implemented/handled by the servlet. </td>
---
>       <td><code>sling.servlet.methods</code> </td>
>       <td>The request methods supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is only considered for the registration with <code>sling.servlet.resourceTypes</code>. If this property is missing, the value defaults to GET and HEAD, regardless of which methods are actually implemented/handled by the servlet. </td>
130,131c130,131
<    <td> <code>sling.servlet.prefix</code> </td>
<    <td> The prefix or numeric index to make relative paths absolute. If the value of this property is a number (int), it defines the index of the search path entries from the resource resolver to be used as the prefix. The defined search path is used as a prefix to mount this servlet. The number can be -1 which always points to the last search entry. If the specified value is higher than than the highest index of the search paths, the last entry is used. The index starts with 0. If the value of this property is a string and parseable as a number, the value is treated as if it would be a number. If the value of this property is a string starting with "/", this value is applied as a prefix, regardless of the configured search paths! If the value is anything else, it is ignored. If this property is not specified, it defaults to the default configuration of the sling servlet resolver. </td>
---
>       <td><code>sling.servlet.prefix</code> </td>
>       <td>The prefix or numeric index to make relative paths absolute. If the value of this property is a number (int), it defines the index of the search path entries from the resource resolver to be used as the prefix. The defined search path is used as a prefix to mount this servlet. The number can be -1 which always points to the last search entry. If the specified value is higher than than the highest index of the search paths, the last entry is used. The index starts with 0. If the value of this property is a string and parseable as a number, the value is treated as if it would be a number. If the value of this property is a string starting with "/", this value is applied as a prefix, regardless of the configured search paths! If the value is anything else, it is ignored. If this property is not specified, it defaults to the default configuration of the sling servlet resolver. </td>
139c139
< <h3><a href="#caveats-when-binding-servlets-by-path" id="caveats-when-binding-servlets-by-path">Caveats when binding servlets by path</a></h3> 
---
> <h3><a href="#caveats-when-binding-servlets-by-path" name="caveats-when-binding-servlets-by-path">Caveats when binding servlets by path</a></h3>
147,149c147,149
< <p>Given these drawbacks it is strongly recommended to bind servlets to resource types rather than paths.</p> 
< <h3><a href="#registering-a-servlet-using-java-annotations" id="registering-a-servlet-using-java-annotations">Registering a Servlet using Java Annotations</a></h3> 
< <p>If you are working with the default Apache Sling development stack you can either use</p> 
---
> <p>Given these drawbacks it is strongly recommended to bind servlets to resource types rather than paths. </p>
> <h3><a href="#registering-a-servlet-using-java-annotations" name="registering-a-servlet-using-java-annotations">Registering a Servlet using Java Annotations</a></h3>
> <p>If you are working with the default Apache Sling development stack you can either use </p>
157c157,159
<  <li> <p>OSGi DS 1.4 (R7) component property type annotations for Sling Servlets (recommended)</p> <pre><code><!-- TODO syntax marker (::java) disabled -->@Component(
---
>   <li>
>     <p>OSGi DS 1.4 (R7) component property type annotations for Sling Servlets (recommended)</p>
>     <pre><code><!-- TODO syntax marker (::java) disabled -->@Component(
160,163c162,165
<     resourceTypes="/apps/my/type", 
<     methods= "GET",
<     extensions="html",
<     selectors="hello")
---
>     resourceTypes=&quot;/apps/my/type&quot;, 
>     methods= &quot;GET&quot;,
>     extensions=&quot;html&quot;,
>     selectors=&quot;hello&quot;)
171c173,175
< </code></pre> <p>This is only supported though with if you use <code>bnd-maven-plugin</code> and use Sling which is at least compliant with OSGi R6 (DS 1.3). There is no actual run-time dependency to OSGi R7! The configuration for the <code>bnd-maven-plugin</code> should look like this in your <code>pom.xml</code></p> <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;build&gt;
---
> </code></pre>
>     <p>This is only supported though with if you use <code>bnd-maven-plugin</code> and use Sling which is at least compliant with OSGi R6 (DS 1.3). There is no actual run-time dependency to OSGi R7! The configuration for the <code>bnd-maven-plugin</code> should look like this in your <code>pom.xml</code></p>
>     <pre><code><!-- TODO syntax marker (::xml) disabled -->&lt;build&gt;
201,202c205,210
< </code></pre> <p>Please refer to the <a href="https://github.com/apache/sling-org-apache-sling-servlets-annotations/tree/master/src/main/java/org/apache/sling/servlets/annotations">Javadoc of the package</a> for other related annotations.</p> </li> 
<  <li> <p>Simple OSGi DS 1.2 annotations (use only if you cannot use approach 1.)</p> <pre><code><!-- TODO syntax marker (::java) disabled -->@Component(
---
> </code></pre>
>     <p>Please refer to the <a href="https://github.com/apache/sling-org-apache-sling-servlets-annotations/tree/master/src/main/java/org/apache/sling/servlets/annotations">Javadoc of the package</a> for other related annotations. </p>
>   </li>
>   <li>
>     <p>Simple OSGi DS 1.2 annotations (use only if you cannot use approach 1.)</p>
>     <pre><code><!-- TODO syntax marker (::java) disabled -->@Component(
205,208c213,216
<     SLING_SERVLET_RESOURCE_TYPES + "=/apps/my/type"
<     SLING_SERVLET_METHODS + "=GET",
<     SLING_SERVLET_EXTENSIONS + "=html",
<     SLING_SERVLET_SELECTORS + "=hello",
---
>     SLING_SERVLET_RESOURCE_TYPES + &quot;=/apps/my/type&quot;
>     SLING_SERVLET_METHODS + &quot;=GET&quot;,
>     SLING_SERVLET_EXTENSIONS + &quot;=html&quot;,
>     SLING_SERVLET_SELECTORS + &quot;=hello&quot;,
218,223c226,234
< </code></pre> </li> 
<  <li> <p>The <code>@SlingServlet</code> annotation (evaluated by maven-scr-plugin, use only if you can neither use 1. nor 2.)</p> <pre><code><!-- TODO syntax marker (::java) disabled -->@SlingServlet(
<     resourceTypes = "/apps/my/type",
<     selectors = "hello",
<     extensions = "html",
<     methods = "GET")
---
> </code></pre>
>   </li>
>   <li>
>     <p>The <code>@SlingServlet</code> annotation (evaluated by maven-scr-plugin, use only if you can neither use 1. nor 2.)</p>
>     <pre><code><!-- TODO syntax marker (::java) disabled -->@SlingServlet(
>     resourceTypes = &quot;/apps/my/type&quot;,
>     selectors = &quot;hello&quot;,
>     extensions = &quot;html&quot;,
>     methods = &quot;GET&quot;)
231c242,243
< </code></pre> </li> 
---
> </code></pre>
>   </li>
233c245
< <h3><a href="#automated-tests" id="automated-tests">Automated tests</a></h3> 
---
> <h3><a href="#automated-tests" name="automated-tests">Automated tests</a></h3>
237,240c249,252
< <h3><a href="#example-registration-by-path" id="example-registration-by-path">Example: Registration by Path</a></h3> 
< <pre><code>sling.servlet.paths = [ "/libs/sling/sample/html", "/libs/sling/sample/txt" ]
< sling.servlet.selectors = [ "img" ]
< sling.servlet.extensions = [ "html", "txt", "json" ]
---
> <h3><a href="#example-registration-by-path" name="example-registration-by-path">Example: Registration by Path</a></h3>
> <pre><code>sling.servlet.paths = [ &quot;/libs/sling/sample/html&quot;, &quot;/libs/sling/sample/txt&quot; ]
> sling.servlet.selectors = [ &quot;img&quot; ]
> sling.servlet.extensions = [ &quot;html&quot;, &quot;txt&quot;, &quot;json&quot; ]
248,251c260,263
< <h3><a href="#example-registration-by-resource-type-etc" id="example-registration-by-resource-type-etc">Example: Registration by Resource Type etc.</a></h3> 
< <pre><code>sling.servlet.resourceTypes = [ "sling/unused" ]
< sling.servlet.selectors = [ "img", "tab" ]
< sling.servlet.extensions = [ "html", "txt", "json" ]
---
> <h3><a href="#example-registration-by-resource-type-etc-" name="example-registration-by-resource-type-etc-">Example: Registration by Resource Type etc.</a></h3>
> <pre><code>sling.servlet.resourceTypes = [ &quot;sling/unused&quot; ]
> sling.servlet.selectors = [ &quot;img&quot;, &quot;tab&quot; ]
> sling.servlet.extensions = [ &quot;html&quot;, &quot;txt&quot;, &quot;json&quot; ]
264c276
< <h3><a href="#servlet-lifecycle-issues" id="servlet-lifecycle-issues">Servlet Lifecycle Issues</a></h3> 
---
> <h3><a href="#servlet-lifecycle-issues" name="servlet-lifecycle-issues">Servlet Lifecycle Issues</a></h3>
276c288
< <h2><a href="#scripts-are-servlets" id="scripts-are-servlets">Scripts are Servlets</a></h2> 
---
> <h2><a href="#scripts-are-servlets" name="scripts-are-servlets">Scripts are Servlets</a></h2>
280c292
< <h2><a href="#default-servlets" id="default-servlets">Default Servlet(s)</a></h2> 
---
> <h2><a href="#default-servlet-s-" name="default-servlet-s-">Default Servlet(s)</a></h2>
288c300
< <h2><a href="#optingservlet-interface" id="optingservlet-interface">OptingServlet interface</a></h2> 
---
> <h2><a href="#optingservlet-interface" name="optingservlet-interface">OptingServlet interface</a></h2>
292c304
< <h2><a href="#error-handler-servlets-or-scripts" id="error-handler-servlets-or-scripts">Error Handler Servlet(s) or Scripts</a></h2> 
---
> <h2><a href="#error-handler-servlet-s-or-scripts" name="error-handler-servlet-s-or-scripts">Error Handler Servlet(s) or Scripts</a></h2>
diff -b -B -r ./documentation/the-sling-engine/sling-api-crud-support.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/sling-api-crud-support.html
98c98
< <h2><a href="#apache-sling-api-support" id="apache-sling-api-support">Apache Sling API Support</a></h2> 
---
> <h2><a href="#apache-sling-api-support" name="apache-sling-api-support">Apache Sling API Support</a></h2>
109c109
< <h2><a href="#comparing-sling-api-crud-to-sling-post-servlet" id="comparing-sling-api-crud-to-sling-post-servlet">Comparing Sling API CRUD to Sling Post Servlet</a></h2> 
---
> <h2><a href="#comparing-sling-api-crud-to-sling-post-servlet" name="comparing-sling-api-crud-to-sling-post-servlet">Comparing Sling API CRUD to Sling Post Servlet</a></h2>
111c111
< <h3><a href="#updating-a-property" id="updating-a-property">Updating a Property</a></h3> 
---
> <h3><a href="#updating-a-property" name="updating-a-property">Updating a Property</a></h3>
114,116c114,116
< <pre><code>&lt;form action="/myresource" method="POST"&gt;
<   &lt;input type="text" name="title"&gt;
<   &lt;textarea name="body"&gt;
---
> <pre><code>&lt;form action=&quot;/myresource&quot; method=&quot;POST&quot;&gt;
>   &lt;input type=&quot;text&quot; name=&quot;title&quot;&gt;
>   &lt;textarea name=&quot;body&quot;&gt;
120c120
< <pre><code>Resource myResource = resourceResolver.getResource("/myresource");
---
> <pre><code>Resource myResource = resourceResolver.getResource(&quot;/myresource&quot;);
122,123c122,123
< properties.put("title", {TITLE});
< properties.put("body", {BODY});
---
> properties.put(&quot;title&quot;, {TITLE});
> properties.put(&quot;body&quot;, {BODY});
126c126
< <h3><a href="#create-new-resource" id="create-new-resource">Create New Resource</a></h3> 
---
> <h3><a href="#create-new-resource" name="create-new-resource">Create New Resource</a></h3>
129,130c129,130
< <pre><code>&lt;form action="/myresource/" method="POST"&gt;
<   &lt;input type="text" name="dummy"&gt;
---
> <pre><code>&lt;form action=&quot;/myresource/&quot; method=&quot;POST&quot;&gt;
>   &lt;input type=&quot;text&quot; name=&quot;dummy&quot;&gt;
134c134
< <pre><code>Resource myResource = resourceResolver.getResource("/myresource");
---
> <pre><code>Resource myResource = resourceResolver.getResource(&quot;/myresource&quot;);
136,138c136,138
< properties.put("jcr:primaryType", "nt:unstructured");
< properties.put("sling:resourceType", "myapp/components/mytype");
< Resource dummy = resourceResolver.create(myResource, "dummy", properties);
---
> properties.put(&quot;jcr:primaryType&quot;, &quot;nt:unstructured&quot;);
> properties.put(&quot;sling:resourceType&quot;, &quot;myapp/components/mytype&quot;);
> Resource dummy = resourceResolver.create(myResource, &quot;dummy&quot;, properties);
141c141
< <h3><a href="#remove-a-property" id="remove-a-property">Remove a Property</a></h3> 
---
> <h3><a href="#remove-a-property" name="remove-a-property">Remove a Property</a></h3>
144,145c144,145
< <pre><code>&lt;form action="/myresource" method="POST"&gt;
<   &lt;input type="hidden" name="title@Delete"&gt;
---
> <pre><code>&lt;form action=&quot;/myresource&quot; method=&quot;POST&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;title@Delete&quot;&gt;
149c149
< <pre><code>Resource myResource = resourceResolver.getResource("/myresource");
---
> <pre><code>Resource myResource = resourceResolver.getResource(&quot;/myresource&quot;);
151c151
< properties.remove("title");
---
> properties.remove(&quot;title&quot;);
154c154
< <h3><a href="#copy-a-resource" id="copy-a-resource">Copy a Resource</a></h3> 
---
> <h3><a href="#copy-a-resource" name="copy-a-resource">Copy a Resource</a></h3>
157,160c157,160
< <pre><code>&lt;form action="/myresource" method="POST"&gt;
<   &lt;input type="hidden" name=":operation" value="copy"&gt;
<   &lt;input type="hidden" name=":dest" value="/myresource2"&gt;
<   &lt;input type="hidden" name=":replace" value="true"&gt;
---
> <pre><code>&lt;form action=&quot;/myresource&quot; method=&quot;POST&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;:operation&quot; value=&quot;copy&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;:dest&quot; value=&quot;/myresource2&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;:replace&quot; value=&quot;true&quot;&gt;
165c165
< Resource myResource2 = resourceResolver.create(null, "myresource2", properties);
---
> Resource myResource2 = resourceResolver.create(null, &quot;myresource2&quot;, properties);
168c168
< <h3><a href="#move-a-resource" id="move-a-resource">Move a Resource</a></h3> 
---
> <h3><a href="#move-a-resource" name="move-a-resource">Move a Resource</a></h3>
171,173c171,173
< <pre><code>&lt;form action="/myresource2" method="POST"&gt;
<   &lt;input type="hidden" name=":operation" value="move"&gt;
<   &lt;input type="hidden" name=":dest" value="/myresource3"&gt;
---
> <pre><code>&lt;form action=&quot;/myresource2&quot; method=&quot;POST&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;:operation&quot; value=&quot;move&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;:dest&quot; value=&quot;/myresource3&quot;&gt;
177c177
< <pre><code>Resource myResource2 = resourceResolver.getResource("/myresource2");
---
> <pre><code>Resource myResource2 = resourceResolver.getResource(&quot;/myresource2&quot;);
179c179
< Resource myResource3 = resourceResolver.create(null, "myresource3", properties);
---
> Resource myResource3 = resourceResolver.create(null, &quot;myresource3&quot;, properties);
183c183
< <h3><a href="#setting-non-string-value" id="setting-non-string-value">Setting non-String Value</a></h3> 
---
> <h3><a href="#setting-non-string-value" name="setting-non-string-value">Setting non-String Value</a></h3>
186,188c186,188
< <pre><code>&lt;form action="/myresource3" method="POST"&gt;
<   &lt;input type="text" name="date" value="2008-06-13T18:55:00"&gt;
<   &lt;input type="hidden" name="date@TypeHint" value="Date"&gt;
---
> <pre><code>&lt;form action=&quot;/myresource3&quot; method=&quot;POST&quot;&gt;
>   &lt;input type=&quot;text&quot; name=&quot;date&quot; value=&quot;2008-06-13T18:55:00&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;date@TypeHint&quot; value=&quot;Date&quot;&gt;
192c192
< <pre><code>Resource myResource3 = resourceResolver.getResource("/myresource3");
---
> <pre><code>Resource myResource3 = resourceResolver.getResource(&quot;/myresource3&quot;);
195c195
< properties.put("date", calendar);
---
> properties.put(&quot;date&quot;, calendar);
198c198
< <h3><a href="#delete-a-resource" id="delete-a-resource">Delete a Resource</a></h3> 
---
> <h3><a href="#delete-a-resource" name="delete-a-resource">Delete a Resource</a></h3>
201,202c201,202
< <pre><code>&lt;form action="/myresource" method="POST"&gt;
<   &lt;input type="hidden" name=":operation" value="delete"&gt;
---
> <pre><code>&lt;form action=&quot;/myresource&quot; method=&quot;POST&quot;&gt;
>   &lt;input type=&quot;hidden&quot; name=&quot;:operation&quot; value=&quot;delete&quot;&gt;
206c206
< <pre><code>Resource myResource = resourceResolver.getResource("/myresource");
---
> <pre><code>Resource myResource = resourceResolver.getResource(&quot;/myresource&quot;);
210c210
< <h2><a href="#value-class-support" id="value-class-support">Value Class Support</a></h2> 
---
> <h2><a href="#value-class-support" name="value-class-support">Value Class Support</a></h2>
diff -b -B -r ./documentation/the-sling-engine/sling-properties.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/sling-properties.html
100c100
< <h2><a href="#sling-setup-properties" id="sling-setup-properties">Sling Setup Properties</a></h2> 
---
> <h2><a href="#sling-setup-properties" name="sling-setup-properties">Sling Setup Properties</a></h2>
104,106c104,106
<    <th> Property </th>
<    <th> Default Value </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default Value </th>
>       <th>Description </th>
111,126c111,126
<    <td> <code>sling.home</code> </td>
<    <td> <code>sling</code> </td>
<    <td> Path to the main Sling Directory; relative path is resolved against current working directory as defined in the <code>user.dir</code> system property. Can also be set with the <code>-c</code> command line option. </td>
<    <td> Launchpad </td>
<   </tr> 
<   <tr>
<    <td> <code>sling.launchpad</code> </td>
<    <td> <code>${sling.home}</code> </td>
<    <td> Location for the Sling launchpad JAR file and the startup folder containing bundles to be installed by the Bootstrap Installer. Can also be set with the <code>-i</code> command line option. </td>
<    <td> Launchpad </td>
<   </tr> 
<   <tr>
<    <td> <code>sling.properties</code> </td>
<    <td> <code>${sling.home}/sling.properties</code> </td>
<    <td> Path to the <code>sling.properties</code> file; relative path is resolved against <code>${sling.home}</code> </td>
<    <td> Launchpad </td>
---
>       <td><code>sling.home</code> </td>
>       <td><code>sling</code> </td>
>       <td>Path to the main Sling Directory; relative path is resolved against current working directory as defined in the <code>user.dir</code> system property. Can also be set with the <code>-c</code> command line option. </td>
>       <td>Launchpad </td>
>     </tr>
>     <tr>
>       <td><code>sling.launchpad</code> </td>
>       <td><code>${sling.home}</code> </td>
>       <td>Location for the Sling launchpad JAR file and the startup folder containing bundles to be installed by the Bootstrap Installer. Can also be set with the <code>-i</code> command line option. </td>
>       <td>Launchpad </td>
>     </tr>
>     <tr>
>       <td><code>sling.properties</code> </td>
>       <td><code>${sling.home}/sling.properties</code> </td>
>       <td>Path to the <code>sling.properties</code> file; relative path is resolved against <code>${sling.home}</code> </td>
>       <td>Launchpad </td>
130c130
< <h2><a href="#server-control-port-properties" id="server-control-port-properties">Server Control Port Properties</a></h2> 
---
> <h2><a href="#server-control-port-properties" name="server-control-port-properties">Server Control Port Properties</a></h2>
134,136c134,136
<    <th> Property </th>
<    <th> Default Value </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default Value </th>
>       <th>Description </th>
141,150c141,144
<    <td> <code>sling.control.socket</code> </td>
<    <td> <code>127.0.0.1:0</code> </td>
<    <td> Specification of the control port. Can also be set with the <code>-j</code> command line option. This property is only used by the Standalone Sling Application. </td>
<    <td> Launchpad </td>
<   </tr> 
<   <tr>
<    <td> <code>sling.control.action</code> </td>
<    <td> -- </td>
<    <td> Action to execute. This is the same as specifying <code>start</code>, <code>status</code>, or <code>stop</code> on the command line. This property is only used by the Standalone Sling Application. </td>
<    <td> Launchpad </td>
---
>       <td><code>sling.control.socket</code> </td>
>       <td><code>127.0.0.1:0</code> </td>
>       <td>Specification of the control port. Can also be set with the <code>-j</code> command line option. This property is only used by the Standalone Sling Application. </td>
>       <td>Launchpad </td>
154c148,149
< <h2><a href="#logging-configuration" id="logging-configuration">Logging Configuration</a></h2> 
---
> <p>| <code>sling.control.action</code> | -- | Action to execute. This is the same as specifying <code>start</code>, <code>status</code>, or <code>stop</code> on the command line. This property is only used by the Standalone Sling Application. | Launchpad |</p>
> <h2><a href="#logging-configuration" name="logging-configuration">Logging Configuration</a></h2>
159,161c154,156
<    <th> Property </th>
<    <th> Default Value </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default Value </th>
>       <th>Description </th>
166,168c161,163
<    <td> <code>org.apache.sling.commons.log.level</code> </td>
<    <td> <code>INFO</code> </td>
<    <td> Sets the initial logging level of the root logger. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, or <code>ERROR</code>. This property can also be set with the <code>-l</code> command line option. </td>
---
>       <td><code>org.apache.sling.commons.log.level</code> </td>
>       <td><code>INFO</code> </td>
>       <td>Sets the initial logging level of the root logger. This may be any of the defined logging levels <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, or <code>ERROR</code>. This property can also be set with the <code>-l</code> command line option. </td>
171,173c166,168
<    <td> <code>org.apache.sling.commons.log.file</code> </td>
<    <td> <code>${sling.home}/logs/error.log</code> </td>
<    <td> Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to System.out. This property can also be set with the <code>-f</code> command line option. </td>
---
>       <td><code>org.apache.sling.commons.log.file</code> </td>
>       <td><code>${sling.home}/logs/error.log</code> </td>
>       <td>Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to System.out. This property can also be set with the <code>-f</code> command line option. </td>
176,178c171,173
<    <td> <code>org.apache.sling.commons.log.file.number</code> </td>
<    <td> <code>5</code> </td>
<    <td> The number of rotated files to keep. </td>
---
>       <td><code>org.apache.sling.commons.log.file.number</code> </td>
>       <td><code>5</code> </td>
>       <td>The number of rotated files to keep. </td>
181,183c176,178
<    <td> <code>org.apache.sling.commons.log.file.size</code> </td>
<    <td> <code>'.'yyyy-MM-dd</code> </td>
<    <td> Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <a href="http://sling.apache.org/site/logging.html#Logging-LogFileRotation">Log File Rotation</a> for full details on log file rotation. </td>
---
>       <td><code>org.apache.sling.commons.log.file.size</code> </td>
>       <td><code>&#39;.&#39;yyyy-MM-dd</code> </td>
>       <td>Defines how the log file is rotated (by schedule or by size) and when to rotate. See the section <a href="http://sling.apache.org/site/logging.html#Logging-LogFileRotation">Log File Rotation</a> for full details on log file rotation. </td>
186,188c181,183
<    <td> <code>org.apache.sling.commons.log.pattern</code> </td>
<    <td> <code>{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* [{2}] {3} {5}</code> </td>
<    <td> The MessageFormat pattern to use for formatting log messages with the root logger. </td>
---
>       <td><code>org.apache.sling.commons.log.pattern</code> </td>
>       <td><code>{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* [{2}] {3} {5}</code> </td>
>       <td>The MessageFormat pattern to use for formatting log messages with the root logger. </td>
191,193c186,188
<    <td> org.apache.sling.commons.log.julenabled </td>
<    <td> <code>false</code> </td>
<    <td> Enables the java.util.logging support. </td>
---
>       <td>org.apache.sling.commons.log.julenabled </td>
>       <td><code>false</code> </td>
>       <td>Enables the java.util.logging support. </td>
198c193
< <h2><a href="#http-service-properties" id="http-service-properties">Http Service Properties</a></h2> 
---
> <h2><a href="#http-service-properties" name="http-service-properties">Http Service Properties</a></h2>
202,204c197,199
<    <th> Property </th>
<    <th> Default Value </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Default Value </th>
>       <th>Description </th>
209,211c204,206
<    <td> <code>org.apache.felix.http.context_path</code> </td>
<    <td> <code>/</code> </td>
<    <td> The servlet context path for the Http Service of the embedded servlet container. This property requires support by the Http Service bundle. </td>
---
>       <td><code>org.apache.felix.http.context_path</code> </td>
>       <td><code>/</code> </td>
>       <td>The servlet context path for the Http Service of the embedded servlet container. This property requires support by the Http Service bundle. </td>
214,216c209,211
<    <td> <code>org.apache.felix.http.host</code> </td>
<    <td> <code>0.0.0.0</code> </td>
<    <td> The host interface to bind the HTTP Server to. This property requires support by the Http Service bundle. </td>
---
>       <td><code>org.apache.felix.http.host</code> </td>
>       <td><code>0.0.0.0</code> </td>
>       <td>The host interface to bind the HTTP Server to. This property requires support by the Http Service bundle. </td>
219,221c214,216
<    <td> <code>org.osgi.service.http.port</code> </td>
<    <td> 8080 </td>
<    <td> The port to listen on for HTTP requests. This property requires support by the Http Service bundle. </td>
---
>       <td><code>org.osgi.service.http.port</code> </td>
>       <td>8080 </td>
>       <td>The port to listen on for HTTP requests. This property requires support by the Http Service bundle. </td>
diff -b -B -r ./documentation/the-sling-engine/the-sling-launchpad.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/the-sling-launchpad.html
99c99
< <h2><a href="#sling-home" id="sling-home">Sling Home</a></h2> 
---
> <h2><a href="#sling-home" name="sling-home">Sling Home</a></h2>
111c111
< <h2><a href="#command-line-options" id="command-line-options">Command Line Options</a></h2> 
---
> <h2><a href="#command-line-options" name="command-line-options">Command Line Options</a></h2>
116,118c116,118
<    <th> Option </th>
<    <th> Argument </th>
<    <th> Description </th>
---
>       <th>Option </th>
>       <th>Argument </th>
>       <th>Description </th>
123,125c123,125
<    <td> <code>start</code> </td>
<    <td> (-) </td>
<    <td> Open a TCP/IP server socket when starting Sling. Uses option <code>-j</code> to define the local socket address. </td>
---
>       <td><code>start</code> </td>
>       <td>(-) </td>
>       <td>Open a TCP/IP server socket when starting Sling. Uses option <code>-j</code> to define the local socket address. </td>
128,130c128,130
<    <td> <code>status</code> </td>
<    <td> (-) </td>
<    <td> Check whether a (remote) Sling application is running. Uses option <code>-j</code> to define the address of the Sling instance to check. Note, that the Sling application terminates after checking for the (remote) Sling status. </td>
---
>       <td><code>status</code> </td>
>       <td>(-) </td>
>       <td>Check whether a (remote) Sling application is running. Uses option <code>-j</code> to define the address of the Sling instance to check. Note, that the Sling application terminates after checking for the (remote) Sling status. </td>
133,135c133,135
<    <td> <code>stop</code> </td>
<    <td> (-) </td>
<    <td> Stop a (remote) Sling application is running. Uses option <code>-j</code> to define the address of the Sling instance to stop. Note, that the Sling application tesrminates after stopping the (remote) Sling instance. </td>
---
>       <td><code>stop</code> </td>
>       <td>(-) </td>
>       <td>Stop a (remote) Sling application is running. Uses option <code>-j</code> to define the address of the Sling instance to stop. Note, that the Sling application tesrminates after stopping the (remote) Sling instance. </td>
138,140c138,140
<    <td> <code>-j</code> </td>
<    <td> [ host ":" ] port </td>
<    <td> The socket address to listen on for control connections (<code>start</code> or to use as the remote endpoint for the control connection (<code>status</code> and <code>stop</code>. If this parameter has no arguments or is not specified, the address defaults to any free port on localhost/127.0.0.1. If only the port is specified localhost/127.0.0.1 is used as the host part of the address. </td>
---
>       <td><code>-j</code> </td>
>       <td>[ host ":" ] port </td>
>       <td>The socket address to listen on for control connections (<code>start</code> or to use as the remote endpoint for the control connection (<code>status</code> and <code>stop</code>. If this parameter has no arguments or is not specified, the address defaults to any free port on localhost/127.0.0.1. If only the port is specified localhost/127.0.0.1 is used as the host part of the address. </td>
143,145c143,145
<    <td> <code>-c</code> </td>
<    <td> slinghome </td>
<    <td> The directory in which Sling locates its initial configuration file <code>sling.properties</code> and where files of Sling itself such as the Apache Felix bundle archive or the JCR repository files are stored. This defaults to the <code>sling</code> folder in the current working directory. This is the value which is commonly refered to as <code>$\{sling.home}.</code></td>
---
>       <td><code>-c</code> </td>
>       <td>slinghome </td>
>       <td>The directory in which Sling locates its initial configuration file <code>sling.properties</code> and where files of Sling itself such as the Apache Felix bundle archive or the JCR repository files are stored. This defaults to the <code>sling</code> folder in the current working directory. This is the value which is commonly refered to as <code>$\{sling.home}.</code></td>
148,150c148,150
<    <td> <code>-i</code> </td>
<    <td> launchpadhome </td>
<    <td> The launchpad directory. If not set, this is the same as <code>$\{sling.home}.</code> (since Sling Launchpad 2.4.0) </td>
---
>       <td><code>-i</code> </td>
>       <td>launchpadhome </td>
>       <td>The launchpad directory. If not set, this is the same as <code>$\{sling.home}.</code> (since Sling Launchpad 2.4.0) </td>
153,155c153,155
<    <td> <code>-l</code> </td>
<    <td> loglevel </td>
<    <td> Sets the initial loglevel as an integer in the range 0 to 4 or as one of the well known level strings <code>ERROR</code>, <code>WARN</code>, <code>INFO</code>, or <code>DEBUG</code>. This option overwrites the <code>org.apache.sling.osg.log.level</code> setting the <code>sling.properties</code> file. The default is <code>INFO</code>. </td>
---
>       <td><code>-l</code> </td>
>       <td>loglevel </td>
>       <td>Sets the initial loglevel as an integer in the range 0 to 4 or as one of the well known level strings <code>ERROR</code>, <code>WARN</code>, <code>INFO</code>, or <code>DEBUG</code>. This option overwrites the <code>org.apache.sling.osg.log.level</code> setting the <code>sling.properties</code> file. The default is <code>INFO</code>. </td>
158,160c158,160
<    <td> <code>-f</code> </td>
<    <td> logfile </td>
<    <td> The log file to use or <code>-</code> to log to standard out. This option overwrites the <code>org.apache.sling.osg.log.file</code> setting in the <code>sling.properties</code> file. The default is <code>$\{sling.home}/logs/error.log</code>. </td>
---
>       <td><code>-f</code> </td>
>       <td>logfile </td>
>       <td>The log file to use or <code>-</code> to log to standard out. This option overwrites the <code>org.apache.sling.osg.log.file</code> setting in the <code>sling.properties</code> file. The default is <code>$\{sling.home}/logs/error.log</code>. </td>
163,165c163,165
<    <td> <code>-a</code> </td>
<    <td> address </td>
<    <td> The interfact to bind to (use 0.0.0.0 for any). This option overwrites the <code>org.apache.felix.http.host</code> setting in the <code>sling.properties</code> file and requires the embedded Http Service implementation to honor this property. (supported since Sling Launchpad 2.4.0) </td>
---
>       <td><code>-a</code> </td>
>       <td>address </td>
>       <td>The interfact to bind to (use 0.0.0.0 for any). This option overwrites the <code>org.apache.felix.http.host</code> setting in the <code>sling.properties</code> file and requires the embedded Http Service implementation to honor this property. (supported since Sling Launchpad 2.4.0) </td>
168,170c168,170
<    <td> <code>-p</code> </td>
<    <td> port </td>
<    <td> The port to listen (default 8080) to handle HTTP requests. This option overwrites the <code>org.osgi.service.http.port</code> setting in the <code>sling.properties</code> file. </td>
---
>       <td><code>-p</code> </td>
>       <td>port </td>
>       <td>The port to listen (default 8080) to handle HTTP requests. This option overwrites the <code>org.osgi.service.http.port</code> setting in the <code>sling.properties</code> file. </td>
173,175c173,175
<    <td> <code>-r</code> </td>
<    <td> path </td>
<    <td> The root servlet context path for the Http Service (default is /). This option overwrites the <code>org.apache.felix.http.context_path</code> setting in the <code>sling.properties</code> file and requires the embedded Http Service implementation to honor this property. (since Sling Launchpad 2.4.0) </td>
---
>       <td><code>-r</code> </td>
>       <td>path </td>
>       <td>The root servlet context path for the Http Service (default is /). This option overwrites the <code>org.apache.felix.http.context_path</code> setting in the <code>sling.properties</code> file and requires the embedded Http Service implementation to honor this property. (since Sling Launchpad 2.4.0) </td>
178,180c178,180
<    <td> <code>-D</code> </td>
<    <td> n=v </td>
<    <td> Sets the property <code>n</code> to the value <code>v</code>. This option can be added repeatedly setting additional properties. Any property set in this manner overwrites same named properties in the <code>sling.properties</code> file. (since Sling Launchpad 2.4.0) </td>
---
>       <td><code>-D</code> </td>
>       <td>n=v </td>
>       <td>Sets the property <code>n</code> to the value <code>v</code>. This option can be added repeatedly setting additional properties. Any property set in this manner overwrites same named properties in the <code>sling.properties</code> file. (since Sling Launchpad 2.4.0) </td>
183,185c183,185
<    <td> <code>-n</code> </td>
<    <td> (-) </td>
<    <td> Don't install the shutdown hook. See <a href="#shutdown-hook">Shutdown Hook</a> below. (since Sling Launchpad 2.5.2) </td>
---
>       <td><code>-n</code> </td>
>       <td>(-) </td>
>       <td>Don't install the shutdown hook. See <a href="#shutdown-hook">Shutdown Hook</a> below. (since Sling Launchpad 2.5.2) </td>
188,190c188,190
<    <td> <code>-h</code> </td>
<    <td> (-) </td>
<    <td> Prints a simple usage message listing all available command line options. </td>
---
>       <td><code>-h</code> </td>
>       <td>(-) </td>
>       <td>Prints a simple usage message listing all available command line options. </td>
201c201
< <h3><a href="#control-port" id="control-port">Control Port</a></h3> 
---
> <h3><a href="#control-port" name="control-port">Control Port</a></h3>
234c234
< Escape character is '^]'.
---
> Escape character is &#39;^]&#39;.
241c241
< <h3><a href="#shutdown-hook" id="shutdown-hook">Shutdown Hook</a></h3> 
---
> <h3><a href="#shutdown-hook" name="shutdown-hook">Shutdown Hook</a></h3>
245c245
< <h2><a href="#servlet-parameters" id="servlet-parameters">Servlet Parameters</a></h2> 
---
> <h2><a href="#servlet-parameters" name="servlet-parameters">Servlet Parameters</a></h2>
252,253c252,253
<    <th> Servlet Context </th>
<    <th> Default <code>sling.home</code> </th>
---
>       <th>Servlet Context </th>
>       <th>Default <code>sling.home</code> </th>
258,259c258,259
<    <td> <em>root</em> </td>
<    <td> <code>sling/_</code> </td>
---
>       <td><em>root</em> </td>
>       <td><code>sling/_</code> </td>
262,263c262,263
<    <td> <code>/sling</code> </td>
<    <td> <code>sling/_sling</code> </td>
---
>       <td><code>/sling</code> </td>
>       <td><code>sling/_sling</code> </td>
266,267c266,267
<    <td> <code>/sling/instance1</code> </td>
<    <td> <code>sling/_sling/instance1</code> </td>
---
>       <td><code>/sling/instance1</code> </td>
>       <td><code>sling/_sling/instance1</code> </td>
276,277c276,277
<    <th> Servlet Context </th>
<    <th> Default <code>sling.home</code> </th>
---
>       <th>Servlet Context </th>
>       <th>Default <code>sling.home</code> </th>
282,283c282,283
<    <td> <em>root</em> </td>
<    <td> <code>/var/sling/_</code> </td>
---
>       <td><em>root</em> </td>
>       <td><code>/var/sling/_</code> </td>
286,287c286,287
<    <td> <code>/sling</code> </td>
<    <td> <code>/var/sling/_sling</code> </td>
---
>       <td><code>/sling</code> </td>
>       <td><code>/var/sling/_sling</code> </td>
290,291c290,291
<    <td> <code>/sling/instance1</code> </td>
<    <td> <code>/var/sling/_sling/instance1</code> </td>
---
>       <td><code>/sling/instance1</code> </td>
>       <td><code>/var/sling/_sling/instance1</code> </td>
295c295
< <h2><a href="#slingproperties" id="slingproperties">sling.properties</a></h2> 
---
> <h2><a href="#sling-properties" name="sling-properties">sling.properties</a></h2>
300c300
< <h2><a href="#components" id="components">Components</a></h2> 
---
> <h2><a href="#components" name="components">Components</a></h2>
302c302
< <h3><a href="#launchpad-base" id="launchpad-base">Launchpad Base</a></h3> 
---
> <h3><a href="#launchpad-base" name="launchpad-base">Launchpad Base</a></h3>
305,308c305,314
<  <li> <p><em>Launcher JAR</em> -- The primary artifact of the Base project contains the actual support to launch the Apache Felix OSGi Framework and install bundles, which are packaged with the application. It also contains the Apache Felix Framework together with the OSGi R4.1 Core and Compendium libraries as well as the Equinox HttpService bridge and the Servlet API.</p> </li> 
<  <li> <p><em>App JAR</em> -- The secondary artifact with classifier <em>app</em> is a minimal Standalone Java Application which may be started by simply typing</p> <p>$ java -jar org.apache.sling.launchpad.base-app.jar</p> </li> 
<  <li> <p><em>Web App Archive</em> -- The secondary artifact with classifier <em>webapp</em> is a minimal Web Application, which may simply be deployed into your favirourite servlet container, provided it supports at least Servlet API 2.4.</p> </li> 
<  <li> <p><em>Source JAR</em> -- The secondary artifact with the classifier <em>sources</em> is simple the source of the <em>Launchpad Base</em> project.</p> </li> 
---
>   <li>
>   <p><em>Launcher JAR</em> -- The primary artifact of the Base project contains the actual support to launch the Apache Felix OSGi Framework and install bundles, which are packaged with the application. It also contains the Apache Felix Framework together with the OSGi R4.1 Core and Compendium libraries as well as the Equinox HttpService bridge and the Servlet API.</p></li>
>   <li>
>     <p><em>App JAR</em> -- The secondary artifact with classifier <em>app</em> is a minimal Standalone Java Application which may be started by simply typing</p>
>     <p>$ java -jar org.apache.sling.launchpad.base-app.jar</p>
>   </li>
>   <li>
>   <p><em>Web App Archive</em> -- The secondary artifact with classifier <em>webapp</em> is a minimal Web Application, which may simply be deployed into your favirourite servlet container, provided it supports at least Servlet API 2.4.</p></li>
>   <li>
>   <p><em>Source JAR</em> -- The secondary artifact with the classifier <em>sources</em> is simple the source of the <em>Launchpad Base</em> project.</p></li>
311c317
< <h3><a href="#launchpad-app-and-launchpad-webapp" id="launchpad-app-and-launchpad-webapp">Launchpad App and Launchpad WebApp</a></h3> 
---
> <h3><a href="#launchpad-app-and-launchpad-webapp" name="launchpad-app-and-launchpad-webapp">Launchpad App and Launchpad WebApp</a></h3>
diff -b -B -r ./documentation/the-sling-engine/url-decomposition.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/url-decomposition.html
98,99c98,99
< <h1><a href="#overview" id="overview">Overview</a></h1> 
< <p>During the <em>Resource Resolution</em> step, the client request URI (as being returned by <a href="http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getRequestURI()">HttpServletRequest.getRequestURI()</a>) is decomposed into the following parts (in exactly this order):</p> 
---
> <h1><a href="#overview" name="overview">Overview</a></h1>
> <p>During the <em>Resource Resolution</em> step, the client request URI (as being returned by [HttpServletRequest.getRequestURI()](http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getRequestURI())) is decomposed into the following parts (in exactly this order):</p>
108c108
< <h1><a href="#examples" id="examples">Examples</a></h1> 
---
> <h1><a href="#examples" name="examples">Examples</a></h1>
113,118c113,118
<    <th> URI </th>
<    <th> Resource Path </th>
<    <th> Selectors </th>
<    <th> Extension </th>
<    <th> Suffix </th>
<    <th> Resource Found </th>
---
>       <th>URI </th>
>       <th>Resource Path </th>
>       <th>Selectors </th>
>       <th>Extension </th>
>       <th>Suffix </th>
>       <th>Resource Found </th>
123,232c123,232
<    <td> /a/b </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> null </td>
<    <td> null </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.html </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> html </td>
<    <td> null </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.s1.html </td>
<    <td> /a/b </td>
<    <td> s1 </td>
<    <td> html </td>
<    <td> null </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.s1.s2.html </td>
<    <td> /a/b </td>
<    <td> s1.s2 </td>
<    <td> html </td>
<    <td> null </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b/c/d </td>
<    <td> /a/b/c/d </td>
<    <td> null </td>
<    <td> null </td>
<    <td> null </td>
<    <td> no! </td>
<   </tr> 
<   <tr>
<    <td> /a/c.html/s.txt </td>
<    <td> /a/c </td>
<    <td> null </td>
<    <td> html </td>
<    <td> /s.txt </td>
<    <td> no! </td>
<   </tr> 
<   <tr>
<    <td> /a/b./c/d </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> null </td>
<    <td> /c/d </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.html/c/d </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> html </td>
<    <td> /c/d </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.s1.html/c/d </td>
<    <td> /a/b </td>
<    <td> s1 </td>
<    <td> html </td>
<    <td> /c/d </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.s1.s2.html/c/d </td>
<    <td> /a/b </td>
<    <td> s1.s2 </td>
<    <td> html </td>
<    <td> /c/d </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b/c/d.s.txt </td>
<    <td> /a/b/c/d </td>
<    <td> s </td>
<    <td> txt </td>
<    <td> null </td>
<    <td> no! </td>
<   </tr> 
<   <tr>
<    <td> /a/b.html/c/d.s.txt </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> html </td>
<    <td> /c/d.s.txt </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.s1.html/c/d.s.txt </td>
<    <td> /a/b </td>
<    <td> s1 </td>
<    <td> html </td>
<    <td> /c/d.s.txt </td>
<    <td> yes </td>
<   </tr> 
<   <tr>
<    <td> /a/b.s1.s2.html/c/d.s.txt </td>
<    <td> /a/b </td>
<    <td> s1.s2 </td>
<    <td> html </td>
<    <td> /c/d.s.txt </td>
<    <td> yes </td>
---
>       <td>/a/b </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>null </td>
>       <td>null </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.html </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>html </td>
>       <td>null </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.s1.html </td>
>       <td>/a/b </td>
>       <td>s1 </td>
>       <td>html </td>
>       <td>null </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.s1.s2.html </td>
>       <td>/a/b </td>
>       <td>s1.s2 </td>
>       <td>html </td>
>       <td>null </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b/c/d </td>
>       <td>/a/b/c/d </td>
>       <td>null </td>
>       <td>null </td>
>       <td>null </td>
>       <td>no! </td>
>     </tr>
>     <tr>
>       <td>/a/c.html/s.txt </td>
>       <td>/a/c </td>
>       <td>null </td>
>       <td>html </td>
>       <td>/s.txt </td>
>       <td>no! </td>
>     </tr>
>     <tr>
>       <td>/a/b./c/d </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>null </td>
>       <td>/c/d </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.html/c/d </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>html </td>
>       <td>/c/d </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.s1.html/c/d </td>
>       <td>/a/b </td>
>       <td>s1 </td>
>       <td>html </td>
>       <td>/c/d </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.s1.s2.html/c/d </td>
>       <td>/a/b </td>
>       <td>s1.s2 </td>
>       <td>html </td>
>       <td>/c/d </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b/c/d.s.txt </td>
>       <td>/a/b/c/d </td>
>       <td>s </td>
>       <td>txt </td>
>       <td>null </td>
>       <td>no! </td>
>     </tr>
>     <tr>
>       <td>/a/b.html/c/d.s.txt </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>html </td>
>       <td>/c/d.s.txt </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.s1.html/c/d.s.txt </td>
>       <td>/a/b </td>
>       <td>s1 </td>
>       <td>html </td>
>       <td>/c/d.s.txt </td>
>       <td>yes </td>
>     </tr>
>     <tr>
>       <td>/a/b.s1.s2.html/c/d.s.txt </td>
>       <td>/a/b </td>
>       <td>s1.s2 </td>
>       <td>html </td>
>       <td>/c/d.s.txt </td>
>       <td>yes </td>
236c236
< <h1><a href="#automated-tests" id="automated-tests">Automated Tests</a></h1> 
---
> <h1><a href="#automated-tests" name="automated-tests">Automated Tests</a></h1>
diff -b -B -r ./documentation/the-sling-engine/url-to-script-resolution.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/url-to-script-resolution.html
100c100
< <p>This page explains how Sling maps URLs to a script or and servlet.</p> 
---
> <p>This page explains how Sling maps URLs to a script or and servlet. </p>
103c103
< <p>Scripts and servlets are itself resources in Sling and thus have a resource path: this is either the location in the JCR repository, the resource type in a servlet component configuration or the "virtual" bundle resource path (if a script is provided inside a bundle without being installed into the JCR repository).</p> 
---
> <p>Scripts and servlets are itself resources in Sling and thus have a resource path: this is either the location in the JCR repository, the resource type in a servlet component configuration or the "virtual" bundle resource path (if a script is provided inside a bundle without being installed into the JCR repository). </p>
105,113c105,113
< <p>TODO: explain super types, servlet path mappings, node type resource types (<code>my:type -&gt; my/type</code>)</p> 
< <h2><a href="#fundamental-scripts-and-servlets-are-equal" id="fundamental-scripts-and-servlets-are-equal">Fundamental: Scripts and Servlets are equal</a></h2> 
< <p>In the following discussion, I will write about scripts. This will always include servlets as well. In fact, internally, Sling only handles with Servlets, whereas scripts are packed inside a Servlet wrapping and representing the script.</p> 
< <h2><a href="#base-resource-type-inheritance" id="base-resource-type-inheritance">Base: Resource Type Inheritance</a></h2> 
< <p>While not exactly part of our discussion, resource type inheritance as implemented for <a href="https://issues.apache.org/jira/browse/SLING-278">SLING-278</a> plays a vital role in script resolution.</p> 
< <p>Each resource type may have a resource super type, which may be defined in various ways. One example is having a <code>sling:resourceSuperType</code> property in the node addressed by the resource type. See <a href="http://www.mail-archive.com/sling-dev@incubator.apache.org/msg02365.html">http://www.mail-archive.com/sling-dev@incubator.apache.org/msg02365.html</a> and <a href="http://issues.apache.org/jira/browse/SLING-278">SLING-278</a> for more details.</p> 
< <p>If a resource type has no explicit resource super type, the resource super type is assumed to be "sling/servlet/default". That is the resource type used for default script selection is also acting as a basic resource type much like java.lang.Object does for other types in the Java language.</p> 
< <h2><a href="#script-locations" id="script-locations">Script Locations</a></h2> 
< <p>Scripts are looked up in a series of locations defined by the ResourceResolver.getSearchPath() and the resource type (and resource super types) of the requested resource:</p> 
---
> <p>TODO: explain super types, servlet path mappings, node type resource types (<code>my:type -&gt; my/type</code>) </p>
> <h2><a href="#fundamental-scripts-and-servlets-are-equal" name="fundamental-scripts-and-servlets-are-equal">Fundamental: Scripts and Servlets are equal</a></h2>
> <p>In the following discussion, I will write about scripts. This will always include servlets as well. In fact, internally, Sling only handles with Servlets, whereas scripts are packed inside a Servlet wrapping and representing the script. </p>
> <h2><a href="#base-resource-type-inheritance" name="base-resource-type-inheritance">Base: Resource Type Inheritance</a></h2>
> <p>While not exactly part of our discussion, resource type inheritance as implemented for <a href="https://issues.apache.org/jira/browse/SLING-278">SLING-278</a> plays a vital role in script resolution. </p>
> <p>Each resource type may have a resource super type, which may be defined in various ways. One example is having a <code>sling:resourceSuperType</code> property in the node addressed by the resource type. See <a href="http://www.mail-archive.com/sling-dev@incubator.apache.org/msg02365.html">http://www.mail-archive.com/sling-dev@incubator.apache.org/msg02365.html</a> and <a href="http://issues.apache.org/jira/browse/SLING-278">SLING-278</a> for more details. </p>
> <p>If a resource type has no explicit resource super type, the resource super type is assumed to be "sling/servlet/default". That is the resource type used for default script selection is also acting as a basic resource type much like java.lang.Object does for other types in the Java language. </p>
> <h2><a href="#script-locations" name="script-locations">Script Locations</a></h2>
> <p>Scripts are looked up in a series of locations defined by the ResourceResolver.getSearchPath() and the resource type (and resource super types) of the requested resource: </p>
116c116
< <p>The pseudo code for iterating the locations would be something like:</p> 
---
> <p>The pseudo code for iterating the locations would be something like: </p>
134,139c134,139
< <h2><a href="#all-requests-are-not-equal" id="all-requests-are-not-equal">All requests are NOT equal</a></h2> 
< <p>GET and HEAD request methods are treated differently than the other request methods. Only for GET and HEAD requests will the request selectors and extension be considered for script selection. For other requests the servlet or script name (without the script extension) must exactly match the request method.</p> 
< <p>That is for a PUT request, the script must be PUT.esp or PUT.jsp. For a GET request with a request extension of html, the script name may be html.esp or GET.esp.</p> 
< <h2><a href="#scripts-for-get-requests" id="scripts-for-get-requests">Scripts for GET requests</a></h2> 
< <p>Apart for supporting scripts named after the request method, scripts handling GET and HEAD requests may be named differently for Sling to support a more elaborate processing order.</p> 
< <p>Depending on whether request selectors are considered, a script may have two forms:</p> 
---
> <h2><a href="#all-requests-are-not-equal" name="all-requests-are-not-equal">All requests are NOT equal</a></h2>
> <p>GET and HEAD request methods are treated differently than the other request methods. Only for GET and HEAD requests will the request selectors and extension be considered for script selection. For other requests the servlet or script name (without the script extension) must exactly match the request method. </p>
> <p>That is for a PUT request, the script must be PUT.esp or PUT.jsp. For a GET request with a request extension of html, the script name may be html.esp or GET.esp. </p>
> <h2><a href="#scripts-for-get-requests" name="scripts-for-get-requests">Scripts for GET requests</a></h2>
> <p>Apart for supporting scripts named after the request method, scripts handling GET and HEAD requests may be named differently for Sling to support a more elaborate processing order. </p>
> <p>Depending on whether request selectors are considered, a script may have two forms: </p>
144c144
< <p>The constituents of these script names are as follows:</p> 
---
> <p>The constituents of these script names are as follows: </p>
149c149
<  <li><code>{selectorStringPath}</code> - The selector string converted to a path, along the lines of <code>selectorString.replace('.', '/')</code>. If less selectors are specified in the script name than given in the request, the script will only be taken into consideration if the given selectors are the <strong>first</strong> selectors in the request. This means <em>sel1/sel2.html.jsp</em> will be a candidate for the request url <em>/content/test.sel1.sel2.sel3.html</em> but not for <em>/content/test.sel3.sel1.sel2.html</em>. So the order of selectors is relevant!</li> 
---
>   <li><code>{selectorStringPath}</code> - The selector string converted to a path, along the lines of <code>selectorString.replace(&#39;.&#39;, &#39;/&#39;)</code>. If less selectors are specified in the script name than given in the request, the script will only be taken into consideration if the given selectors are the <strong>first</strong> selectors in the request. This means <em>sel1/sel2.html.jsp</em> will be a candidate for the request url <em>/content/test.sel1.sel2.sel3.html</em> but not for <em>/content/test.sel3.sel1.sel2.html</em>. So the order of selectors is relevant!</li>
151,152c151,152
< <h2><a href="#priority" id="priority">Priority</a></h2> 
< <p>The rules for script path priorization is defined as follows:</p> 
---
> <h2><a href="#priority" name="priority">Priority</a></h2>
> <p>The rules for script path priorization is defined as follows: </p>
158,159c158,159
< <h2><a href="#examples" id="examples">Examples</a></h2> 
< <p>Let's consider the following script paths for a request of a resource whose resource type is <code>sling\sample</code> and the request selectors are <em>print.a4</em> and the request extension is <em>html</em>:</p> 
---
> <h2><a href="#examples" name="examples">Examples</a></h2>
> <p>Let's consider the following script paths for a request of a resource whose resource type is <code>sling\sample</code> and the request selectors are <em>print.a4</em> and the request extension is <em>html</em>: </p>
diff -b -B -r ./documentation/the-sling-engine/wrap-or-decorate-resources.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine/wrap-or-decorate-resources.html
94c94
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#introduction" name="introduction">Introduction</a></h2>
96c96
< <h2><a href="#"></a></h2> 
---
> <p>## </p>
107c107
< <p>The registered decorators will be called from the resource resolver for each resource returned. If the service decorates the resource it should return the new resource (often using a <code>ResourceWrapper</code> to wrap the original Resource). If the service does not want to decorate the resource, it should return the original resource or null.</p> 
---
> <p>The registered decorators will be called from the resource resolver for each resource returned. If the service decorates the resource it should return the new resource (often using a <code>ResourceWrapper</code> to wrap the original Resource). If the service does not want to decorate the resource, it should return the original resource or null. </p>
diff -b -B -r ./documentation/the-sling-engine.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/the-sling-engine.html
92c92
< <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#general" id="general">General</a></h2> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h2><a href="#general" name="general">General</a></h2>
98c98
< <h2><a href="#request-handling" id="request-handling">Request Handling</a></h2> 
---
> <h2><a href="#request-handling" name="request-handling">Request Handling</a></h2>
109c109
< <h2><a href="#resources" id="resources">Resources</a></h2> 
---
> <h2><a href="#resources" name="resources">Resources</a></h2>
116c116
< <h2><a href="#misc" id="misc">Misc</a></h2> 
---
> <h2><a href="#misc" name="misc">Misc</a></h2>
diff -b -B -r ./documentation/tutorials-how-tos/46-line-blog.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/tutorials-how-tos/46-line-blog.html
97c97
< <h2><a href="#audience" id="audience">Audience</a></h2> 
---
> <h2><a href="#audience" name="audience">Audience</a></h2>
99c99
< <h2><a href="#step-0-start-configure-and-login-to-sling" id="step-0-start-configure-and-login-to-sling">Step 0: Start, configure and login to Sling</a></h2> 
---
> <h2><a href="#step-0-start-configure-and-login-to-sling" name="step-0-start-configure-and-login-to-sling">Step 0: Start, configure and login to Sling</a></h2>
103c103
< <h2><a href="#step-1-creating-content" id="step-1-creating-content">Step 1: Creating content</a></h2> 
---
> <h2><a href="#step-1-creating-content" name="step-1-creating-content">Step 1: Creating content</a></h2>
110c110
<       &lt;form method="POST"&gt;
---
>       &lt;form method=&quot;POST&quot;&gt;
112c112
<         &lt;input type="text" name="title" style="width:100%"/&gt;
---
>         &lt;input type=&quot;text&quot; name=&quot;title&quot; style=&quot;width:100%&quot;/&gt;
115c115
<         &lt;textarea style="width:100%" name="text"&gt;&lt;/textarea&gt;
---
>         &lt;textarea style=&quot;width:100%&quot; name=&quot;text&quot;&gt;&lt;/textarea&gt;
118,119c118,119
<         &lt;input type="submit" value="save"/&gt;
<         &lt;input type="hidden" name=":redirect" value="*.html"/&gt;
---
>         &lt;input type=&quot;submit&quot; value=&quot;save&quot;/&gt;
>         &lt;input type=&quot;hidden&quot; name=&quot;:redirect&quot; value=&quot;*.html&quot;/&gt;
122c122
<         &lt;input type="hidden" name="_charset_" value="UTF-8"/&gt;
---
>         &lt;input type=&quot;hidden&quot; name=&quot;_charset_&quot; value=&quot;UTF-8&quot;/&gt;
135c135
<   If you get an error saying _javax.jcr.AccessDeniedException: ...not allowed to add or modify item_ it means that you are not logged in as user _admin_. See instructions above for logging in. 
---
> If you get an error saying _javax.jcr.AccessDeniedException: ...not allowed to add or modify item_ it means that you are not logged in as user _admin_. See instructions above for logging in.
138c138
< <h2><a href="#step-2-wheres-my-content" id="step-2-wheres-my-content">Step 2: Where's my content?</a></h2> 
---
> <h2><a href="#step-2-where-s-my-content-" name="step-2-where-s-my-content-">Step 2: Where's my content?</a></h2>
141,143c141,143
<   "jcr:primaryType": "nt:unstructured",
<   "text": "This is the foo text",
<   "title": "foo"
---
>   &quot;jcr:primaryType&quot;: &quot;nt:unstructured&quot;,
>   &quot;text&quot;: &quot;This is the foo text&quot;,
>   &quot;title&quot;: &quot;foo&quot;
149c149
<   &lt;script src="/system/sling.js"&gt;&lt;/script&gt;
---
>   &lt;script src=&quot;/system/sling.js&quot;&gt;&lt;/script&gt;
157,158c157,158
< <p>We can now create and edit posts; let's add some navigation, using more of the <em>sling.js</em> functionality.</p> 
< <h2><a href="#step-3-navigation" id="step-3-navigation">Step 3: Navigation</a></h2> 
---
> <p>We can now create and edit posts; let's add some navigation, using more of the <em>sling.js</em> functionality. </p>
> <h2><a href="#step-3-navigation" name="step-3-navigation">Step 3: Navigation</a></h2>
163c163
<     &lt;li&gt;&lt;em&gt;&lt;a href="/content/blog/*.html"&gt;[Create new post]&lt;/a&gt;&lt;/em&gt;&lt;/li&gt;
---
>     &lt;li&gt;&lt;em&gt;&lt;a href=&quot;/content/blog/*.html&quot;&gt;[Create new post]&lt;/a&gt;&lt;/em&gt;&lt;/li&gt;
165c165
<       var posts = Sling.getContent("/content/blog", 2);
---
>       var posts = Sling.getContent(&quot;/content/blog&quot;, 2);
167,168c167,168
<         document.write("&lt;li&gt;"
<           + "&lt;a href='/content/blog/" + i + ".html'&gt;"    
---
>         document.write(&quot;&lt;li&gt;&quot;
>           + &quot;&lt;a href=&#39;/content/blog/&quot; + i + &quot;.html&#39;&gt;&quot;    
170c170
<           + "&lt;/a&gt;&lt;/li&gt;");
---
>           + &quot;&lt;/a&gt;&lt;/li&gt;&quot;);
175c175
< <p>The first link to <code>/content/blog/*</code> brings us back to our content creating form, which is nothing else than the editing form reading empty values and posting to the "magic star" URL.</p> 
---
> <p>The first link to <code>/content/blog/*</code> brings us back to our content creating form, which is nothing else than the editing form reading empty values and posting to the "magic star" URL. </p>
179c179
< <h2><a href="#step-4-data-first-structure-later" id="step-4-data-first-structure-later">Step 4: Data first, structure later</a></h2> 
---
> <h2><a href="#step-4-data-first-structure-later" name="step-4-data-first-structure-later">Step 4: Data first, structure later</a></h2>
184c184
< &lt;input type="author" name="author" style="width:100%"/&gt;
---
> &lt;input type=&quot;author&quot; name=&quot;author&quot; style=&quot;width:100%&quot;/&gt;
187c187
< <h2><a href="#i-want-my-esp" id="i-want-my-esp">I want my ESP!</a></h2> 
---
> <h2>I want my ESP!</h2>
191c191
< <h2><a href="#thats-the-power-of-sling" id="thats-the-power-of-sling">That's the power of Sling</a></h2> 
---
> <h2><a href="#that-s-the-power-of-sling" name="that-s-the-power-of-sling">That's the power of Sling</a></h2>
diff -b -B -r ./documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
97c97
< <h2><a href="#within-an-osgi-servicecomponent" id="within-an-osgi-servicecomponent">Within an OSGI Service/Component</a></h2> 
---
> <h2><a href="#within-an-osgi-service-component" name="within-an-osgi-service-component">Within an OSGI Service/Component</a></h2>
104c104
<         String resourcePath = "path/to/resource";
---
>         String resourcePath = &quot;path/to/resource&quot;;
115c115
< <h2><a href="#within-a-servlet" id="within-a-servlet">Within a Servlet</a></h2> 
---
> <h2><a href="#within-a-servlet" name="within-a-servlet">Within a Servlet</a></h2>
121c121
< <pre><code><!-- TODO syntax marker (#!java) disabled -->String resourcePath = "path/to/resource";
---
> <pre><code><!-- TODO syntax marker (#!java) disabled -->String resourcePath = &quot;path/to/resource&quot;;
126,127c126,127
< <h2><a href="#within-a-jsp-file" id="within-a-jsp-file">Within a JSP file</a></h2> 
< <p>When you use the <code>&lt;sling:defineObjects&gt;</code> tag in a JSP file, you have access to a few handy objects, one of them is <code>resource</code>, the resource that is resolved from the URL. Another one is <code>resourceResolver</code>, the <code>ResourceResolver</code> defined through the <code>SlingHttpServletRequest</code>.</p> 
---
> <h2><a href="#within-a-jsp-file" name="within-a-jsp-file">Within a JSP file</a></h2>
> <p>When you use the <code>&lt;sling:defineObjects&gt;</code> tag in a JSP file, you have access to a few handy objects, one of them is <code>resource</code>, the resource that is resolved from the URL. Another one is <code>resourceResolver</code>, the <code>ResourceResolver</code> defined through the <code>SlingHttpServletRequest</code>. </p>
131c131
<     String resourcePath = "path/to/resource";
---
>     String resourcePath = &quot;path/to/resource&quot;;
139c139
< <h2><a href="#accessing-a-property" id="accessing-a-property">Accessing a Property</a></h2> 
---
> <h2><a href="#accessing-a-property" name="accessing-a-property">Accessing a Property</a></h2>
diff -b -B -r ./documentation/tutorials-how-tos/how-to-manage-events-in-sling.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
102c102
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
120c120
< <h2><a href="#listening-to-osgi-events" id="listening-to-osgi-events">Listening to OSGI Events</a></h2> 
---
> <h2><a href="#listening-to-osgi-events" name="listening-to-osgi-events">Listening to OSGI Events</a></h2>
127c127
< <h2><a href="#starting-a-job" id="starting-a-job">Starting a job</a></h2> 
---
> <h2><a href="#starting-a-job" name="starting-a-job">Starting a job</a></h2>
131c131
<     payload.put("resourcePath", resourcePath);
---
>     payload.put(&quot;resourcePath&quot;, resourcePath);
149c149
< public static final String JOB_TOPIC = "com/sling/eventing/dropbox/job";
---
> public static final String JOB_TOPIC = &quot;com/sling/eventing/dropbox/job&quot;;
160c160,161
<     </ul> </li> 
---
>         </ul>
>       </li>
162c163,164
<   </ul> </li> 
---
>     </ul>
>   </li>
171c173
<     if ( propPath.startsWith("/tmp/dropbox") &amp;&amp; "nt:file".equals(propResType) ) {
---
>     if ( propPath.startsWith(&quot;/tmp/dropbox&quot;) &amp;&amp; &quot;nt:file&quot;.equals(propResType) ) {
174c176
<         payload.put("resourcePath", propPath);
---
>         payload.put(&quot;resourcePath&quot;, propPath);
177c179
<         logger.info("the dropbox job has been started for: {}", propPath);
---
>         logger.info(&quot;the dropbox job has been started for: {}&quot;, propPath);
182c184
< <h2><a href="#consuming-job-events" id="consuming-job-events">Consuming Job Events</a></h2> 
---
> <h2><a href="#consuming-job-events" name="consuming-job-events">Consuming Job Events</a></h2>
185c187
< <pre><code><!-- TODO syntax marker (::java) disabled -->@Property(name="job.topics",
---
> <pre><code><!-- TODO syntax marker (::java) disabled -->@Property(name=&quot;job.topics&quot;,
204,207c206,209
< private final static String IMAGES_PATH = "/dropbox/images/";
< private final static String MUSIC_PATH = "/dropbox/music/";
< private final static String MOVIES_PATH = "/dropbox/movies/";
< private final static String OTHER_PATH = "/dropbox/other/";
---
> private final static String IMAGES_PATH = &quot;/dropbox/images/&quot;;
> private final static String MUSIC_PATH = &quot;/dropbox/music/&quot;;
> private final static String MOVIES_PATH = &quot;/dropbox/movies/&quot;;
> private final static String OTHER_PATH = &quot;/dropbox/other/&quot;;
223,224c225,226
<         final String resourcePath = (String) job.getProperty("resourcePath");
< 		final String resourceName = resourcePath.substring(resourcePath.lastIndexOf("/") + 1);
---
>         final String resourcePath = (String) job.getProperty(&quot;resourcePath&quot;);
>        final String resourceName = resourcePath.substring(resourcePath.lastIndexOf(&quot;/&quot;) + 1);
227c229
< 		if ( res.isResourceType("nt:file") ) {
---
>        if ( res.isResourceType(&quot;nt:file&quot;) ) {
230c232
<         	if (mimeType.equals("image/png")) {
---
>             if (mimeType.equals(&quot;image/png&quot;)) {
233c235
<         	else if (mimeType.equals("audio/mpeg")) {
---
>             else if (mimeType.equals(&quot;audio/mpeg&quot;)) {
236c238
<         	else if (mimeType.equals("video/x-msvideo")) {
---
>             else if (mimeType.equals(&quot;video/x-msvideo&quot;)) {
245c247
<         	logger.info("The file {} has been moved to {}", resourceName, destDir);
---
>             logger.info(&quot;The file {} has been moved to {}&quot;, resourceName, destDir);
249c251
< 		logger.error("Exception: " + e, e);
---
>        logger.error(&quot;Exception: &quot; + e, e);
diff -b -B -r ./documentation/tutorials-how-tos/installing-and-upgrading-bundles.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
97,98c97
<   We recommend to use the Apache Felix Web Console. The documentation below describes the old Sling Management Console, which isn't in use any more. Please refer to the documentation of the 
<  <a href="http://felix.apache.org/documentation/subprojects/apache-felix-web-console.html">Apache Felix Web Console</a>. 
---
> We recommend to use the Apache Felix Web Console. The documentation below describes the old Sling Management Console, which isn't in use any more. Please refer to the documentation of the <a href="http://felix.apache.org/documentation/subprojects/apache-felix-web-console.html">Apache Felix Web Console</a>.
102c101
< <h2><a href="#sling-management-console" id="sling-management-console">Sling Management Console</a></h2> 
---
> <h2><a href="#sling-management-console" name="sling-management-console">Sling Management Console</a></h2>
106c105
< <h2><a href="#installing-and-upgrading-bundles-by-upload" id="installing-and-upgrading-bundles-by-upload">Installing and upgrading bundles by Upload</a></h2> 
---
> <h2><a href="#installing-and-upgrading-bundles-by-upload" name="installing-and-upgrading-bundles-by-upload">Installing and upgrading bundles by Upload</a></h2>
117c116
< <h2><a href="#installing-and-upgrading-bundles-from-the-bundle-repository" id="installing-and-upgrading-bundles-from-the-bundle-repository">Installing and upgrading bundles from the Bundle Repository</a></h2> 
---
> <h2><a href="#installing-and-upgrading-bundles-from-the-bundle-repository" name="installing-and-upgrading-bundles-from-the-bundle-repository">Installing and upgrading bundles from the Bundle Repository</a></h2>
120c119
< <h3><a href="#the-bundle-repository-page" id="the-bundle-repository-page">The Bundle Repository page</a></h3> 
---
> <h3><a href="#the-bundle-repository-page" name="the-bundle-repository-page">The Bundle Repository page</a></h3>
123c122
< <h3><a href="#the-bundles-page" id="the-bundles-page">The Bundles page</a></h3> 
---
> <h3><a href="#the-bundles-page" name="the-bundles-page">The Bundles page</a></h3>
125c124
< <h3><a href="#managing-osgi-bundle-repositories" id="managing-osgi-bundle-repositories">Managing OSGi Bundle Repositories</a></h3> 
---
> <h3><a href="#managing-osgi-bundle-repositories" name="managing-osgi-bundle-repositories">Managing OSGi Bundle Repositories</a></h3>
diff -b -B -r ./documentation/tutorials-how-tos/jackrabbit-persistence.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/tutorials-how-tos/jackrabbit-persistence.html
99,100c99,101
<   Recent versions of Apache Sling no longer use Apache Jackrabbit as their persistence engine, but Apache Jackrabbit Oak. Oak is configured in a different, more OSGi-friendly way. For more details, see 
<  <a href="http://jackrabbit.apache.org/oak/docs/">The Jackrabbit Oak documentation</a>. The Jackrabbit integration has also been moved to the attic and is no longer maintained. 
---
> Recent versions of Apache Sling no longer use Apache Jackrabbit as their persistence engine, but
> Apache Jackrabbit Oak. Oak is configured in a different, more OSGi-friendly way. For more details,
> see <a href="http://jackrabbit.apache.org/oak/docs/">The Jackrabbit Oak documentation</a>. The Jackrabbit integration has also been moved to the attic and is no longer maintained.
104c105
< <h2><a href="#management-summary" id="management-summary">Management Summary</a></h2> 
---
> <h2><a href="#management-summary" name="management-summary">Management Summary</a></h2>
112c113
< <h2><a href="#jdbc-driver" id="jdbc-driver">JDBC Driver</a></h2> 
---
> <h2><a href="#jdbc-driver" name="jdbc-driver">JDBC Driver</a></h2>
117c118,119
<  <li>Wrap the JDBC driver library into an OSGi bundle: <pre><code><!-- TODO syntax marker (::sh) disabled --># Example for PostgreSQL JDBC 3 driver 8.4-701
---
>   <li>Wrap the JDBC driver library into an OSGi bundle:
>     <pre><code><!-- TODO syntax marker (::sh) disabled --># Example for PostgreSQL JDBC 3 driver 8.4-701
120,121c122,126
< </code></pre> </li> 
<  <li> <p>Deploy the driver to your local Maven 2 Repository (Required if adding the JDBC driver to a Maven build, e.g. using the Sling Launchpad Plugin)</p> <pre><code><!-- TODO syntax marker (::sh) disabled -->$ mvn install:install-file \  
---
> </code></pre>
>   </li>
>   <li>
>     <p>Deploy the driver to your local Maven 2 Repository (Required if adding the JDBC driver to a Maven build, e.g. using the Sling Launchpad Plugin)</p>
>     <pre><code><!-- TODO syntax marker (::sh) disabled -->$ mvn install:install-file \  
124c129,130
< </code></pre> </li> 
---
> </code></pre>
>   </li>
127c133
< <h2><a href="#replace-derby-in-a-running-sling-instance" id="replace-derby-in-a-running-sling-instance">Replace Derby in a running Sling Instance</a></h2> 
---
> <h2><a href="#replace-derby-in-a-running-sling-instance" name="replace-derby-in-a-running-sling-instance">Replace Derby in a running Sling Instance</a></h2>
132c138
<  <li>Stop the Jackrabbit Embedded Repository bundle<br> This needs to be reconfigured and restarted anyway. So lets just stop it to prevent failures in the next step.</li> 
---
>   <li>Stop the Jackrabbit Embedded Repository bundle<br/>This needs to be reconfigured and restarted anyway. So lets just stop it to prevent failures in the next step.</li>
136c142
< <h2><a href="#reconfiguring-jackrabbit" id="reconfiguring-jackrabbit">Reconfiguring Jackrabbit</a></h2> 
---
> <h2><a href="#reconfiguring-jackrabbit" name="reconfiguring-jackrabbit">Reconfiguring Jackrabbit</a></h2>
143c149
<     &lt;Workspace name="${wsp.name}"&gt;
---
>     &lt;Workspace name=&quot;${wsp.name}&quot;&gt;
145,152c151,158
<         &lt;PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.PostgreSQLPersistenceManager"&gt;
<             &lt;param name="driver" value="org.postgresql.Driver"/&gt;
<             &lt;param name="url" value="jdbc:postgresql://localhost:5432/YOUR_DB_NAME_HERE"/&gt;
<             &lt;param name="schema" value="postgresql"/&gt;
<             &lt;param name="user" value="YOUR_USER_HERE"/&gt;
<             &lt;param name="password" value="YOUR_PASSWORD_HERE"/&gt;
<             &lt;param name="schemaObjectPrefix" value="jcr_${wsp.name}_"/&gt;
<             &lt;param name="externalBLOBs" value="false"/&gt;
---
>         &lt;PersistenceManager class=&quot;org.apache.jackrabbit.core.persistence.bundle.PostgreSQLPersistenceManager&quot;&gt;
>             &lt;param name=&quot;driver&quot; value=&quot;org.postgresql.Driver&quot;/&gt;
>             &lt;param name=&quot;url&quot; value=&quot;jdbc:postgresql://localhost:5432/YOUR_DB_NAME_HERE&quot;/&gt;
>             &lt;param name=&quot;schema&quot; value=&quot;postgresql&quot;/&gt;
>             &lt;param name=&quot;user&quot; value=&quot;YOUR_USER_HERE&quot;/&gt;
>             &lt;param name=&quot;password&quot; value=&quot;YOUR_PASSWORD_HERE&quot;/&gt;
>             &lt;param name=&quot;schemaObjectPrefix&quot; value=&quot;jcr_${wsp.name}_&quot;/&gt;
>             &lt;param name=&quot;externalBLOBs&quot; value=&quot;false&quot;/&gt;
157c163
<     &lt;Versioning rootPath="${rep.home}/version"&gt;
---
>     &lt;Versioning rootPath=&quot;${rep.home}/version&quot;&gt;
159,166c165,172
<         &lt;PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.PostgreSQLPersistenceManager"&gt;
<             &lt;param name="driver" value="org.postgresql.Driver"/&gt;
<             &lt;param name="url" value="jdbc:postgresql://localhost:5432/YOUR_DB_NAME_HERE"/&gt;
<             &lt;param name="schema" value="postgresql"/&gt;
<             &lt;param name="user" value="YOUR_USER_HERE"/&gt;
<             &lt;param name="password" value="YOUR_PASSWORD_HERE"/&gt;
<             &lt;param name="schemaObjectPrefix" value="version_"/&gt;
<             &lt;param name="externalBLOBs" value="false"/&gt;
---
>         &lt;PersistenceManager class=&quot;org.apache.jackrabbit.core.persistence.bundle.PostgreSQLPersistenceManager&quot;&gt;
>             &lt;param name=&quot;driver&quot; value=&quot;org.postgresql.Driver&quot;/&gt;
>             &lt;param name=&quot;url&quot; value=&quot;jdbc:postgresql://localhost:5432/YOUR_DB_NAME_HERE&quot;/&gt;
>             &lt;param name=&quot;schema&quot; value=&quot;postgresql&quot;/&gt;
>             &lt;param name=&quot;user&quot; value=&quot;YOUR_USER_HERE&quot;/&gt;
>             &lt;param name=&quot;password&quot; value=&quot;YOUR_PASSWORD_HERE&quot;/&gt;
>             &lt;param name=&quot;schemaObjectPrefix&quot; value=&quot;version_&quot;/&gt;
>             &lt;param name=&quot;externalBLOBs&quot; value=&quot;false&quot;/&gt;
175c181
< <h2><a href="#credits" id="credits">Credits</a></h2> 
---
> <h2><a href="#credits" name="credits">Credits</a></h2>
diff -b -B -r ./documentation/tutorials-how-tos/testing-sling-based-applications.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation/tutorials-how-tos/testing-sling-based-applications.html
100,101c100,101
< <h2><a href="#unit-tests" id="unit-tests">Unit tests</a></h2> 
< <p>When possible, unit tests are obviously the fastest executing ones, and it's easy to keep them close to the code that they're testing.</p> 
---
> <h2><a href="#unit-tests" name="unit-tests">Unit tests</a></h2>
> <p>When possible, unit tests are obviously the fastest executing ones, and it's easy to keep them close to the code that they're testing. </p>
103c103
< <h2><a href="#tests-that-use-a-jcr-repository" id="tests-that-use-a-jcr-repository">Tests that use a JCR repository</a></h2> 
---
> <h2><a href="#tests-that-use-a-jcr-repository" name="tests-that-use-a-jcr-repository">Tests that use a JCR repository</a></h2>
107c107
< <h2><a href="#mock-classes-and-services" id="mock-classes-and-services">Mock classes and services</a></h2> 
---
> <h2><a href="#mock-classes-and-services" name="mock-classes-and-services">Mock classes and services</a></h2>
112c112
< <h3><a href="#side-note-injecting-services-in-private-fields" id="side-note-injecting-services-in-private-fields">Side note: injecting services in private fields</a></h3> 
---
> <h3><a href="#side-note-injecting-services-in-private-fields" name="side-note-injecting-services-in-private-fields">Side note: injecting services in private fields</a></h3>
119c119
< final java.lang.reflect.Field resolverField = resolverClass.getDeclaredField("resourceResolverFactory");
---
> final java.lang.reflect.Field resolverField = resolverClass.getDeclaredField(&quot;resourceResolverFactory&quot;);
123c123
< <h2><a href="#pax-exam" id="pax-exam">Pax Exam</a></h2> 
---
> <h2><a href="#pax-exam" name="pax-exam">Pax Exam</a></h2>
127,129c127,129
< <h2><a href="#server-side-junit-tests" id="server-side-junit-tests">Server-side JUnit tests</a></h2> 
< <p>The tools described on the <a href="/documentation/bundles/org-apache-sling-junit-bundles.html">JUnit server-side testing support</a> page allow for running JUnit tests on an live Sling instance, as part of the normal integration testing cycle.</p> 
< <h2><a href="#http-based-integration-tests" id="http-based-integration-tests">HTTP-based integration tests</a></h2> 
---
> <h2><a href="#server-side-junit-tests" name="server-side-junit-tests">Server-side JUnit tests</a></h2>
> <p>The tools described on the <a href="/documentation/bundles/org-apache-sling-junit-bundles.html">JUnit server-side testing support</a> page allow for running JUnit tests on an live Sling instance, as part of the normal integration testing cycle. </p>
> <h2><a href="#http-based-integration-tests" name="http-based-integration-tests">HTTP-based integration tests</a></h2>
132c132
< <h3><a href="#starting-an-integration-test" id="starting-an-integration-test"></a><a name="starting"></a> Starting an Integration Test</h3> 
---
> <h3><a name="starting"></a> Starting an Integration Test</h3>
135c135
< <h4><a href="#maven-dependency" id="maven-dependency">Maven Dependency</a></h4> 
---
> <h4><a href="#maven-dependency" name="maven-dependency">Maven Dependency</a></h4>
142c142
< <h4><a href="#simple-example-using-slinginstancerule" id="simple-example-using-slinginstancerule">Simple Example using SlingInstanceRule</a></h4> 
---
> <h4><a href="#simple-example-using-slinginstancerule" name="simple-example-using-slinginstancerule">Simple Example using SlingInstanceRule</a></h4>
154,156c154,156
<        client.createNode("/content/myNode", "nt:unstructured");
<        Assert.assertTrue("Node should be there", client.exists("/content/myNode"));
<        //client.adaptTo(OsgiConsoleClient.class).editConfigurationWithWait(10, "MYPID", null, myMap);
---
>        client.createNode(&quot;/content/myNode&quot;, &quot;nt:unstructured&quot;);
>        Assert.assertTrue(&quot;Node should be there&quot;, client.exists(&quot;/content/myNode&quot;));
>        //client.adaptTo(OsgiConsoleClient.class).editConfigurationWithWait(10, &quot;MYPID&quot;, null, myMap);
160c160
< <h2><a href="#summary" id="summary">Summary</a></h2> 
---
> <h2><a href="#summary" name="summary">Summary</a></h2>
diff -b -B -r ./documentation.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/documentation.html
96c96
< <h1><a href="#overview" id="overview">Overview</a></h1> 
---
> <h1><a href="#overview" name="overview">Overview</a></h1>
108c108
< <h1><a href="#how-you-can-contribute" id="how-you-can-contribute">How you can contribute</a></h1> 
---
> <h1><a href="#how-you-can-contribute" name="how-you-can-contribute">How you can contribute</a></h1>
110c110
< <h1><a href="#how-the-documentation-is-generated" id="how-the-documentation-is-generated">How the documentation is generated</a></h1> 
---
> <h1><a href="#how-the-documentation-is-generated" name="how-the-documentation-is-generated">How the documentation is generated</a></h1>
119c119
< <h2><a href="#the-sling-website" id="the-sling-website">The Sling Website</a></h2> 
---
> <h2><a href="#the-sling-website" name="the-sling-website">The Sling Website</a></h2>
121,123c121,123
< <h2><a href="#the-public-wiki" id="the-public-wiki">The Public Wiki</a></h2> 
< <p>The public wiki of Sling is available at <a href="http://cwiki.apache.org/SLING">http://cwiki.apache.org/SLING</a> and is maintained in the Confluence space <em>SLING</em>. Everyone can create an account there. To gain edit rights please ask via the <a href="/project-information.html">mailing list</a>. Any of the administrators listed in the <a href="https://cwiki.apache.org/confluence/spaces/viewspacesummary.action?key=SLING&amp;showAllAdmins=true">Space Overview</a> can give you access.</p> 
< <h2><a href="#the-javadoc" id="the-javadoc">The JavaDoc</a></h2> 
---
> <h2><a href="#the-public-wiki" name="the-public-wiki">The Public Wiki</a></h2>
> <p>The public wiki of Sling is available at <a href="http://cwiki.apache.org/SLING">http://cwiki.apache.org/SLING</a> and is maintained in the Confluence space <em>SLING</em>. Everyone can create an account there. To gain edit rights please ask via the <a href="/project-information.html">mailing list</a>. Any of the administrators listed in the <a href="https://cwiki.apache.org/confluence/spaces/viewspacesummary.action?key=SLING&showAllAdmins=true">Space Overview</a> can give you access.</p>
> <h2><a href="#the-javadoc" name="the-javadoc">The JavaDoc</a></h2>
126c126
< <h2><a href="#the-maven-plugin-documentation" id="the-maven-plugin-documentation">The Maven Plugin Documentation</a></h2> 
---
> <h2><a href="#the-maven-plugin-documentation" name="the-maven-plugin-documentation">The Maven Plugin Documentation</a></h2>
diff -b -B -r ./downloads.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/downloads.html
91c91
< <h1><a href="#how-to-validate-the-downloaded-files" id="how-to-validate-the-downloaded-files">How to validate the downloaded files</a></h1> 
---
> <h1><a href="#how-to-validate-the-downloaded-files" name="how-to-validate-the-downloaded-files">How to validate the downloaded files</a></h1>
93c93
< <h1><a href="#mirrors" id="mirrors">Mirrors</a></h1> 
---
> <h1><a href="#mirrors" name="mirrors">Mirrors</a></h1>
97,100c97,109
<  <p>Other mirrors: </p> 
<  <select name="Preferred"> [if-any http] [for http]<option value="[http]">[http]</option>[end] [end] [if-any ftp] [for ftp]<option value="[ftp]">[ftp]</option>[end] [end] [if-any backup] [for backup]<option value="[backup]">[backup] (backup)</option>[end] [end] </select> 
<  <input type="submit" value="Change"> 
< </form><h2>Sling Application</h2><table class="table"><thead>
---
> <p>Other mirrors: </p>
> <select name="Preferred">
> [if-any http]
> [for http]<option value="[http]">[http]</option>[end]
> [end]
> [if-any ftp]
> [for ftp]<option value="[ftp]">[ftp]</option>[end]
> [end]
> [if-any backup]
> [for backup]<option value="[backup]">[backup] (backup)</option>[end]
> [end]
> </select>
> <input type="submit" value="Change"></input><h2>Sling Application</h2><table class="table"><thead>
diff -b -B -r ./errors/403.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/errors/403.html
95c95
< <p>If you came to this page by following a broken link on our site, you can <a href="https://issues.apache.org/jira/browse/SLING">report the problem here</a>.</p></section></div></div>            
---
> <p>If you came to this page by following a broken link on our site, you can <a href="https://issues.apache.org/jira/browse/SLING">report the problem here</a>. </p></section></div></div>            
diff -b -B -r ./errors/404.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/errors/404.html
96c96
< <p>If you came to this page by following a broken link on our site, you can <a href="https://issues.apache.org/jira/browse/SLING">report the problem here</a>.</p></section></div></div>            
---
> <p>If you came to this page by following a broken link on our site, you can <a href="https://issues.apache.org/jira/browse/SLING">report the problem here</a>. </p></section></div></div>            
diff -b -B -r ./index.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/index.html
90c90
< <div class="row"><div class="small-12 columns"><section class="wrap"><p>Apache Sling™ is a framework for RESTful web-applications based on an extensible content tree.</p> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><p>Apache Sling&trade; is a framework for RESTful web-applications based on an extensible content tree.</p>
95c95
< <h2><a href="#news" id="news">News</a></h2> 
---
> <h2><a href="#news" name="news">News</a></h2>
diff -b -B -r ./links.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/links.html
93c93
< <h2><a href="#articles" id="articles">Articles</a></h2> 
---
> <h2><a href="#articles" name="articles">Articles</a></h2>
99c99
< <h2><a href="#about-sling" id="about-sling">About Sling</a></h2> 
---
> <h2><a href="#about-sling" name="about-sling">About Sling</a></h2>
108c108
< <h2><a href="#projects-using-sling" id="projects-using-sling">Projects using Sling</a></h2> 
---
> <h2><a href="#projects-using-sling" name="projects-using-sling">Projects using Sling</a></h2>
112c112
< <h2><a href="#sling-presentations-and-screencasts" id="sling-presentations-and-screencasts">Sling Presentations and Screencasts</a></h2> 
---
> <h2><a href="#sling-presentations-and-screencasts" name="sling-presentations-and-screencasts">Sling Presentations and Screencasts</a></h2>
121c121
< <h2><a href="#from-apachecon-eu-08" id="from-apachecon-eu-08">From ApacheCon EU 08</a></h2> 
---
> <h2><a href="#from-apachecon-eu-08" name="from-apachecon-eu-08">From ApacheCon EU 08</a></h2>
126c126
< <h2><a href="#from-apachecon-us-07" id="from-apachecon-us-07">From ApacheCon US 07</a></h2> 
---
> <h2><a href="#from-apachecon-us-07" name="from-apachecon-us-07">From ApacheCon US 07</a></h2>
131,132c131,132
< <h2><a href="#technology-used-by-sling" id="technology-used-by-sling">Technology used by Sling</a></h2> 
< <h3><a href="#jsr-170-content-repository-for-javatm-technology-api" id="jsr-170-content-repository-for-javatm-technology-api">JSR 170 - Content Repository for Java{tm} technology API</a></h3> 
---
> <h2><a href="#technology-used-by-sling" name="technology-used-by-sling">Technology used by Sling</a></h2>
> <h3><a href="#jsr-170-content-repository-for-java-tm-technology-api" name="jsr-170-content-repository-for-java-tm-technology-api">JSR 170 - Content Repository for Java{tm} technology API</a></h3>
134c134
< <h3><a href="#apache-jackrabbit" id="apache-jackrabbit">Apache Jackrabbit</a></h3> 
---
> <h3><a href="#apache-jackrabbit" name="apache-jackrabbit">Apache Jackrabbit</a></h3>
136c136
< <h3><a href="#the-osgi-alliance" id="the-osgi-alliance">The OSGi Alliance</a></h3> 
---
> <h3><a href="#the-osgi-alliance" name="the-osgi-alliance">The OSGi Alliance</a></h3>
138c138
< <h3><a href="#apache-felix" id="apache-felix">Apache Felix</a></h3> 
---
> <h3><a href="#apache-felix" name="apache-felix">Apache Felix</a></h3>
diff -b -B -r ./news/sling-10-released.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/news/sling-10-released.html
94c94
< <h2><a href="#java-9-and-10-support" id="java-9-and-10-support">Java 9 and 10 support</a></h2> 
---
> <h2><a href="#java-9-and-10-support" name="java-9-and-10-support">Java 9 and 10 support</a></h2>
96c96
< <h2><a href="#change-of-artifactid-for-the-main-sling-artifact" id="change-of-artifactid-for-the-main-sling-artifact">Change of artifactId for the main Sling artifact</a></h2> 
---
> <h2><a href="#change-of-artifactid-for-the-main-sling-artifact" name="change-of-artifactid-for-the-main-sling-artifact">Change of artifactId for the main Sling artifact</a></h2>
99c99
< <h2><a href="#migrated-from-tika-bundle-to-tika-parsers" id="migrated-from-tika-bundle-to-tika-parsers">Migrated from tika-bundle to tika-parsers</a></h2> 
---
> <h2><a href="#migrated-from-tika-bundle-to-tika-parsers" name="migrated-from-tika-bundle-to-tika-parsers">Migrated from tika-bundle to tika-parsers</a></h2>
102c102
< <h2><a href="#direct-access-to-a-datastore-binary-when-the-repository-allows-it" id="direct-access-to-a-datastore-binary-when-the-repository-allows-it">Direct access to a DataStore binary when the repository allows it</a></h2> 
---
> <h2><a href="#direct-access-to-a-datastore-binary-when-the-repository-allows-it" name="direct-access-to-a-datastore-binary-when-the-repository-allows-it">Direct access to a DataStore binary when the repository allows it</a></h2>
105c105
< <h2><a href="#exception-stack-traces-now-contain-the-originating-bundle" id="exception-stack-traces-now-contain-the-originating-bundle">Exception stack traces now contain the originating bundle</a></h2> 
---
> <h2><a href="#exception-stack-traces-now-contain-the-originating-bundle" name="exception-stack-traces-now-contain-the-originating-bundle">Exception stack traces now contain the originating bundle</a></h2>
108,110c108,110
< <h2><a href="#update-to-oak-168" id="update-to-oak-168">Update to Oak 1.6.8</a></h2> 
< <p>We use the latest stable Oak version from the 1.6 stream, bringing in over 140 fixes and improvements. See the [full list of resolved issues][oak-fixes].</p> 
< <h2><a href="#service-user-web-console-page-added" id="service-user-web-console-page-added">Service user web console page added</a></h2> 
---
> <h2><a href="#update-to-oak-1-6-8" name="update-to-oak-1-6-8">Update to Oak 1.6.8</a></h2>
> <p>We use the latest stable Oak version from the 1.6 stream, bringing in over 140 fixes and improvements. See the <a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20OAK%20AND%20resolution%20is%20not%20empty%20and%20fixVersion%20in%20(1.6.2%2C1.6.3%2C1.6.4%2C1.6.5%2C1.6.6%2C1.6.7%2C1.6.8)%20ORDER%20BY%20priority%20DESC%2C%20updated%20DESC)">full list of resolved issues</a>.</p>
> <h2><a href="#service-user-web-console-page-added" name="service-user-web-console-page-added">Service user web console page added</a></h2>
112c112
< <p><img src="http://sling.apache.org/documentation/development/serviceuser-web-console.png" alt="service users in web console"></p> 
---
> <p><img src="/documentation/development/serviceuser-web-console.png" alt="service users in web console" /></p>
114c114
< <h2><a href="#service-user-privilege-declaration-based-on-principal-names" id="service-user-privilege-declaration-based-on-principal-names">Service user privilege declaration based on principal names</a></h2> 
---
> <h2><a href="#service-user-privilege-declaration-based-on-principal-names" name="service-user-privilege-declaration-based-on-principal-names">Service user privilege declaration based on principal names</a></h2>
119c119
<     "org.apache.sling.resourceresolver:mapping\=[repository-reader-service]"
---
>     &quot;org.apache.sling.resourceresolver:mapping\=[repository-reader-service]&quot;
123c123
< <h2><a href="#enhancements-to-the-repoinit-language" id="enhancements-to-the-repoinit-language">Enhancements to the repoinit language</a></h2> 
---
> <h2><a href="#enhancements-to-the-repoinit-language" name="enhancements-to-the-repoinit-language">Enhancements to the repoinit language</a></h2>
132c132
< <h2><a href="#support-for-mounting-json-files-in-the-bundle-resource-provider" id="support-for-mounting-json-files-in-the-bundle-resource-provider">Support for mounting JSON files in the bundle resource provider</a></h2> 
---
> <h2><a href="#support-for-mounting-json-files-in-the-bundle-resource-provider" name="support-for-mounting-json-files-in-the-bundle-resource-provider">Support for mounting JSON files in the bundle resource provider</a></h2>
135,136c135
< <p>See the <a href="https://sling.apache.org/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle resources documentation</a> for more details.</p> 
< <p>[oak-fixes]: https://issues.apache.org/jira/issues/?jql=project%20%3D%20OAK%20AND%20resolution%20is%20not%20empty%20and%20fixVersion%20in%20(1.6.2%2C1.6.3%2C1.6.4%2C1.6.5%2C1.6.6%2C1.6.7%2C1.6.8)%20ORDER%20BY%20priority%20DESC%2C%20updated%20DESC)</p></section></div></div>            
---
> <p>See the <a href="https://sling.apache.org/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle resources documentation</a> for more details.</p></section></div></div>            
diff -b -B -r ./news/sling-ide-tooling-11-released.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/news/sling-ide-tooling-11-released.html
95c95
< <h1><a href="#sightly-support" id="sightly-support">Sightly support</a></h1> 
---
> <h1><a href="#sightly-support" name="sightly-support">Sightly support</a></h1>
103c103
< <p><img src="http://sling.apache.org/documentation/development/ide-tooling/sightly-editor.png" alt="Sightly Editor"></p> 
---
> <p><img src="/documentation/development/ide-tooling/sightly-editor.png" alt="Sightly Editor" /></p>
105c105
< <h1><a href="#automatic-configuration-of-debug-classpath-based-on-the-bundles-deployed-on-the-server" id="automatic-configuration-of-debug-classpath-based-on-the-bundles-deployed-on-the-server">Automatic configuration of debug classpath based on the bundles deployed on the server</a></h1> 
---
> <h1><a href="#automatic-configuration-of-debug-classpath-based-on-the-bundles-deployed-on-the-server" name="automatic-configuration-of-debug-classpath-based-on-the-bundles-deployed-on-the-server">Automatic configuration of debug classpath based on the bundles deployed on the server</a></h1>
107c107
< <p><img src="http://sling.apache.org/documentation/development/ide-tooling/debug.png" alt="Debugging"></p> 
---
> <p><img src="/documentation/development/ide-tooling/debug.png" alt="Debugging" /></p>
109c109
< <h1><a href="#maven-configurator-for-content-package-projects" id="maven-configurator-for-content-package-projects">Maven configurator for content-package projects</a></h1> 
---
> <h1><a href="#maven-configurator-for-content-package-projects" name="maven-configurator-for-content-package-projects">Maven configurator for content-package projects</a></h1>
111c111
< <h1><a href="#other-minor-improvements" id="other-minor-improvements">Other minor improvements</a></h1> 
---
> <h1><a href="#other-minor-improvements" name="other-minor-improvements">Other minor improvements</a></h1>
diff -b -B -r ./news/sling-ide-tooling-12-released.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/news/sling-ide-tooling-12-released.html
95c95
< <h1><a href="#custom-contribution-for-provisioning-model-feature-files" id="custom-contribution-for-provisioning-model-feature-files">Custom contribution for provisioning model feature files</a></h1> 
---
> <h1><a href="#custom-contribution-for-provisioning-model-feature-files" name="custom-contribution-for-provisioning-model-feature-files">Custom contribution for provisioning model feature files</a></h1>
97,98c97,98
< <p><img src="http://sling.apache.org/documentation/development/ide-tooling/launchpad-models-directory.png" alt="Slingstart Project"></p> 
< <h1><a href="#enhanced-error-reporting-for-content-projects" id="enhanced-error-reporting-for-content-projects">Enhanced error reporting for content projects</a></h1> 
---
> <p><img src="/documentation/development/ide-tooling/launchpad-models-directory.png" alt="Slingstart Project" /></p>
> <h1><a href="#enhanced-error-reporting-for-content-projects" name="enhanced-error-reporting-for-content-projects">Enhanced error reporting for content projects</a></h1>
100c100
< <p><img src="http://sling.apache.org/documentation/development/ide-tooling/content-navigator-warnings.png" alt="Content navigator warnings"></p> 
---
> <p><img src="/documentation/development/ide-tooling/content-navigator-warnings.png" alt="Content navigator warnings" /></p>
102,103c102,103
< <p><img src="http://sling.apache.org/documentation/development/ide-tooling/content-navigator-xml-validation.png" alt="Content navigator XML validation"></p> 
< <h1><a href="#more-fine-grained-control-over-the-maven-project-configurators" id="more-fine-grained-control-over-the-maven-project-configurators">More fine-grained control over the Maven project configurators</a></h1> 
---
> <p><img src="/documentation/development/ide-tooling/content-navigator-xml-validation.png" alt="Content navigator XML validation" /></p>
> <h1><a href="#more-fine-grained-control-over-the-maven-project-configurators" name="more-fine-grained-control-over-the-maven-project-configurators">More fine-grained control over the Maven project configurators</a></h1>
106,107c106,107
< <p><img src="http://sling.apache.org/documentation/development/ide-tooling/maven-configurators-preferences.png" alt="Maven Project Configurator preferences"></p> 
< <h1><a href="#support-for-the-bnd-maven-plugin" id="support-for-the-bnd-maven-plugin">Support for the bnd-maven-plugin</a></h1> 
---
> <p><img src="/documentation/development/ide-tooling/maven-configurators-preferences.png" alt="Maven Project Configurator preferences" /></p>
> <h1><a href="#support-for-the-bnd-maven-plugin" name="support-for-the-bnd-maven-plugin">Support for the bnd-maven-plugin</a></h1>
109c109
< <h1><a href="#support-for-the-new-jackrabbit-filevault-package-maven-plugin" id="support-for-the-new-jackrabbit-filevault-package-maven-plugin">Support for the new Jackrabbit filevault-package-maven-plugin</a></h1> 
---
> <h1><a href="#support-for-the-new-jackrabbit-filevault-package-maven-plugin" name="support-for-the-new-jackrabbit-filevault-package-maven-plugin">Support for the new Jackrabbit filevault-package-maven-plugin</a></h1>
diff -b -B -r ./news/sling-launchpad-8-released.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/news/sling-launchpad-8-released.html
93c93
< <h2><a href="#switched-to-apache-jackrabbit-oak" id="switched-to-apache-jackrabbit-oak">Switched to Apache Jackrabbit Oak</a></h2> 
---
> <h2><a href="#switched-to-apache-jackrabbit-oak" name="switched-to-apache-jackrabbit-oak">Switched to Apache Jackrabbit Oak</a></h2>
95c95
< <h2><a href="#provisioning-model" id="provisioning-model">Provisioning model</a></h2> 
---
> <h2><a href="#provisioning-model" name="provisioning-model">Provisioning model</a></h2>
97c97
< <h2><a href="#sightly" id="sightly">Sightly</a></h2> 
---
> <h2><a href="#sightly" name="sightly">Sightly</a></h2>
106c106
< <h2><a href="#versioning-support-in-the-resource-api" id="versioning-support-in-the-resource-api">Versioning support in the Resource API</a></h2> 
---
> <h2><a href="#versioning-support-in-the-resource-api" name="versioning-support-in-the-resource-api">Versioning support in the Resource API</a></h2>
108c108
< <h2><a href="#improved-testing-tools" id="improved-testing-tools">Improved testing tools</a></h2> 
---
> <h2><a href="#improved-testing-tools" name="improved-testing-tools">Improved testing tools</a></h2>
110c110
< <h2><a href="#servlet-api-30" id="servlet-api-30">Servlet API 3.0</a></h2> 
---
> <h2><a href="#servlet-api-3-0" name="servlet-api-3-0">Servlet API 3.0</a></h2>
112c112
< <h2><a href="#performance" id="performance">Performance</a></h2> 
---
> <h2><a href="#performance" name="performance">Performance</a></h2>
114c114
< <h2><a href="#dependency-updates" id="dependency-updates">Dependency updates</a></h2> 
---
> <h2><a href="#dependency-updates" name="dependency-updates">Dependency updates</a></h2>
diff -b -B -r ./news/sling-launchpad-9-released.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/news/sling-launchpad-9-released.html
93c93
< <h2><a href="#updated-to-oak-161-and-segment-tar-persistence" id="updated-to-oak-161-and-segment-tar-persistence">Updated to Oak 1.6.1 and segment-tar persistence</a></h2> 
---
> <h2><a href="#updated-to-oak-1-6-1-and-segment-tar-persistence" name="updated-to-oak-1-6-1-and-segment-tar-persistence">Updated to Oak 1.6.1 and segment-tar persistence</a></h2>
96c96
< <h2><a href="#the-sling-explorer-is-replaced-with-composum" id="the-sling-explorer-is-replaced-with-composum">The Sling Explorer is replaced with Composum</a></h2> 
---
> <h2><a href="#the-sling-explorer-is-replaced-with-composum" name="the-sling-explorer-is-replaced-with-composum">The Sling Explorer is replaced with Composum</a></h2>
98c98
< <h2><a href="#the-slingshot-sample-is-included" id="the-slingshot-sample-is-included">The Slingshot sample is included</a></h2> 
---
> <h2><a href="#the-slingshot-sample-is-included" name="the-slingshot-sample-is-included">The Slingshot sample is included</a></h2>
100c100
< <h2><a href="#new-resource-provider-and-observation-api" id="new-resource-provider-and-observation-api">New Resource Provider and Observation API</a></h2> 
---
> <h2><a href="#new-resource-provider-and-observation-api" name="new-resource-provider-and-observation-api">New Resource Provider and Observation API</a></h2>
103c103
< <h2><a href="#new-modules-added-validation-context-aware-configuration-repository-initialization-language" id="new-modules-added-validation-context-aware-configuration-repository-initialization-language">New modules added: Validation, Context-Aware Configuration, Repository Initialization Language</a></h2> 
---
> <h2><a href="#new-modules-added-validation-context-aware-configuration-repository-initialization-language" name="new-modules-added-validation-context-aware-configuration-repository-initialization-language">New modules added: Validation, Context-Aware Configuration, Repository Initialization Language</a></h2>
110c110
< <h2><a href="#tooling-htl-maven-plugin" id="tooling-htl-maven-plugin">Tooling: HTL Maven Plugin</a></h2> 
---
> <h2><a href="#tooling-htl-maven-plugin" name="tooling-htl-maven-plugin">Tooling: HTL Maven Plugin</a></h2>
112c112
< <h2><a href="#streaming-upload-support" id="streaming-upload-support">Streaming Upload Support</a></h2> 
---
> <h2><a href="#streaming-upload-support" name="streaming-upload-support">Streaming Upload Support</a></h2>
116c116
< <h2><a href="#discovery-added-oak-based-discovery-implementation" id="discovery-added-oak-based-discovery-implementation">Discovery: added Oak-based discovery implementation</a></h2> 
---
> <h2><a href="#discovery-added-oak-based-discovery-implementation" name="discovery-added-oak-based-discovery-implementation">Discovery: added Oak-based discovery implementation</a></h2>
118c118
< <h2><a href="#security-loginadministrative-deprecation" id="security-loginadministrative-deprecation">Security: loginAdministrative deprecation</a></h2> 
---
> <h2><a href="#security-loginadministrative-deprecation" name="security-loginadministrative-deprecation">Security: loginAdministrative deprecation</a></h2>
121c121
< <h2><a href="#removed-orgapacheslingcommonsjson-and-orgjson-bundles" id="removed-orgapacheslingcommonsjson-and-orgjson-bundles">Removed org.apache.sling.commons.json and org.json bundles</a></h2> 
---
> <h2><a href="#removed-org-apache-sling-commons-json-and-org-json-bundles" name="removed-org-apache-sling-commons-json-and-org-json-bundles">Removed org.apache.sling.commons.json and org.json bundles</a></h2>
diff -b -B -r ./news.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/news.html
112c112
< <h1><a href="#history" id="history">History</a></h1> 
---
> <h1><a href="#history" name="history">History</a></h1>
diff -b -B -r ./old-stuff/assembly.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/assembly.html
97c97
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
101c101
< <h2><a href="#bundles" id="bundles">Bundles</a></h2> 
---
> <h2><a href="#bundles" name="bundles">Bundles</a></h2>
104c104
< <h2><a href="#assemblies" id="assemblies">Assemblies</a></h2> 
---
> <h2><a href="#assemblies" name="assemblies">Assemblies</a></h2>
107c107
< <h3><a href="#assembly-manifest-headers" id="assembly-manifest-headers">Assembly manifest headers</a></h3> 
---
> <h3><a href="#assembly-manifest-headers" name="assembly-manifest-headers">Assembly manifest headers</a></h3>
113c113
< <h3><a href="#assembly-lifecycle" id="assembly-lifecycle">Assembly Lifecycle</a></h3> 
---
> <h3><a href="#assembly-lifecycle" name="assembly-lifecycle">Assembly Lifecycle</a></h3>
124c124
< <h3><a href="#bundles-referenced-by-multiple-assembly-bundles" id="bundles-referenced-by-multiple-assembly-bundles">Bundles referenced by multiple Assembly Bundles</a></h3> 
---
> <h3><a href="#bundles-referenced-by-multiple-assembly-bundles" name="bundles-referenced-by-multiple-assembly-bundles">Bundles referenced by multiple Assembly Bundles</a></h3>
133c133
< <h3><a href="#bundle-installation" id="bundle-installation">Bundle Installation</a></h3> 
---
> <h3><a href="#bundle-installation" name="bundle-installation">Bundle Installation</a></h3>
136,137c136,137
< <pre><code>Assembly-Bundles = Bundle { "," Bundle } .
< Bundle = Symbolic-Name { ";" Parameter } .
---
> <pre><code>Assembly-Bundles = Bundle { &quot;,&quot; Bundle } .
> Bundle = Symbolic-Name { &quot;;&quot; Parameter } .
139c139
< Parameter = ParameterName "=" ParameterValue .
---
> Parameter = ParameterName &quot;=&quot; ParameterValue .
143c143
<  <li><strong>version</strong> - The version of the bundle to install. This is a version range specification as per chapter 3.2.5 Version Ranges of the OSGi core specification. When this parameter is declared as a single version - eg. <em>1.2.3</em> - it is interpreted as the version range <em>[1.2.3,∞)</em>. The default value is <em>[0.0.0,∞)</em> to install the most recent version of the bundle available.</li> 
---
>   <li><strong>version</strong> - The version of the bundle to install. This is a version range specification as per chapter 3.2.5 Version Ranges of the OSGi core specification. When this parameter is declared as a single version - eg. <em>1.2.3</em> - it is interpreted as the version range <em>[1.2.3,&infin;)</em>. The default value is <em>[0.0.0,&infin;)</em> to install the most recent version of the bundle available.</li>
149c149
< <h3><a href="#bundle-location" id="bundle-location">Bundle Location</a></h3> 
---
> <h3><a href="#bundle-location" name="bundle-location">Bundle Location</a></h3>
162,163c162,163
< <h2><a href="#best-practices" id="best-practices">Best Practices</a></h2> 
< <h3><a href="#size-of-bundles" id="size-of-bundles">Size of Bundles</a></h3> 
---
> <h2><a href="#best-practices" name="best-practices">Best Practices</a></h2>
> <h3><a href="#size-of-bundles" name="size-of-bundles">Size of Bundles</a></h3>
171c171
< <h3><a href="#nomen-est-omen" id="nomen-est-omen">Nomen est Omen</a></h3> 
---
> <h3><a href="#nomen-est-omen" name="nomen-est-omen">Nomen est Omen</a></h3>
diff -b -B -r ./old-stuff/request-processing.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/request-processing.html
95c95
<   2008-02-13: this page is *out of sync* with the current codebase, needs to be reviewed and updated. 
---
> 2008-02-13: this page is *out of sync* with the current codebase, needs to be reviewed and updated.
98c98
< <h2><a href="#core-request-processing" id="core-request-processing">Core Request Processing</a></h2> 
---
> <h2><a href="#core-request-processing" name="core-request-processing">Core Request Processing</a></h2>
119c119
< <h2><a href="#resolving-content" id="resolving-content">Resolving Content</a></h2> 
---
> <h2><a href="#resolving-content" name="resolving-content">Resolving Content</a></h2>
129c129
< <h2><a href="#registering-components" id="registering-components">Registering Components</a></h2> 
---
> <h2><a href="#registering-components" name="registering-components">Registering Components</a></h2>
132c132
< <h2><a href="#reqistering-filters" id="reqistering-filters">Reqistering Filters</a></h2> 
---
> <h2><a href="#reqistering-filters" name="reqistering-filters">Reqistering Filters</a></h2>
138,139c138,139
<    <th> Property </th>
<    <th> Description </th>
---
>       <th>Property </th>
>       <th>Description </th>
144,145c144,145
<    <td> <code>filter.scope</code> </td>
<    <td> Defines the chain to which the filter is added. Supported values are <code>component</code> for component level filters and <code>request</code> for request level filters. If this property is missing or set to an unknown value the filter is added to the request level filter chain. </td>
---
>       <td><code>filter.scope</code> </td>
>       <td>Defines the chain to which the filter is added. Supported values are <code>component</code> for component level filters and <code>request</code> for request level filters. If this property is missing or set to an unknown value the filter is added to the request level filter chain. </td>
148,149c148,149
<    <td> <code>filter.order</code> </td>
<    <td> Defines the weight of the filter to resolve the processing order. This property must be an <code>java.lang.Integer</code>. If not set or not an <code>Integer</code> the order defaults to <code>Integer.MAX_VALUE</code>. The lower the order number the earlier in the filter chain will the filter be inserted. If two filters are registered with the same order value, the filter with the lower <code>service.id</code> value is called first. </td>
---
>       <td><code>filter.order</code> </td>
>       <td>Defines the weight of the filter to resolve the processing order. This property must be an <code>java.lang.Integer</code>. If not set or not an <code>Integer</code> the order defaults to <code>Integer.MAX_VALUE</code>. The lower the order number the earlier in the filter chain will the filter be inserted. If two filters are registered with the same order value, the filter with the lower <code>service.id</code> value is called first. </td>
153c153
< <h2><a href="#content-is-a-java-object" id="content-is-a-java-object">Content is a Java Object</a></h2> 
---
> <h2><a href="#content-is-a-java-object" name="content-is-a-java-object">Content is a Java Object</a></h2>
157c157
< <pre><code>RequestDispatcher rd = request.getRequestDispatcher("navigation");
---
> <pre><code>RequestDispatcher rd = request.getRequestDispatcher(&quot;navigation&quot;);
161c161
< <pre><code>Content navigation = request.getContent("navigation");
---
> <pre><code>Content navigation = request.getContent(&quot;navigation&quot;);
170c170
<         return request.getContent().getPath() + "/navigation";
---
>         return request.getContent().getPath() + &quot;/navigation&quot;;
182c182
< <pre><code>Content navigation = request.getContent("navigation");
---
> <pre><code>Content navigation = request.getContent(&quot;navigation&quot;);
186c186
<             return request.getContent().getPath() + "/navigation";
---
>             return request.getContent().getPath() + &quot;/navigation&quot;;
diff -b -B -r ./old-stuff/run-modes-org-apache-sling-runmode.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/run-modes-org-apache-sling-runmode.html
95,97c95,98
<   As of Sling 6 the 
<  <code>org.apache.sling.runmode</code> bundle is replaced by the new 
<  <a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings (org.apache.sling.settings)</a> Bundle. For backwards compatibility this bundle may still exist in your environment. New code should use the API of the new Sling Settings Bundle, though. 
---
> As of Sling 6 the <code>org.apache.sling.runmode</code> bundle is replaced
> by the new <a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings (org.apache.sling.settings)</a>
> Bundle. For backwards compatibility this bundle may still exist in your environment. New code should use the API of the new
> Sling Settings Bundle, though.
99c100
< <h1><a href="#overview" id="overview">Overview</a></h1> 
---
> <h1><a href="#overview" name="overview">Overview</a></h1>
103c104
< <h1><a href="#installation" id="installation">Installation</a></h1> 
---
> <h1><a href="#installation" name="installation">Installation</a></h1>
105c106
< <h1><a href="#configuration" id="configuration">Configuration</a></h1> 
---
> <h1><a href="#configuration" name="configuration">Configuration</a></h1>
107,109c108,110
< <p>Using <em>-Dsling.run.modes=foo,bar</em> on the JVM command-line, for example, activates the <em>foo</em> and <em>bar</em> run modes.</p> 
< <p>This command-line parameter takes precedence over a similar definition (<em>sling.run.modes=dev,staging</em>) that might be present in the <em>sling.properties</em> file found in the Sling home directory.</p> 
< <h1><a href="#getting-the-current-list-of-run-modes" id="getting-the-current-list-of-run-modes">Getting the current list of run modes</a></h1> 
---
> <p>Using <em>-Dsling.run.modes=foo,bar</em> on the JVM command-line, for example, activates the <em>foo</em> and <em>bar</em> run modes. </p>
> <p>This command-line parameter takes precedence over a similar definition (*sling.run.modes=dev,staging*) that might be present in the <em>sling.properties</em> file found in the Sling home directory.</p>
> <h1><a href="#getting-the-current-list-of-run-modes" name="getting-the-current-list-of-run-modes">Getting the current list of run modes</a></h1>
114c115
< String [] expectedRunModes = { "foo", "wii" };
---
> String [] expectedRunModes = { &quot;foo&quot;, &quot;wii&quot; };
120c121
< <h1><a href="#see-also" id="see-also">See also</a></h1> 
---
> <h1><a href="#see-also" name="see-also">See also</a></h1>
diff -b -B -r ./old-stuff/scriptengineintegration/groovy-support.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/scriptengineintegration/groovy-support.html
108c108
< <h2><a href="#testing" id="testing">Testing</a></h2> 
---
> <h2><a href="#testing" name="testing">Testing</a></h2>
110,111c110,111
< <pre><code>response.setContentType("text/plain");
< response.setCharacterEncoding("UTF-8");
---
> <pre><code>response.setContentType(&quot;text/plain&quot;);
> response.setCharacterEncoding(&quot;UTF-8&quot;);
113,115c113,115
< println "Hello World !"
< println "This is Groovy Speaking"
< println "You requested the Resource ${resource} (yes, this is a GString)"
---
> println &quot;Hello World !&quot;
> println &quot;This is Groovy Speaking&quot;
> println &quot;You requested the Resource ${resource} (yes, this is a GString)&quot;
129c129
< <h2><a href="#references" id="references">References</a></h2> 
---
> <h2><a href="#references" name="references">References</a></h2>
diff -b -B -r ./old-stuff/scriptengineintegration/xslt-processing-pipeline.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
97c97
< <h2><a href="#intro" id="intro">Intro</a></h2> 
---
> <h2><a href="#intro" name="intro">Intro</a></h2>
102,103c102,103
< <h2><a href="#how-to-install" id="how-to-install">How to Install</a></h2> 
< <p>Install the <code>org.apache.sling.scripting.xproc</code> bundle in order to work with XProc.</p> 
---
> <h2><a href="#how-to-install" name="how-to-install">How to Install</a></h2>
> <p>Install the <code>org.apache.sling.scripting.xproc</code> bundle in order to work with XProc. </p>
112c112
< <h2><a href="#how-it-works" id="how-it-works">How it works</a></h2> 
---
> <h2><a href="#how-it-works" name="how-it-works">How it works</a></h2>
120c120
< <h2><a href="#samples" id="samples">Samples</a></h2> 
---
> <h2><a href="#samples" name="samples">Samples</a></h2>
123,128c123,133
<  <li> <p>Create some content</p> <pre><code>#!bash
< $ curl -u admin:admin -F sling:resourceType=xproc -F title="some title" \
< -F text="And some text" http://localhost:8080/foo
< </code></pre> </li> 
<  <li> <p>Use WebDAV or curl to create a pipeline script at <code>/apps/xproc/xproc.xpl</code> :</p> <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;?xml version="1.0" encoding="UTF-8"?&gt;
< &lt;p:pipeline xmlns:p="http://www.w3.org/ns/xproc"&gt;
---
>   <li>
>     <p>Create some content</p>
>     <pre><code>#!bash
> $ curl -u admin:admin -F sling:resourceType=xproc -F title=&quot;some title&quot; \
> -F text=&quot;And some text&quot; http://localhost:8080/foo
> </code></pre>
>   </li>
>   <li>
>     <p>Use WebDAV or curl to create a pipeline script at <code>/apps/xproc/xproc.xpl</code> :</p>
>     <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
> &lt;p:pipeline xmlns:p=&quot;http://www.w3.org/ns/xproc&quot;&gt;
131,132c136,137
<     &lt;p:input port="stylesheet"&gt;
<       &lt;p:document href="/apps/xproc/one.xsl"/&gt;
---
>     &lt;p:input port=&quot;stylesheet&quot;&gt;
>       &lt;p:document href=&quot;/apps/xproc/one.xsl&quot;/&gt;
137,138c142,143
<     &lt;p:input port="stylesheet"&gt;
<       &lt;p:document href="/apps/xproc/two.xsl"/&gt;
---
>     &lt;p:input port=&quot;stylesheet&quot;&gt;
>       &lt;p:document href=&quot;/apps/xproc/two.xsl&quot;/&gt;
143,145c148,154
< </code></pre> </li> 
<  <li> <p>Store the XSLT transforms in the repository:</p> <p><strong><code>/apps/xproc/one.xsl</code></strong></p> <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;xsl:stylesheet version="1.0"
<     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"&gt;
---
> </code></pre>
>   </li>
>   <li>
>     <p>Store the XSLT transforms in the repository:</p>
>     <p><strong><code>/apps/xproc/one.xsl</code></strong></p>
>     <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;xsl:stylesheet version=&quot;1.0&quot;
>     xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
147c156
<     &lt;xsl:template match="/"&gt;
---
>     &lt;xsl:template match=&quot;/&quot;&gt;
149c158
<         &lt;xsl:copy-of select="."/&gt;
---
>         &lt;xsl:copy-of select=&quot;.&quot;/&gt;
154,155c163,166
< </code></pre> <p><strong><code>/apps/xproc/two.xsl</code></strong></p> <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;xsl:stylesheet version="1.0"
<     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"&gt;
---
> </code></pre>
>     <p><strong><code>/apps/xproc/two.xsl</code></strong></p>
>     <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;xsl:stylesheet version=&quot;1.0&quot;
>     xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
157c168
<     &lt;xsl:template match="/"&gt;
---
>     &lt;xsl:template match=&quot;/&quot;&gt;
159c170
<         &lt;xsl:copy-of select="."/&gt;
---
>         &lt;xsl:copy-of select=&quot;.&quot;/&gt;
164,165c175,179
< </code></pre> </li> 
<  <li> <p>Request foo.html to execute the pipeline:</p> <pre><code>#!bash
---
> </code></pre>
>   </li>
>   <li>
>     <p>Request foo.html to execute the pipeline:</p>
>     <pre><code>#!bash
168c182
< &lt;?xml version="1.0" encoding="UTF-8"?&gt;
---
> &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
171c185
<     &lt;foo ...sling:resourceType="xproc" text="And some text" title="some title"/&gt;
---
>     &lt;foo ...sling:resourceType=&quot;xproc&quot; text=&quot;And some text&quot; title=&quot;some title&quot;/&gt;
174,175c188,193
< </code></pre> <p>In this case, the node's document view has been the pipeline's source.</p> </li> 
<  <li> <p>Now, store a static XML in the repository at <code>/foo.xml</code>:</p> <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;?xml version="1.0" encoding="UTF-8"?&gt;
---
> </code></pre>
>     <p>In this case, the node's document view has been the pipeline's source.</p>
>   </li>
>   <li>
>     <p>Now, store a static XML in the repository at <code>/foo.xml</code>:</p>
>     <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
181,182c199,203
< </code></pre> </li> 
<  <li> <p>Again, request foo.html to execute the pipeline:</p> <pre><code>#!bash
---
> </code></pre>
>   </li>
>   <li>
>     <p>Again, request foo.html to execute the pipeline:</p>
>     <pre><code>#!bash
185c206
< &lt;?xml version="1.0" encoding="UTF-8"?&gt;
---
> &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
195,196c216,221
< </code></pre> <p>This time the pipeline's source has been a static XML file.</p> </li> 
<  <li> <p>Store a script in the repository at <code>/apps/xproc/xproc.xml.esp</code></p> <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;?xml version="1.0" encoding="UTF-8"?&gt;
---
> </code></pre>
>     <p>This time the pipeline's source has been a static XML file.</p>
>   </li>
>   <li>
>     <p>Store a script in the repository at <code>/apps/xproc/xproc.xml.esp</code></p>
>     <pre><code><!-- TODO syntax marker (#!xml) disabled -->&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
202,204c227,233
< </code></pre> </li> 
<  <li> <p>Delete the previously created static xml file <code>/foo.xml</code>.</p> </li> 
<  <li> <p>Request foo.html to execute the pipeline:</p> <pre><code>#!bash
---
> </code></pre>
>   </li>
>   <li>
>   <p>Delete the previously created static xml file <code>/foo.xml</code>.</p></li>
>   <li>
>     <p>Request foo.html to execute the pipeline:</p>
>     <pre><code>#!bash
207c236
< &lt;?xml version="1.0" encoding="UTF-8"?&gt;
---
> &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
217c246,248
< </code></pre> <p>This time the pipeline's source has been a dinamically generated XML.</p> </li> 
---
> </code></pre>
>     <p>This time the pipeline's source has been a dinamically generated XML.</p>
>   </li>
219c250
< <h2><a href="#references" id="references">References</a></h2> 
---
> <h2><a href="#references" name="references">References</a></h2>
diff -b -B -r ./old-stuff/scriptengineintegration.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/scriptengineintegration.html
102c102,103
<   </ul> </li> 
---
>     </ul>
>   </li>
diff -b -B -r ./old-stuff/servlet-resolution.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/servlet-resolution.html
95,96c95,97
<   Please note that the description on this page is out of sync with the most recent developments going on as part of implementing issue [SLING-387]({{ refs.https://issues.apache.org/jira/browse/SLING-387.path }}). See the links to integration tests at the end of this page for the Current Truth. 
<  <p>Please see the new [Servlets]({{ refs.servlets.path }}) page.</p> 
---
> Please note that the description on this page is out of sync with the most recent developments going on as part of implementing issue [SLING-387]({{ refs.https://issues.apache.org/jira/browse/SLING-387.path }}). See the links to integration tests at the end of this page for the Current Truth.
> 
> Please see the new [Servlets]({{ refs.servlets.path }}) page.
100c101
< <h2><a href="#servlets-are-resources" id="servlets-are-resources">Servlets are Resources</a></h2> 
---
> <h2><a href="#servlets-are-resources" name="servlets-are-resources">Servlets are Resources</a></h2>
107,108c108,109
<    <th> Name </th>
<    <th> Description </th>
---
>       <th>Name </th>
>       <th>Description </th>
113,114c114,115
<    <td> <code>sling.servlet.paths</code> </td>
<    <td> A list of absolute paths under which the servlet is accessible as a Resource. The property value must either be a single String, an array of Strings or a Vector of Strings. </td>
---
>       <td><code>sling.servlet.paths</code> </td>
>       <td>A list of absolute paths under which the servlet is accessible as a Resource. The property value must either be a single String, an array of Strings or a Vector of Strings. </td>
117,118c118,119
<    <td> <code>sling.servlet.resourceTypes</code> </td>
<    <td> The resource type(s) supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
---
>       <td><code>sling.servlet.resourceTypes</code> </td>
>       <td>The resource type(s) supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
121,122c122,123
<    <td> <code>sling.servlet.selectors</code> </td>
<    <td> The request URL selectors supported by the servlet. The selectors must be configured as they would be specified in the URL that is as a list of dot-separated strings such as <em>print.a4</em>. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
---
>       <td><code>sling.servlet.selectors</code> </td>
>       <td>The request URL selectors supported by the servlet. The selectors must be configured as they would be specified in the URL that is as a list of dot-separated strings such as <em>print.a4</em>. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
125,126c126,127
<    <td> <code>sling.servlet.extensions</code> </td>
<    <td> The request URL extensions supported by the servlet for GET requests. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
---
>       <td><code>sling.servlet.extensions</code> </td>
>       <td>The request URL extensions supported by the servlet for GET requests. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
129,130c130,131
<    <td> <code>sling.servlet.methods</code> </td>
<    <td> The request methods supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
---
>       <td><code>sling.servlet.methods</code> </td>
>       <td>The request methods supported by the servlet. The property value must either be a single String, an array of Strings or a Vector of Strings. This property is ignored if the <code>sling.servlet.paths</code> property is set. </td>
133,134c134,135
<    <td> <code>sling.servlet.prefix</code> </td>
<    <td> The absolute prefix to make relative paths absolute. This property is a String and is optional. If it is not set, the actual prefix used is derived from the search path of the <code>ResourceResolver</code> at the time of registration. </td>
---
>       <td><code>sling.servlet.prefix</code> </td>
>       <td>The absolute prefix to make relative paths absolute. This property is a String and is optional. If it is not set, the actual prefix used is derived from the search path of the <code>ResourceResolver</code> at the time of registration. </td>
145,149c146,150
< <h3><a href="#example-registration-by-path" id="example-registration-by-path">Example: Registration by Path</a></h3> 
< <pre><code>sling.servlet.paths = [ "/libs/sling/sample/html", "/libs/sling/sample/txt" ]
< sling.servlet.resourceTypes = [ "sling/unused" ]
< sling.servlet.selectors = [ "img" ]
< sling.servlet.extensions = [ "html", "txt", "json" ]
---
> <h3><a href="#example-registration-by-path" name="example-registration-by-path">Example: Registration by Path</a></h3>
> <pre><code>sling.servlet.paths = [ &quot;/libs/sling/sample/html&quot;, &quot;/libs/sling/sample/txt&quot; ]
> sling.servlet.resourceTypes = [ &quot;sling/unused&quot; ]
> sling.servlet.selectors = [ &quot;img&quot; ]
> sling.servlet.extensions = [ &quot;html&quot;, &quot;txt&quot;, &quot;json&quot; ]
157,160c158,161
< <h3><a href="#example-registration-by-resource-type-etc" id="example-registration-by-resource-type-etc">Example: Registration by Resource Type etc.</a></h3> 
< <pre><code>sling.servlet.resourceTypes = [ "sling/unused" ]
< sling.servlet.selectors = [ "img", "tab" ]
< sling.servlet.extensions = [ "html", "txt", "json" ]
---
> <h3><a href="#example-registration-by-resource-type-etc-" name="example-registration-by-resource-type-etc-">Example: Registration by Resource Type etc.</a></h3>
> <pre><code>sling.servlet.resourceTypes = [ &quot;sling/unused&quot; ]
> sling.servlet.selectors = [ &quot;img&quot;, &quot;tab&quot; ]
> sling.servlet.extensions = [ &quot;html&quot;, &quot;txt&quot;, &quot;json&quot; ]
172c173
< <h2><a href="#scripts-are-servlets" id="scripts-are-servlets">Scripts are Servlets</a></h2> 
---
> <h2><a href="#scripts-are-servlets" name="scripts-are-servlets">Scripts are Servlets</a></h2>
177c178
< <h2><a href="#resolution-process" id="resolution-process">Resolution Process</a></h2> 
---
> <h2><a href="#resolution-process" name="resolution-process">Resolution Process</a></h2>
190c191
<     resourceType = resourceType.replaceAll("\\:", "/");
---
>     resourceType = resourceType.replaceAll(&quot;\\:&quot;, &quot;/&quot;);
193c194
<     if (("GET".equals(request.getMethod()) || "HEAD".equals(request.getMethod())
---
>     if ((&quot;GET&quot;.equals(request.getMethod()) || &quot;HEAD&quot;.equals(request.getMethod())
202c203
<         selectors = selectors.replace('.', '/');
---
>         selectors = selectors.replace(&#39;.&#39;, &#39;/&#39;);
204c205
<             String path = resourceType + "/" + selectors + "/" + baseName;
---
>             String path = resourceType + &quot;/&quot; + selectors + &quot;/&quot; + baseName;
210c211
<             int lastSlash = selectors.lastIndexOf('/');
---
>             int lastSlash = selectors.lastIndexOf(&#39;/&#39;);
219c220
<     String path = resourceType + "/" + baseName;
---
>     String path = resourceType + &quot;/&quot; + baseName;
229c230
< <h2><a href="#default-servlets" id="default-servlets">Default Servlet(s)</a></h2> 
---
> <h2><a href="#default-servlet-s-" name="default-servlet-s-">Default Servlet(s)</a></h2>
238c239
< <h2><a href="#error-handler-servlets" id="error-handler-servlets">Error Handler Servlet(s)</a></h2> 
---
> <h2><a href="#error-handler-servlet-s-" name="error-handler-servlet-s-">Error Handler Servlet(s)</a></h2>
241c242
<  <li><em>HTTP Status Code Handling</em>: To handle HTTP status code as used by the <code>HttpServletResponse.sendError</code> methods, status code is used as the Servlet name. For example to provide a handler for status code 404 (NOT<em>FOUND), you could create a script <code>prefix/sling/servlet/errorhandler/404.esp</code> or for a status code 500 (INTERNAL</em>SERVER_ERRROR), you might want to register a Servlet at <code>prefix/sling/servlet/errorhandler/500</code>.</li> 
---
>   <li><em>HTTP Status Code Handling</em>: To handle HTTP status code as used by the <code>HttpServletResponse.sendError</code> methods, status code is used as the Servlet name. For example to provide a handler for status code 404 (NOT*FOUND), you could create a script <code>prefix/sling/servlet/errorhandler/404.esp</code> or for a status code 500 (INTERNAL*SERVER_ERRROR), you might want to register a Servlet at <code>prefix/sling/servlet/errorhandler/500</code>.</li>
244,245c245,246
< <h2><a href="#integration-tests" id="integration-tests">Integration tests</a></h2> 
< <p>A set of simple example servlets is available in the [launchpad/test-services module]({{ refs.http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/test-services.path }}).</p> 
---
> <h2><a href="#integration-tests" name="integration-tests">Integration tests</a></h2>
> <p>A set of simple example servlets is available in the [launchpad/test-services module]({{ refs.http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/test-services.path }}). </p>
diff -b -B -r ./old-stuff/sling-api.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff/sling-api.html
95c95
<   The contents of this page is being created at the moment. It contains incomplete and partially wrong information as the text is adapted from the contents of the [Component API]({{ refs.component-api.path }}) documentation page. 
---
> The contents of this page is being created at the moment. It contains incomplete and partially wrong information as the text is adapted from the contents of the [Component API]({{ refs.component-api.path }}) documentation page.
97c97
< <h2><a href="#introduction" id="introduction">Introduction</a></h2> 
---
> <h2><a href="#introduction" name="introduction">Introduction</a></h2>
105c105
< <h2><a href="#going-resource-centric" id="going-resource-centric">Going Resource Centric</a></h2> 
---
> <h2><a href="#going-resource-centric" name="going-resource-centric">Going Resource Centric</a></h2>
108c108
< <h3><a href="#comparsion-to-the-servlet-api" id="comparsion-to-the-servlet-api">Comparsion to the Servlet API</a></h3> 
---
> <h3><a href="#comparsion-to-the-servlet-api" name="comparsion-to-the-servlet-api">Comparsion to the Servlet API</a></h3>
111c111
< <h3><a href="#comparision-to-the-portlet-api" id="comparision-to-the-portlet-api">Comparision to the Portlet API</a></h3> 
---
> <h3><a href="#comparision-to-the-portlet-api" name="comparision-to-the-portlet-api">Comparision to the Portlet API</a></h3>
113c113
< <h3><a href="#to-iterator-or-to-enumeration" id="to-iterator-or-to-enumeration">To Iterator or To Enumeration</a></h3> 
---
> <h3><a href="#to-iterator-or-to-enumeration" name="to-iterator-or-to-enumeration">To Iterator or To Enumeration</a></h3>
115c115
< <h2><a href="#request-processing" id="request-processing">Request Processing</a></h2> 
---
> <h2><a href="#request-processing" name="request-processing">Request Processing</a></h2>
122c122
< <h3><a href="#url-decomposition" id="url-decomposition">URL decomposition</a></h3> 
---
> <h3><a href="#url-decomposition" name="url-decomposition">URL decomposition</a></h3>
134,138c134,138
<    <th> URI </th>
<    <th> Resource Path </th>
<    <th> Selectors </th>
<    <th> Extension </th>
<    <th> Suffix </th>
---
>       <th>URI </th>
>       <th>Resource Path </th>
>       <th>Selectors </th>
>       <th>Extension </th>
>       <th>Suffix </th>
143,147c143,147
<    <td> /a/b </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> null </td>
<    <td> null </td>
---
>       <td>/a/b </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>null </td>
>       <td>null </td>
150,154c150,154
<    <td> /a/b.html </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> html </td>
<    <td> null </td>
---
>       <td>/a/b.html </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>html </td>
>       <td>null </td>
157,161c157,161
<    <td> /a/b.s1.html </td>
<    <td> /a/b </td>
<    <td> s1 </td>
<    <td> html </td>
<    <td> null </td>
---
>       <td>/a/b.s1.html </td>
>       <td>/a/b </td>
>       <td>s1 </td>
>       <td>html </td>
>       <td>null </td>
164,168c164,168
<    <td> /a/b.s1.s2.html </td>
<    <td> /a/b </td>
<    <td> s1.s2 </td>
<    <td> html </td>
<    <td> null </td>
---
>       <td>/a/b.s1.s2.html </td>
>       <td>/a/b </td>
>       <td>s1.s2 </td>
>       <td>html </td>
>       <td>null </td>
171,175c171,175
<    <td> /a/b/c/d </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> null </td>
<    <td> /c/d </td>
---
>       <td>/a/b/c/d </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>null </td>
>       <td>/c/d </td>
178,182c178,182
<    <td> /a/b.html/c/d </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> html </td>
<    <td> /c/d </td>
---
>       <td>/a/b.html/c/d </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>html </td>
>       <td>/c/d </td>
185,189c185,189
<    <td> /a/b.s1.html/c/d </td>
<    <td> /a/b </td>
<    <td> s1 </td>
<    <td> html </td>
<    <td> /c/d </td>
---
>       <td>/a/b.s1.html/c/d </td>
>       <td>/a/b </td>
>       <td>s1 </td>
>       <td>html </td>
>       <td>/c/d </td>
192,196c192,196
<    <td> /a/b.s1.s2.html/c/d </td>
<    <td> /a/b </td>
<    <td> s1.s2 </td>
<    <td> html </td>
<    <td> /c/d </td>
---
>       <td>/a/b.s1.s2.html/c/d </td>
>       <td>/a/b </td>
>       <td>s1.s2 </td>
>       <td>html </td>
>       <td>/c/d </td>
199,203c199,203
<    <td> /a/b/c/d.s.txt </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> null </td>
<    <td> /c/d.s.txt </td>
---
>       <td>/a/b/c/d.s.txt </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>null </td>
>       <td>/c/d.s.txt </td>
206,210c206,210
<    <td> /a/b.html/c/d.s.txt </td>
<    <td> /a/b </td>
<    <td> null </td>
<    <td> html </td>
<    <td> /c/d.s.txt </td>
---
>       <td>/a/b.html/c/d.s.txt </td>
>       <td>/a/b </td>
>       <td>null </td>
>       <td>html </td>
>       <td>/c/d.s.txt </td>
213,217c213,217
<    <td> /a/b.s1.html/c/d.s.txt </td>
<    <td> /a/b </td>
<    <td> s1 </td>
<    <td> html </td>
<    <td> /c/d.s.txt </td>
---
>       <td>/a/b.s1.html/c/d.s.txt </td>
>       <td>/a/b </td>
>       <td>s1 </td>
>       <td>html </td>
>       <td>/c/d.s.txt </td>
220,224c220,224
<    <td> /a/b.s1.s2.html/c/d.s.txt </td>
<    <td> /a/b </td>
<    <td> s1.s2 </td>
<    <td> html </td>
<    <td> /c/d.s.txt </td>
---
>       <td>/a/b.s1.s2.html/c/d.s.txt </td>
>       <td>/a/b </td>
>       <td>s1.s2 </td>
>       <td>html </td>
>       <td>/c/d.s.txt </td>
229c229
<   The [SlingRequestPathInfoTest]({{ refs.http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java.path }}) demonstrates and tests this decomposition. Feel free to suggest additional tests that help clarify how this works! 
---
> The [SlingRequestPathInfoTest]({{ refs.http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java.path }}) demonstrates and tests this decomposition. Feel free to suggest additional tests that help clarify how this works!
231c231
< <h2><a href="#the-slinghttpservletrequest" id="the-slinghttpservletrequest">The SlingHttpServletRequest</a></h2> 
---
> <h2><a href="#the-slinghttpservletrequest" name="the-slinghttpservletrequest">The SlingHttpServletRequest</a></h2>
243c243
< <h2><a href="#the-slinghttpservletresponse" id="the-slinghttpservletresponse">The SlingHttpServletResponse</a></h2> 
---
> <h2><a href="#the-slinghttpservletresponse" name="the-slinghttpservletresponse">The SlingHttpServletResponse</a></h2>
245c245
< <h2><a href="#the-resource" id="the-resource">The Resource</a></h2> 
---
> <h2><a href="#the-resource" name="the-resource">The Resource</a></h2>
251,254c251
<  <li><em>adaptTo(Class
<    <adaptertype>
<      type)
<    </adaptertype></em> - Returns alternative representations of the Resource. The concrete supported classes to which the Resource may be adapted depends on the implementation. For example a Resource based on a JCR Node may support being adapted to the underlying Node, an <code>InputStream</code>, an <code>URL</code> or even to a mapped object through JCR Object Content Mapping.</li> 
---
>   <li><em>adaptTo(Class<AdapterType> type)</em> - Returns alternative representations of the Resource. The concrete supported classes to which the Resource may be adapted depends on the implementation. For example a Resource based on a JCR Node may support being adapted to the underlying Node, an <code>InputStream</code>, an <code>URL</code> or even to a mapped object through JCR Object Content Mapping.</li>
256,257c253,254
< <hr> 
< <h2><a href="#the-component" id="the-component">The Component</a></h2> 
---
> <hr/>
> <h2><a href="#the-component" name="the-component">The Component</a></h2>
259c256
< <h3><a href="#processing-the-request" id="processing-the-request">Processing the Request</a></h3> 
---
> <h3><a href="#processing-the-request" name="processing-the-request">Processing the Request</a></h3>
261c258
< <h3><a href="#content-and-its-component" id="content-and-its-component">Content and its Component</a></h3> 
---
> <h3><a href="#content-and-its-component" name="content-and-its-component">Content and its Component</a></h3>
264c261
< <h3><a href="#component-lifecylce" id="component-lifecylce">Component Lifecylce</a></h3> 
---
> <h3><a href="#component-lifecylce" name="component-lifecylce">Component Lifecylce</a></h3>
269c266
< <h3><a href="#the-componentextension" id="the-componentextension">The ComponentExtension</a></h3> 
---
> <h3><a href="#the-componentextension" name="the-componentextension">The ComponentExtension</a></h3>
274c271
< <h2><a href="#request-processing-filters" id="request-processing-filters">Request Processing Filters</a></h2> 
---
> <h2><a href="#request-processing-filters" name="request-processing-filters">Request Processing Filters</a></h2>
278c275
< <h2><a href="#sessions" id="sessions">Sessions</a></h2> 
---
> <h2><a href="#sessions" name="sessions">Sessions</a></h2>
284c281
< <h2><a href="#dispatching-requests" id="dispatching-requests">Dispatching Requests</a></h2> 
---
> <h2><a href="#dispatching-requests" name="dispatching-requests">Dispatching Requests</a></h2>
292,294c289,291
<    <th> <em>Request Attributes</em> </th>
<    <th> <em>Type</em> </th>
<    <th> <em>Description</em> </th>
---
>       <th><em>Request Attributes</em> </th>
>       <th><em>Type</em> </th>
>       <th><em>Description</em> </th>
299,301c296,298
<    <td> <code>org.apache.sling.component.request.content</code> </td>
<    <td> String </td>
<    <td> The <code>Content</code> instance to which the client URL resolved. This attribute is set when included Components are being rendered and it is not set for the Component directly addressed by the client request. </td>
---
>       <td><code>org.apache.sling.component.request.content</code> </td>
>       <td>String </td>
>       <td>The <code>Content</code> instance to which the client URL resolved. This attribute is set when included Components are being rendered and it is not set for the Component directly addressed by the client request. </td>
304,306c301,303
<    <td> <code>org.apache.sling.component.request.component</code> </td>
<    <td> String </td>
<    <td> The <code>Component</code> instance for the <code>Content</code> object to which the client URL resolved. This attribute is set when included Components are being rendered and it is not set for the Component directly addressed by the client request. </td>
---
>       <td><code>org.apache.sling.component.request.component</code> </td>
>       <td>String </td>
>       <td>The <code>Component</code> instance for the <code>Content</code> object to which the client URL resolved. This attribute is set when included Components are being rendered and it is not set for the Component directly addressed by the client request. </td>
310c307
< <h3><a href="#error-handling" id="error-handling">Error Handling</a></h3> 
---
> <h3><a href="#error-handling" name="error-handling">Error Handling</a></h3>
329,331c326,328
<    <th> <em>Request Attributes</em> </th>
<    <th> <em>Type</em> </th>
<    <th> <em>Description</em> </th>
---
>       <th><em>Request Attributes</em> </th>
>       <th><em>Type</em> </th>
>       <th><em>Description</em> </th>
336,338c333,335
<    <td> <code>javax.servlet.error.status_code</code> </td>
<    <td> <code>java.lang.Integer</code> </td>
<    <td> The status code of the response. In the case of an exception thrown from the <code>service</code>, the code is defined by the Component Framework. </td>
---
>       <td><code>javax.servlet.error.status_code</code> </td>
>       <td><code>java.lang.Integer</code> </td>
>       <td>The status code of the response. In the case of an exception thrown from the <code>service</code>, the code is defined by the Component Framework. </td>
341,343c338,340
<    <td> <code>javax.servlet.error.exception_type</code> </td>
<    <td> <code>java.lang.Class</code> </td>
<    <td> The fully qualified name of the exception class thrown. This attribute does not exist, if error handling does not result from an exception. This attribute is maintained for backwards compatibility according to the Servlet API Specification. </td>
---
>       <td><code>javax.servlet.error.exception_type</code> </td>
>       <td><code>java.lang.Class</code> </td>
>       <td>The fully qualified name of the exception class thrown. This attribute does not exist, if error handling does not result from an exception. This attribute is maintained for backwards compatibility according to the Servlet API Specification. </td>
346,348c343,345
<    <td> <code>javax.servlet.error.message</code> </td>
<    <td> <code>java.lang.String</code> </td>
<    <td> The message of the exception thrown. This attribute does not exist, if error handling does not result from an exception. This attribute is maintained for backwards compatibility according to the Servlet API Specification. </td>
---
>       <td><code>javax.servlet.error.message</code> </td>
>       <td><code>java.lang.String</code> </td>
>       <td>The message of the exception thrown. This attribute does not exist, if error handling does not result from an exception. This attribute is maintained for backwards compatibility according to the Servlet API Specification. </td>
351,353c348,350
<    <td> <code>javax.servlet.error.exception</code> </td>
<    <td> <code>java.lang.Throwable</code> </td>
<    <td> The exception thrown. This attribute does not exist, if error handling does not result from an exception. </td>
---
>       <td><code>javax.servlet.error.exception</code> </td>
>       <td><code>java.lang.Throwable</code> </td>
>       <td>The exception thrown. This attribute does not exist, if error handling does not result from an exception. </td>
356,358c353,355
<    <td> <code>javax.servlet.error.request_uri</code> </td>
<    <td> <code>java.lang.String</code> </td>
<    <td> The request URL whose processing resulted in the error. </td>
---
>       <td><code>javax.servlet.error.request_uri</code> </td>
>       <td><code>java.lang.String</code> </td>
>       <td>The request URL whose processing resulted in the error. </td>
361,363c358,360
<    <td> <code>javax.servlet.error.servlet_name</code> </td>
<    <td> <code>java.lang.String</code> </td>
<    <td> The name of the servlet which yielded the error. The servlet name will generally not have any significance inside the Component Framework. </td>
---
>       <td><code>javax.servlet.error.servlet_name</code> </td>
>       <td><code>java.lang.String</code> </td>
>       <td>The name of the servlet which yielded the error. The servlet name will generally not have any significance inside the Component Framework. </td>
366,368c363,365
<    <td> <code>org.apache.sling.component.error.componentId</code> </td>
<    <td> <code>java.lang.String</code> </td>
<    <td> The identifier of the Component whose <code>service</code> method has caused the error. This attribute does not exist, if the Component Framework itself caused the error processing. </td>
---
>       <td><code>org.apache.sling.component.error.componentId</code> </td>
>       <td><code>java.lang.String</code> </td>
>       <td>The identifier of the Component whose <code>service</code> method has caused the error. This attribute does not exist, if the Component Framework itself caused the error processing. </td>
372c369,371
< <p>* If the Component Framework decides to not handle the error itself, the exception must be forwarded to the servlet container as a <code>ComponentException</code> wrapping the original exception as its root cause.</p> 
---
> <ul>
>   <li>If the Component Framework decides to not handle the error itself, the exception must be forwarded to the servlet container as a <code>ComponentException</code> wrapping the original exception as its root cause.</li>
> </ul>
diff -b -B -r ./old-stuff.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/old-stuff.html
92,98c92,98
<  <li><a href="/old-stuff/assembly.html">Assembly</a></li> 
<  <li><a href="/old-stuff/launch-sling.html">Launch Sling</a></li> 
<  <li><a href="/old-stuff/request-processing.html">Request Processing</a></li> 
<  <li><a href="/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes (org.apache.sling.runmode)</a></li> 
<  <li><a href="/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a></li> 
<  <li><a href="/old-stuff/servlet-resolution.html">Servlet Resolution</a></li> 
<  <li><a href="/old-stuff/sling-api.html">Sling API</a></li> 
---
> <li><a href="/old-stuff/assembly.html">Assembly</a></li>
> <li><a href="/old-stuff/launch-sling.html">Launch Sling</a></li>
> <li><a href="/old-stuff/request-processing.html">Request Processing</a></li>
> <li><a href="/old-stuff/run-modes-org-apache-sling-runmode.html">Run Modes (org.apache.sling.runmode)</a></li>
> <li><a href="/old-stuff/scriptengineintegration.html">Integrating Scripting Languages</a></li>
> <li><a href="/old-stuff/servlet-resolution.html">Servlet Resolution</a></li>
> <li><a href="/old-stuff/sling-api.html">Sling API</a></li>
diff -b -B -r ./project-information/apache-sling-community-roles-and-processes.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/project-information/apache-sling-community-roles-and-processes.html
95,96c95,96
< <h2><a href="#roles" id="roles">Roles</a></h2> 
< <p>There are different roles with which Sling community members may be associated: User, Contributor, Committer, and PMC (Project Management Committee) Member. These roles are assigned and assumed based on merit.</p> 
---
> <h2><a href="#roles" name="roles">Roles</a></h2>
> <p>There are different roles with which Sling community members may be associated: User, Contributor, Committer, and PMC (Project Management Committee) Member. These roles are assigned and assumed based on merit. </p>
99c99
< <h3><a href="#users" id="users">Users</a></h3> 
---
> <h3><a href="#users" name="users">Users</a></h3>
101c101
< <h3><a href="#contributors" id="contributors">Contributors</a></h3> 
---
> <h3><a href="#contributors" name="contributors">Contributors</a></h3>
103c103
< <h3><a href="#committers" id="committers">Committers</a></h3> 
---
> <h3><a href="#committers" name="committers">Committers</a></h3>
105c105
< <h3><a href="#pmc-members" id="pmc-members">PMC Members</a></h3> 
---
> <h3><a href="#pmc-members" name="pmc-members">PMC Members</a></h3>
107,108c107,108
< <h2><a href="#processes" id="processes">Processes</a></h2> 
< <h3><a href="#becoming-a-user-or-contributor" id="becoming-a-user-or-contributor">Becoming a User or Contributor</a></h3> 
---
> <h2><a href="#processes" name="processes">Processes</a></h2>
> <h3><a href="#becoming-a-user-or-contributor" name="becoming-a-user-or-contributor">Becoming a User or Contributor</a></h3>
110c110
< <h3><a href="#becoming-a-committer" id="becoming-a-committer">Becoming a Committer</a></h3> 
---
> <h3><a href="#becoming-a-committer" name="becoming-a-committer">Becoming a Committer</a></h3>
114c114
< <h3><a href="#becoming-a-pmc-member" id="becoming-a-pmc-member">Becoming a PMC Member</a></h3> 
---
> <h3><a href="#becoming-a-pmc-member" name="becoming-a-pmc-member">Becoming a PMC Member</a></h3>
diff -b -B -r ./project-information/project-team.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/project-information/project-team.html
96c96
< <h2><a href="#committers-and-pmc-members" id="committers-and-pmc-members">Committers and PMC members</a></h2> 
---
> <h2><a href="#committers-and-pmc-members" name="committers-and-pmc-members">Committers and PMC members</a></h2>
100c100
< <h2><a href="#emeritus-committers-and-pmc-members" id="emeritus-committers-and-pmc-members">Emeritus Committers and PMC members</a></h2> 
---
> <h2><a href="#emeritus-committers-and-pmc-members" name="emeritus-committers-and-pmc-members">Emeritus Committers and PMC members</a></h2>
105,108c105,108
<    <th> Id </th>
<    <th> Name </th>
<    <th> Organization </th>
<    <th> Roles </th>
---
>       <th>Id </th>
>       <th>Name </th>
>       <th>Organization </th>
>       <th>Roles </th>
113,114c113,114
<    <td> farra </td>
<    <td> <strong>J Aaron Farr</strong> </td>
---
>       <td>farra </td>
>       <td><strong>J Aaron Farr</strong> </td>
116c116
<    <td> Mentor </td>
---
>       <td>Mentor </td>
119,122c119,122
<    <td> jukka </td>
<    <td> <strong>Jukka Zitting</strong> </td>
<    <td> Adobe </td>
<    <td> Champion, Mentor </td>
---
>       <td>jukka </td>
>       <td><strong>Jukka Zitting</strong> </td>
>       <td>Adobe </td>
>       <td>Champion, Mentor </td>
127c127
< <h2><a href="#emeritus-pmc-members" id="emeritus-pmc-members">Emeritus PMC members</a></h2> 
---
> <h2><a href="#emeritus-pmc-members" name="emeritus-pmc-members">Emeritus PMC members</a></h2>
132,135c132,135
<    <th> Id </th>
<    <th> Name </th>
<    <th> Organization </th>
<    <th> Roles </th>
---
>       <th>Id </th>
>       <th>Name </th>
>       <th>Organization </th>
>       <th>Roles </th>
140,141c140,141
<    <td> vramdal </td>
<    <td> Vidar Ramdal </td>
---
>       <td>vramdal </td>
>       <td>Vidar Ramdal </td>
143c143
<    <td> Java Developer </td>
---
>       <td>Java Developer </td>
147c147
< <h2><a href="#special-thanks" id="special-thanks">Special Thanks</a></h2> 
---
> <h2><a href="#special-thanks" name="special-thanks">Special Thanks</a></h2>
150c150
< <h2><a href="#contributors" id="contributors">Contributors</a></h2> 
---
> <h2><a href="#contributors" name="contributors">Contributors</a></h2>
diff -b -B -r ./project-information/security.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/project-information/security.html
94c94
< <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#reporting-new-security-problems-with-apache-sling" id="reporting-new-security-problems-with-apache-sling">Reporting New Security Problems with Apache Sling</a></h1> 
---
> <div class="row"><div class="small-12 columns"><section class="wrap"><h1><a href="#reporting-new-security-problems-with-apache-sling" name="reporting-new-security-problems-with-apache-sling">Reporting New Security Problems with Apache Sling</a></h1>
110c110
< <h1><a href="#errors-and-omissions" id="errors-and-omissions">Errors and omissions</a></h1> 
---
> <h1><a href="#errors-and-omissions" name="errors-and-omissions">Errors and omissions</a></h1>
diff -b -B -r ./project-information.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/project-information.html
109c109
< <h2><a href="#mailing-lists" id="mailing-lists">Mailing Lists</a></h2> 
---
> <h2><a href="#mailing-lists" name="mailing-lists">Mailing Lists</a></h2>
115,120c115,120
<    <th> Name </th>
<    <th> Subscribe </th>
<    <th> Unsubscribe </th>
<    <th> Post </th>
<    <th> Archive </th>
<    <th> Other Archives </th>
---
>       <th>Name </th>
>       <th>Subscribe </th>
>       <th>Unsubscribe </th>
>       <th>Post </th>
>       <th>Archive </th>
>       <th>Other Archives </th>
125,130c125,130
<    <td> Sling Users List </td>
<    <td> <a href="mailto:users-subscribe@sling.apache.org">Subscribe</a> </td>
<    <td> <a href="mailto:users-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
<    <td> users at sling.apache.org </td>
<    <td> <a href="https://lists.apache.org/list.html?users@sling.apache.org">lists.apache.org</a> </td>
<    <td> <a href="http://www.mail-archive.com/users@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> <a href="http://apache-sling.73963.n3.nabble.com/Sling-Users-f73968.html">Nabble</a> </td>
---
>       <td>Sling Users List </td>
>       <td><a href="mailto:users-subscribe@sling.apache.org">Subscribe</a> </td>
>       <td><a href="mailto:users-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
>       <td>users at sling.apache.org </td>
>       <td><a href="https://lists.apache.org/list.html?users@sling.apache.org">lists.apache.org</a> </td>
>       <td><a href="http://www.mail-archive.com/users@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> <a href="http://apache-sling.73963.n3.nabble.com/Sling-Users-f73968.html">Nabble</a> </td>
133,138c133,138
<    <td> Sling Developers List </td>
<    <td> <a href="mailto:dev-subscribe@sling.apache.org">Subscribe</a> </td>
<    <td> <a href="mailto:dev-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
<    <td> dev at sling.apache.org </td>
<    <td> <a href="https://lists.apache.org/list.html?dev@sling.apache.org">lists.apache.org</a> </td>
<    <td> <a href="http://www.mail-archive.com/dev@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> <a href="http://apache-sling.73963.n3.nabble.com/Sling-Dev-f73966.html">Nabble</a> </td>
---
>       <td>Sling Developers List </td>
>       <td><a href="mailto:dev-subscribe@sling.apache.org">Subscribe</a> </td>
>       <td><a href="mailto:dev-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
>       <td>dev at sling.apache.org </td>
>       <td><a href="https://lists.apache.org/list.html?dev@sling.apache.org">lists.apache.org</a> </td>
>       <td><a href="http://www.mail-archive.com/dev@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> <a href="http://apache-sling.73963.n3.nabble.com/Sling-Dev-f73966.html">Nabble</a> </td>
141,143c141,143
<    <td> Sling Source Control List </td>
<    <td> <a href="mailto:commits-subscribe@sling.apache.org">Subscribe</a> </td>
<    <td> <a href="mailto:commits-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
---
>       <td>Sling Source Control List </td>
>       <td><a href="mailto:commits-subscribe@sling.apache.org">Subscribe</a> </td>
>       <td><a href="mailto:commits-unsubscribe@sling.apache.org">Unsubscribe</a> </td>
145,146c145,146
<    <td> <a href="https://lists.apache.org/list.html?commits@sling.apache.org">lists.apache.org</a> </td>
<    <td> <a href="http://www.mail-archive.com/commits@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> </td>
---
>       <td><a href="https://lists.apache.org/list.html?commits@sling.apache.org">lists.apache.org</a> </td>
>       <td><a href="http://www.mail-archive.com/commits@sling.apache.org/">www.mail-archive.com</a> <a href="http://sling.markmail.org">MarkMail</a> </td>
150c150
< <h2><a href="#issue-tracking" id="issue-tracking">Issue Tracking</a></h2> 
---
> <h2><a href="#issue-tracking" name="issue-tracking">Issue Tracking</a></h2>
153c153
< <h2><a href="#source-repository" id="source-repository">Source Repository</a></h2> 
---
> <h2><a href="#source-repository" name="source-repository">Source Repository</a></h2>
156,157c156,157
< <h3><a href="#web-access" id="web-access">Web Access</a></h3> 
< <p>The source code can be accessed using either the GitHub or GitBox setup.</p> 
---
> <h3><a href="#web-access" name="web-access">Web Access</a></h3>
> <p>The source code can be accessed using either the GitHub or GitBox setup. </p>
159c159
< <h3><a href="#attic" id="attic">Attic</a></h3> 
---
> <h3><a href="#attic" name="attic">Attic</a></h3>
162c162
< <h2><a href="#continuous-integration" id="continuous-integration">Continuous Integration</a></h2> 
---
> <h2><a href="#continuous-integration" name="continuous-integration">Continuous Integration</a></h2>
170c170
< <h2><a href="#documentation-repository" id="documentation-repository">Documentation Repository</a></h2> 
---
> <h2><a href="#documentation-repository" name="documentation-repository">Documentation Repository</a></h2>
172,173c172,173
< <h3><a href="#submitting-a-patch-to-the-sling-site-project" id="submitting-a-patch-to-the-sling-site-project">Submitting a patch to the Sling Site project</a></h3> 
< <h4><a href="#create-a-git-patch" id="create-a-git-patch">Create a Git patch:</a></h4> 
---
> <h3><a href="#submitting-a-patch-to-the-sling-site-project" name="submitting-a-patch-to-the-sling-site-project">Submitting a patch to the Sling Site project</a></h3>
> <h4><a href="#create-a-git-patch-" name="create-a-git-patch-">Create a Git patch:</a></h4>
179c179
< <h4><a href="#submit-your-changes" id="submit-your-changes">Submit your changes:</a></h4> 
---
> <h4><a href="#submit-your-changes-" name="submit-your-changes-">Submit your changes:</a></h4>
187,188c187,188
< <h3><a href="#submitting-a-pull-request-to-the-github-sling-site-mirror" id="submitting-a-pull-request-to-the-github-sling-site-mirror">Submitting a pull request to the GitHub Sling Site mirror</a></h3> 
< <h4><a href="#create-the-pull-request" id="create-the-pull-request">Create the Pull Request:</a></h4> 
---
> <h3><a href="#submitting-a-pull-request-to-the-github-sling-site-mirror" name="submitting-a-pull-request-to-the-github-sling-site-mirror">Submitting a pull request to the GitHub Sling Site mirror</a></h3>
> <h4><a href="#create-the-pull-request-" name="create-the-pull-request-">Create the Pull Request:</a></h4>
diff -b -B -r ./releases.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/releases.html
90c90
< <h2><a href="#july-2018" id="july-2018">July 2018</a></h2> 
---
> <h2><a href="#july-2018" name="july-2018">July 2018</a></h2>
95c95
< <h2><a href="#june-2018" id="june-2018">June 2018</a></h2> 
---
> <h2><a href="#june-2018" name="june-2018">June 2018</a></h2>
103c103
< <h2><a href="#may-2018" id="may-2018">May 2018</a></h2> 
---
> <h2><a href="#may-2018" name="may-2018">May 2018</a></h2>
121c121
< <h2><a href="#april-2018" id="april-2018">April 2018</a></h2> 
---
> <h2><a href="#april-2018" name="april-2018">April 2018</a></h2>
127c127
< <h2><a href="#march-2018" id="march-2018">March 2018</a></h2> 
---
> <h2><a href="#march-2018" name="march-2018">March 2018</a></h2>
138c138
< <h2><a href="#february-2018" id="february-2018">February 2018</a></h2> 
---
> <h2><a href="#february-2018" name="february-2018">February 2018</a></h2>
148c148
< <h2><a href="#january-2018" id="january-2018">January 2018</a></h2> 
---
> <h2><a href="#january-2018" name="january-2018">January 2018</a></h2>
160c160
< <h2><a href="#december-2017" id="december-2017">December 2017</a></h2> 
---
> <h2><a href="#december-2017" name="december-2017">December 2017</a></h2>
172c172
< <h2><a href="#november-2017" id="november-2017">November 2017</a></h2> 
---
> <h2><a href="#november-2017" name="november-2017">November 2017</a></h2>
180c180
< <h2><a href="#october-2017" id="october-2017">October 2017</a></h2> 
---
> <h2><a href="#october-2017" name="october-2017">October 2017</a></h2>
189c189
< <h2><a href="#september-2017" id="september-2017">September 2017</a></h2> 
---
> <h2><a href="#september-2017" name="september-2017">September 2017</a></h2>
217c217
< <h2><a href="#august-2017" id="august-2017">August 2017</a></h2> 
---
> <h2><a href="#august-2017" name="august-2017">August 2017</a></h2>
236c236
< <h2><a href="#july-2017" id="july-2017">July 2017</a></h2> 
---
> <h2><a href="#july-2017" name="july-2017">July 2017</a></h2>
250c250
< <h2><a href="#june-2017" id="june-2017">June 2017</a></h2> 
---
> <h2><a href="#june-2017" name="june-2017">June 2017</a></h2>
289c289
< <h2><a href="#may-2017" id="may-2017">May 2017</a></h2> 
---
> <h2><a href="#may-2017" name="may-2017">May 2017</a></h2>
360c360
< <h2><a href="#april-2017" id="april-2017">April 2017</a></h2> 
---
> <h2><a href="#april-2017" name="april-2017">April 2017</a></h2>
369c369
< <h2><a href="#march-2017" id="march-2017">March 2017</a></h2> 
---
> <h2><a href="#march-2017" name="march-2017">March 2017</a></h2>
413c413
< <h2><a href="#february-2017" id="february-2017">February 2017</a></h2> 
---
> <h2><a href="#february-2017" name="february-2017">February 2017</a></h2>
429c429
< <h2><a href="#january-2017" id="january-2017">January 2017</a></h2> 
---
> <h2><a href="#january-2017" name="january-2017">January 2017</a></h2>
458c458
< <h2><a href="#december" id="december">December</a></h2> 
---
> <h2><a href="#december" name="december">December</a></h2>
507c507
< <h2><a href="#november-2016" id="november-2016">November 2016</a></h2> 
---
> <h2><a href="#november-2016" name="november-2016">November 2016</a></h2>
539c539
< <h2><a href="#october-2016" id="october-2016">October 2016</a></h2> 
---
> <h2><a href="#october-2016" name="october-2016">October 2016</a></h2>
581c581
< <h2><a href="#september-2016" id="september-2016">September 2016</a></h2> 
---
> <h2><a href="#september-2016" name="september-2016">September 2016</a></h2>
609c609
< <h2><a href="#august-2016" id="august-2016">August 2016</a></h2> 
---
> <h2><a href="#august-2016" name="august-2016">August 2016</a></h2>
637c637
< <h2><a href="#july-2016" id="july-2016">July 2016</a></h2> 
---
> <h2><a href="#july-2016" name="july-2016">July 2016</a></h2>
660c660
< <h2><a href="#june-2016" id="june-2016">June 2016</a></h2> 
---
> <h2><a href="#june-2016" name="june-2016">June 2016</a></h2>
676c676
< <h2><a href="#may-2016" id="may-2016">May 2016</a></h2> 
---
> <h2><a href="#may-2016" name="may-2016">May 2016</a></h2>
680c680
< <h2><a href="#april-2016" id="april-2016">April 2016</a></h2> 
---
> <h2><a href="#april-2016" name="april-2016">April 2016</a></h2>
691c691
< <h2><a href="#march-2016" id="march-2016">March 2016</a></h2> 
---
> <h2><a href="#march-2016" name="march-2016">March 2016</a></h2>
709c709
< <h2><a href="#february-2016" id="february-2016">February 2016</a></h2> 
---
> <h2><a href="#february-2016" name="february-2016">February 2016</a></h2>
744c744
< <h2><a href="#january-2016" id="january-2016">January 2016</a></h2> 
---
> <h2><a href="#january-2016" name="january-2016">January 2016</a></h2>
765c765
< <h2><a href="#december-2015" id="december-2015">December 2015</a></h2> 
---
> <h2><a href="#december-2015" name="december-2015">December 2015</a></h2>
777c777
< <h2><a href="#november-2015" id="november-2015">November 2015</a></h2> 
---
> <h2><a href="#november-2015" name="november-2015">November 2015</a></h2>
805c805
< <h2><a href="#october-2015" id="october-2015">October 2015</a></h2> 
---
> <h2><a href="#october-2015" name="october-2015">October 2015</a></h2>
842c842
< <h2><a href="#september-2015" id="september-2015">September 2015</a></h2> 
---
> <h2><a href="#september-2015" name="september-2015">September 2015</a></h2>
865c865
< <h2><a href="#august-2015" id="august-2015">August 2015</a></h2> 
---
> <h2><a href="#august-2015" name="august-2015">August 2015</a></h2>
890c890
< <h2><a href="#july-2015" id="july-2015">July 2015</a></h2> 
---
> <h2><a href="#july-2015" name="july-2015">July 2015</a></h2>
911c911
< <h2><a href="#june-2015" id="june-2015">June 2015</a></h2> 
---
> <h2><a href="#june-2015" name="june-2015">June 2015</a></h2>
930c930
< <h2><a href="#may-2015" id="may-2015">May 2015</a></h2> 
---
> <h2><a href="#may-2015" name="may-2015">May 2015</a></h2>
940c940
< <h2><a href="#april-2015" id="april-2015">April 2015</a></h2> 
---
> <h2><a href="#april-2015" name="april-2015">April 2015</a></h2>
966c966
< <h2><a href="#march-2015" id="march-2015">March 2015</a></h2> 
---
> <h2><a href="#march-2015" name="march-2015">March 2015</a></h2>
993c993
< <h2><a href="#february-2015" id="february-2015">February 2015</a></h2> 
---
> <h2><a href="#february-2015" name="february-2015">February 2015</a></h2>
1011c1011
< <h2><a href="#january-2015" id="january-2015">January 2015</a></h2> 
---
> <h2><a href="#january-2015" name="january-2015">January 2015</a></h2>
1034c1034
< <h2><a href="#december-2014" id="december-2014">December 2014</a></h2> 
---
> <h2><a href="#december-2014" name="december-2014">December 2014</a></h2>
1046c1046
< <h2><a href="#november-2014" id="november-2014">November 2014</a></h2> 
---
> <h2><a href="#november-2014" name="november-2014">November 2014</a></h2>
1058c1058
< <h2><a href="#october-2014" id="october-2014">October 2014</a></h2> 
---
> <h2><a href="#october-2014" name="october-2014">October 2014</a></h2>
1081c1081
< <h2><a href="#september-2014" id="september-2014">September 2014</a></h2> 
---
> <h2><a href="#september-2014" name="september-2014">September 2014</a></h2>
1118c1118
< <h2><a href="#august-2014" id="august-2014">August 2014</a></h2> 
---
> <h2><a href="#august-2014" name="august-2014">August 2014</a></h2>
1142c1142
< <h2><a href="#july-2014" id="july-2014">July 2014</a></h2> 
---
> <h2><a href="#july-2014" name="july-2014">July 2014</a></h2>
1163c1163
< <h2><a href="#june-2014" id="june-2014">June 2014</a></h2> 
---
> <h2><a href="#june-2014" name="june-2014">June 2014</a></h2>
1174c1174
< <h2><a href="#may-2014" id="may-2014">May 2014</a></h2> 
---
> <h2><a href="#may-2014" name="may-2014">May 2014</a></h2>
1182c1182
< <h2><a href="#april-2014" id="april-2014">April 2014</a></h2> 
---
> <h2><a href="#april-2014" name="april-2014">April 2014</a></h2>
1192c1192
< <h2><a href="#march-2014" id="march-2014">March 2014</a></h2> 
---
> <h2><a href="#march-2014" name="march-2014">March 2014</a></h2>
1227c1227
< <h2><a href="#february-2014" id="february-2014">February 2014</a></h2> 
---
> <h2><a href="#february-2014" name="february-2014">February 2014</a></h2>
1237c1237
< <h2><a href="#january-2014" id="january-2014">January 2014</a></h2> 
---
> <h2><a href="#january-2014" name="january-2014">January 2014</a></h2>
1248c1248
< <h2><a href="#december-2013" id="december-2013">December 2013</a></h2> 
---
> <h2><a href="#december-2013" name="december-2013">December 2013</a></h2>
1254c1254
< <h2><a href="#november-2013" id="november-2013">November 2013</a></h2> 
---
> <h2><a href="#november-2013" name="november-2013">November 2013</a></h2>
1258c1258
< <h2><a href="#october-2013" id="october-2013">October 2013</a></h2> 
---
> <h2><a href="#october-2013" name="october-2013">October 2013</a></h2>
1273c1273
< <h2><a href="#september-2013" id="september-2013">September 2013</a></h2> 
---
> <h2><a href="#september-2013" name="september-2013">September 2013</a></h2>
1284c1284
< <h2><a href="#august-2013" id="august-2013">August 2013</a></h2> 
---
> <h2><a href="#august-2013" name="august-2013">August 2013</a></h2>
1294c1294
< <h2><a href="#july-2013" id="july-2013">July 2013</a></h2> 
---
> <h2><a href="#july-2013" name="july-2013">July 2013</a></h2>
1304c1304
< <h2><a href="#may-2013" id="may-2013">May 2013</a></h2> 
---
> <h2><a href="#may-2013" name="may-2013">May 2013</a></h2>
1313c1313
< <h2><a href="#april-2013" id="april-2013">April 2013</a></h2> 
---
> <h2><a href="#april-2013" name="april-2013">April 2013</a></h2>
1327c1327
< <h2><a href="#march-2013" id="march-2013">March 2013</a></h2> 
---
> <h2><a href="#march-2013" name="march-2013">March 2013</a></h2>
1332c1332
< <h2><a href="#february-2013" id="february-2013">February 2013</a></h2> 
---
> <h2><a href="#february-2013" name="february-2013">February 2013</a></h2>
1350c1350
< <h2><a href="#december-2012" id="december-2012">December 2012</a></h2> 
---
> <h2><a href="#december-2012" name="december-2012">December 2012</a></h2>
1359c1359
< <h2><a href="#november-2012" id="november-2012">November 2012</a></h2> 
---
> <h2><a href="#november-2012" name="november-2012">November 2012</a></h2>
1388c1388
< <h2><a href="#october-2012" id="october-2012">October 2012</a></h2> 
---
> <h2><a href="#october-2012" name="october-2012">October 2012</a></h2>
1396c1396
< <h2><a href="#august-2012" id="august-2012">August 2012</a></h2> 
---
> <h2><a href="#august-2012" name="august-2012">August 2012</a></h2>
1403c1403
< <h2><a href="#july-2012" id="july-2012">July 2012</a></h2> 
---
> <h2><a href="#july-2012" name="july-2012">July 2012</a></h2>
1409c1409
< <h2><a href="#june-2012" id="june-2012">June 2012</a></h2> 
---
> <h2><a href="#june-2012" name="june-2012">June 2012</a></h2>
1420c1420
< <h2><a href="#may-2012" id="may-2012">May 2012</a></h2> 
---
> <h2><a href="#may-2012" name="may-2012">May 2012</a></h2>
1437c1437
< <h2><a href="#february-2012" id="february-2012">February 2012</a></h2> 
---
> <h2><a href="#february-2012" name="february-2012">February 2012</a></h2>
1449c1449
< <h2><a href="#january-2012" id="january-2012">January 2012</a></h2> 
---
> <h2><a href="#january-2012" name="january-2012">January 2012</a></h2>
1476c1476
< <h2><a href="#november-2011" id="november-2011">November 2011</a></h2> 
---
> <h2><a href="#november-2011" name="november-2011">November 2011</a></h2>
1480c1480
< <h2><a href="#october-2011" id="october-2011">October 2011</a></h2> 
---
> <h2><a href="#october-2011" name="october-2011">October 2011</a></h2>
1484c1484
< <h2><a href="#september-2011" id="september-2011">September 2011</a></h2> 
---
> <h2><a href="#september-2011" name="september-2011">September 2011</a></h2>
1488c1488
< <h2><a href="#august-2011" id="august-2011">August 2011</a></h2> 
---
> <h2><a href="#august-2011" name="august-2011">August 2011</a></h2>
1503c1503
< <h2><a href="#july-2011" id="july-2011">July 2011</a></h2> 
---
> <h2><a href="#july-2011" name="july-2011">July 2011</a></h2>
1512c1512
< <h2><a href="#june-2011" id="june-2011">June 2011</a></h2> 
---
> <h2><a href="#june-2011" name="june-2011">June 2011</a></h2>
1516c1516
< <h2><a href="#may-2011" id="may-2011">May 2011</a></h2> 
---
> <h2><a href="#may-2011" name="may-2011">May 2011</a></h2>
1523c1523
< <h2><a href="#april-2011" id="april-2011">April 2011</a></h2> 
---
> <h2><a href="#april-2011" name="april-2011">April 2011</a></h2>
1534c1534
< <h2><a href="#march-2011" id="march-2011">March 2011</a></h2> 
---
> <h2><a href="#march-2011" name="march-2011">March 2011</a></h2>
1542c1542
< <h2><a href="#february-2011" id="february-2011">February 2011</a></h2> 
---
> <h2><a href="#february-2011" name="february-2011">February 2011</a></h2>
1559c1559
< <h2><a href="#january-2011" id="january-2011">January 2011</a></h2> 
---
> <h2><a href="#january-2011" name="january-2011">January 2011</a></h2>
1576c1576
< <h2><a href="#december-2010" id="december-2010">December 2010</a></h2> 
---
> <h2><a href="#december-2010" name="december-2010">December 2010</a></h2>
1600c1600
< <h2><a href="#november-2010" id="november-2010">November 2010</a></h2> 
---
> <h2><a href="#november-2010" name="november-2010">November 2010</a></h2>
1609c1609
< <h2><a href="#october-2010" id="october-2010">October 2010</a></h2> 
---
> <h2><a href="#october-2010" name="october-2010">October 2010</a></h2>
1618c1618
< <h2><a href="#september-2010" id="september-2010">September 2010</a></h2> 
---
> <h2><a href="#september-2010" name="september-2010">September 2010</a></h2>
1631c1631
< <h2><a href="#august-2010" id="august-2010">August 2010</a></h2> 
---
> <h2><a href="#august-2010" name="august-2010">August 2010</a></h2>
1639c1639
< <h2><a href="#july-2010" id="july-2010">July 2010</a></h2> 
---
> <h2><a href="#july-2010" name="july-2010">July 2010</a></h2>
1643c1643
< <h2><a href="#april-2010" id="april-2010">April 2010</a></h2> 
---
> <h2><a href="#april-2010" name="april-2010">April 2010</a></h2>
1649c1649
< <h2><a href="#march-2010" id="march-2010">March 2010</a></h2> 
---
> <h2><a href="#march-2010" name="march-2010">March 2010</a></h2>
1656c1656
< <h2><a href="#february-2010" id="february-2010">February 2010</a></h2> 
---
> <h2><a href="#february-2010" name="february-2010">February 2010</a></h2>
1671c1671
< <h2><a href="#january-2010" id="january-2010">January 2010</a></h2> 
---
> <h2><a href="#january-2010" name="january-2010">January 2010</a></h2>
1675c1675
< <h2><a href="#december-2009" id="december-2009">December 2009</a></h2> 
---
> <h2><a href="#december-2009" name="december-2009">December 2009</a></h2>
1689c1689
< <h2><a href="#november-2009" id="november-2009">November 2009</a></h2> 
---
> <h2><a href="#november-2009" name="november-2009">November 2009</a></h2>
1700c1700
< <h2><a href="#october-2009" id="october-2009">October 2009</a></h2> 
---
> <h2><a href="#october-2009" name="october-2009">October 2009</a></h2>
1716c1716
< <h2><a href="#august-2009" id="august-2009">August 2009</a></h2> 
---
> <h2><a href="#august-2009" name="august-2009">August 2009</a></h2>
diff -b -B -r ./sitemap.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/sitemap.html
141d140
<                         <li><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></li>
142a142
>                         <li><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></li>
diff -b -B -r ./sitemap.xml /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/sitemap.xml
139d138
<                         <li><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></li>
140a140
>                         <li><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></li>
diff -b -B -r ./tags/development.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/tags/development.html
80c80
< <div class="taglinks"><h2>Tagged with 'development'</h2><div class="taglink"><a href="/documentation/development/testing-paxexam.html">Apache Sling Testing PaxExam</a></div><div class="taglink"><a href="/old-stuff/assembly.html">Assembly</a></div><div class="taglink"><a href="/documentation/development/dependency-management.html">Dependency Management</a></div><div class="taglink"><a href="/documentation/development.html">Development</a></div><div class="taglink"><a href="/documentation/development/getting-and-building-sling.html">Getting and Building Sling</a></div><div class="taglink"><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/hamcrest.html">Hamcrest Integration</a></div><div class="taglink"><a href="/documentation/development/ide-tooling/ide-tooling-incremental-build.html">Incremental Builds in Sling IDE tooling for Eclipse</a></div><div class="taglink"><a href="/documentation/development/issue-tracker.html">Issue Tracker</a></div><div class="taglink"><a href="/documentation/development/jcr-mock.html">JCR Mocks</a></div><div class="taglink"><a href="/documentation/development/jsr-305.html">Leveraging JSR-305 null annotations to prevent NullPointerExceptions</a></div><div class="taglink"><a href="/documentation/development/maven-archetypes.html">Maven Archetypes</a></div><div class="taglink"><a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></div><div class="taglink"><a href="/documentation/development/sling.html">Maven Sling Plugin</a></div><div class="taglink"><a href="/documentation/development/maven-usage.html">Maven Usage</a></div><div class="taglink"><a href="/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></div><div class="taglink"><a href="/documentation/development/osgi-mock.html">OSGi Mocks</a></div><div class="taglink"><a href="/documentation/development/release-management.html">Release Management</a></div><div class="taglink"><a href="/documentation/development/repository-based-development.html">Repository Based Development</a></div><div class="taglink"><a href="/repolist.html">Sling Git Repositories</a></div><div class="taglink"><a href="/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a></div><div class="taglink"><a href="/documentation/development/sling-mock.html">Sling Mocks</a></div><div class="taglink"><a href="/documentation/pax-exam-utils.html">Sling Pax Exam Utilities</a></div><div class="taglink"><a href="/documentation/development/sling-testing-tools.html">Sling Testing Tools</a></div><div class="taglink"><a href="/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></div><div class="taglink"><a href="/documentation/development/version-policy.html">Version Policy</a></div><div class="tags"><h2>All tags</h2><span class="allTagsLink"><a href="/tags/adaptTo.html" class="label">adaptTo<span class="badge">1</span></a></span>
---
> <div class="taglinks"><h2>Tagged with 'development'</h2><div class="taglink"><a href="/documentation/development/testing-paxexam.html">Apache Sling Testing PaxExam</a></div><div class="taglink"><a href="/old-stuff/assembly.html">Assembly</a></div><div class="taglink"><a href="/documentation/development/dependency-management.html">Dependency Management</a></div><div class="taglink"><a href="/documentation/development.html">Development</a></div><div class="taglink"><a href="/documentation/development/getting-and-building-sling.html">Getting and Building Sling</a></div><div class="taglink"><a href="/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/hamcrest.html">Hamcrest Integration</a></div><div class="taglink"><a href="/documentation/development/ide-tooling/ide-tooling-incremental-build.html">Incremental Builds in Sling IDE tooling for Eclipse</a></div><div class="taglink"><a href="/documentation/development/issue-tracker.html">Issue Tracker</a></div><div class="taglink"><a href="/documentation/development/jcr-mock.html">JCR Mocks</a></div><div class="taglink"><a href="/documentation/development/jsr-305.html">Leveraging JSR-305 null annotations to prevent NullPointerExceptions</a></div><div class="taglink"><a href="/documentation/development/maven-archetypes.html">Maven Archetypes</a></div><div class="taglink"><a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></div><div class="taglink"><a href="/documentation/development/sling.html">Maven Sling Plugin</a></div><div class="taglink"><a href="/documentation/development/maven-usage.html">Maven Usage</a></div><div class="taglink"><a href="/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></div><div class="taglink"><a href="/documentation/development/osgi-mock.html">OSGi Mocks</a></div><div class="taglink"><a href="/documentation/development/release-management.html">Release Management</a></div><div class="taglink"><a href="/documentation/development/repository-based-development.html">Repository Based Development</a></div><div class="taglink"><a href="/repolist.html">Sling Git Repositories</a></div><div class="taglink"><a href="/documentation/development/ide-tooling.html">Sling IDE tooling for Eclipse User Guide</a></div><div class="taglink"><a href="/documentation/development/sling-mock.html">Sling Mocks</a></div><div class="taglink"><a href="/documentation/pax-exam-utils.html">Sling Pax Exam Utilities</a></div><div class="taglink"><a href="/documentation/development/sling-testing-tools.html">Sling Testing Tools</a></div><div class="taglink"><a href="/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></div><div class="taglink"><a href="/documentation/development/version-policy.html">Version Policy</a></div><div class="tags"><h2>All tags</h2><span class="allTagsLink"><a href="/tags/adaptTo.html" class="label">adaptTo<span class="badge">1</span></a></span>
diff -b -B -r ./tags/maven.html /Users/bert/Desktop/sling-site-0.1-SNAPSHOT/tags/maven.html
80c80
< <div class="taglinks"><h2>Tagged with 'maven'</h2><div class="taglink"><a href="/documentation/development/testing-paxexam.html">Apache Sling Testing PaxExam</a></div><div class="taglink"><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/maven-archetypes.html">Maven Archetypes</a></div><div class="taglink"><a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></div><div class="taglink"><a href="/documentation/development/sling.html">Maven Sling Plugin</a></div><div class="taglink"><a href="/documentation/development/maven-usage.html">Maven Usage</a></div><div class="taglink"><a href="/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></div><div class="taglink"><a href="/documentation/development/slingstart.html">The Apache Sling Provisioning Model and Apache SlingStart</a></div><div class="taglink"><a href="/documentation/development/feature-model.html">The OSGi Feature Model</a></div><div class="tags"><h2>All tags</h2><span class="allTagsLink"><a href="/tags/adaptTo.html" class="label">adaptTo<span class="badge">1</span></a></span>
---
> <div class="taglinks"><h2>Tagged with 'maven'</h2><div class="taglink"><a href="/documentation/development/testing-paxexam.html">Apache Sling Testing PaxExam</a></div><div class="taglink"><a href="/documentation/development/htl-maven-plugin.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/jspc.html">HTL Maven Plugin</a></div><div class="taglink"><a href="/documentation/development/maven-archetypes.html">Maven Archetypes</a></div><div class="taglink"><a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a></div><div class="taglink"><a href="/documentation/development/sling.html">Maven Sling Plugin</a></div><div class="taglink"><a href="/documentation/development/maven-usage.html">Maven Usage</a></div><div class="taglink"><a href="/documentation/development/maventipsandtricks.html">MavenTipsAndTricks</a></div><div class="taglink"><a href="/documentation/development/slingstart.html">The Apache Sling Provisioning Model and Apache SlingStart</a></div><div class="taglink"><a href="/documentation/development/feature-model.html">The OSGi Feature Model</a></div><div class="tags"><h2>All tags</h2><span class="allTagsLink"><a href="/tags/adaptTo.html" class="label">adaptTo<span class="badge">1</span></a></span>