You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/03/07 13:44:24 UTC

svn commit: r1453820 - /sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext

Author: bdelacretaz
Date: Thu Mar  7 12:44:24 2013
New Revision: 1453820

URL: http://svn.apache.org/r1453820
Log:
servlets page tweaks

Modified:
    sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext

Modified: sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext?rev=1453820&r1=1453819&r2=1453820&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext Thu Mar  7 12:44:24 2013
@@ -25,7 +25,10 @@ If `sling.servlet.methods` is not specif
 
 #### Registering a Servlet using Java Annotations
 
-If you are working with the default Apache Sling development stack you can use Java Annotations from [Apache Felix Maven SCR Plugin](http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin.html) to describe the binding details for your Sling servlets:
+If you are working with the default Apache Sling development stack you can use Java Annotations from [Apache Felix Maven SCR Plugin](http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin.html) to register your Sling
+servlets and describe their binding details.
+
+There are two ways of doings this, either with a Sling-specific @SlingServlet annotation or with the more generic maven-scr-plugin annotations:
 
 1. The `@SlingServlet` annotation