Author: buildbot
Date: Sun Nov 27 11:53:58 2016
New Revision: 1001704
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 Sun Nov 27 11:53:58 2016
@@ -1 +1 @@
-1771569
+1771570
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
Sun Nov 27 11:53:58 2016
@@ -198,7 +198,7 @@ to a script or and servlet.</p>
</pre></div>
-<p>Custom OSGi DS annotations (e.g. for Sling servlets) are not yet supported
by the OSGi spec (and therefore by bnd), but this is supposed to be fixed with
DS 1.4 (OSGi 7), see also <a
href="https://issues.apache.org/jira/browse/FELIX-5396";>FELIX-5396</a>).</p>
+<p>Custom OSGi DS annotations (e.g. for Sling servlets) are not yet supported
by the OSGi spec (and therefore by bnd), but this is supposed to be fixed with
DS 1.4 (OSGi 7), see also <a
href="https://issues.apache.org/jira/browse/FELIX-5396";>FELIX-5396</a>.</p>
</li>
<li>
<p>The <code>@SlingServlet</code> annotation (evaluated by
maven-scr-plugin)</p>
@@ -293,7 +293,7 @@ The mechanism helping the provider here
<h2 id="error-handler-servlets-or-scripts">Error Handler Servlet(s) or
Scripts<a class="headerlink" href="#error-handler-servlets-or-scripts"
title="Permanent link">¶</a></h2>
<p>Error handling support is 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. 1771569 by kwin on Sun, 27 Nov 2016 11:53:04 +0000
+ Rev. 1771570 by kwin on Sun, 27 Nov 2016 11:53:49 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
