svn commit: r862234 - in /websites/staging/sling/trunk/content: ./ documentation/the-sling-engine/url-to-script-resolution.html

[bu...@apache.org]

Author: buildbot
Date: Fri May 17 08:53:40 2013
New Revision: 862234

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/the-sling-engine/url-to-script-resolution.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 17 08:53:40 2013
@@ -1 +1 @@
-1483692
+1483695

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/url-to-script-resolution.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/url-to-script-resolution.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/url-to-script-resolution.html Fri May 17 08:53:40 2013
@@ -97,7 +97,9 @@
 <li><a href="#examples">Examples</a></li>
 </ul>
 </div>
-<p>This page explains how Sling maps URLs to a script or and servlet. First of all Sling looks up the resource identified 
+<p>This page explains how Sling maps URLs to a script or and servlet. </p>
+<p>See also <a href="/documentation/the-sling-engine/servlets.html">Servlets and Scripts</a> which provides detailed info about how to register servlets.</p>
+<p>First of all Sling looks up the resource identified 
 by the URL - typically a path inside the JCR repository, which is annotated by the <code>sling:resourceType</code> property 
 which defines the resource type of that resource. Using this resource type (which is kind of a relative path, 
 eg. "myblog/comment"), scripts or servlets are looked up. </p>
@@ -176,7 +178,7 @@ covered there, please let us know via th
 </ul>
 <p>The priority of script selection would (6) - (4) - (5) - (3) - (2) - (1) - (0). Note that (4) is a better match than (5) because it matches more selectors even though (5) has an extension match where (4) does not.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1483692 by bdelacretaz on Fri, 17 May 2013 08:49:15 +0000
+        Rev. 1483695 by bdelacretaz on Fri, 17 May 2013 08:53:34 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project