You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2013/05/17 10:58:04 UTC

svn commit: r862235 - in /websites/staging/sling/trunk/content: ./ documentation/the-sling-engine/servlets.html

Author: buildbot
Date: Fri May 17 08:58:04 2013
New Revision: 862235

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html

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

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html Fri May 17 08:58:04 2013
@@ -102,6 +102,8 @@
 <li><a href="#error-handler-servlets-or-scripts">Error Handler Servlet(s) or Scripts</a></li>
 </ul>
 </div>
+<p>See also <a href="/documentation/the-sling-engine/url-to-script-resolution.html">URL to Script Resolution</a> which explains how Sling maps URLs 
+to a script or and servlet.</p>
 <h2 id="servlet-registration">Servlet Registration</h2>
 <p>Servlets can be registered as OSGi services. The following service reference properties are defined for Servlets defined as OSGi services of type <code>javax.servlet.Servlet</code>:</p>
 <table>
@@ -259,7 +261,7 @@ The mechanism helping the provider here 
 <h2 id="error-handler-servlets-or-scripts">Error Handler Servlet(s) or Scripts</h2>
 <p>Error handling support is now described on the <a href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a> page.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1453826 by bdelacretaz on Thu, 7 Mar 2013 12:47:39 +0000
+        Rev. 1483698 by bdelacretaz on Fri, 17 May 2013 08:57:57 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project