incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r853470 - in /websites/staging/sling/trunk/content: ./ documentation/the-sling-engine/servlets.html
Date Thu, 07 Mar 2013 12:45:57 GMT
Author: buildbot
Date: Thu Mar  7 12:45:57 2013
New Revision: 853470

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:45:57 2013
@@ -1 +1 @@
-1453820
+1453823

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:45:57 2013
@@ -145,7 +145,7 @@
 <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 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>
+<p>There are two ways of doing 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>
@@ -259,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. 1453820 by bdelacretaz on Thu, 7 Mar 2013 12:44:24 +0000
+        Rev. 1453823 by bdelacretaz on Thu, 7 Mar 2013 12:45:49 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project



Mime
View raw message