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

[bu...@apache.org]

Author: buildbot
Date: Thu Mar  7 12:44:31 2013
New Revision: 853469

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 Thu Mar  7 12:44:31 2013
@@ -1 +1 @@
-1453801
+1453820

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 Thu Mar  7 12:44:31 2013
@@ -143,7 +143,9 @@
 <p>Each path to be used for registration - either from the <code>sling.servlet.paths</code> property or constructed from the other <code>sling.servlet.\*</code> properties - must be absolute. Any relative path is made absolute by prefixing it with a root path. This prefix may be set with the <code>sling.servlet.prefix</code> service registration property. If this property is not set, the first entry in the <code>ResourceResolver</code> search path for the <code>ResourceResolver.getResource(String)</code> method is used as the prefix. If this entry cannot be derived, a simpe slash - <code>/</code> - is used as the prefix.</p>
 <p>If <code>sling.servlet.methods</code> is not specified, the servlet is only registered for handling GET requests. Make sure to list all methods you want to be handled by this servlet.</p>
 <h4 id="registering-a-servlet-using-java-annotations">Registering a Servlet using Java Annotations</h4>
-<p>If you are working with the default Apache Sling development stack you can use Java Annotations from <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a> to describe the binding details for your Sling servlets:</p>
+<p>If you are working with the default Apache Sling development stack you can use Java Annotations from <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a> to register your Sling
+servlets and describe their binding details.</p>
+<p>There are two ways of doings this, either with a Sling-specific @SlingServlet annotation or with the more generic maven-scr-plugin annotations:</p>
 <ol>
 <li>
 <p>The <code>@SlingServlet</code> annotation</p>
@@ -257,7 +259,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. 1453801 by fmeschbe on Thu, 7 Mar 2013 12:17:03 +0000
+        Rev. 1453820 by bdelacretaz on Thu, 7 Mar 2013 12:44:24 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project