Return-Path: 
 <commits-return-13178-apmail-sling-commits-archive=sling.apache.org@sling.apache.org>
X-Original-To: apmail-sling-commits-archive@www.apache.org
Delivered-To: apmail-sling-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 8FC05D54E
	for <apmail-sling-commits-archive@www.apache.org>;
 Fri, 17 May 2013 08:58:25 +0000 (UTC)
Received: (qmail 22720 invoked by uid 500); 17 May 2013 08:58:25 -0000
Delivered-To: apmail-sling-commits-archive@sling.apache.org
Received: (qmail 22638 invoked by uid 500); 17 May 2013 08:58:25 -0000
Mailing-List: contact commits-help@sling.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sling.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sling.apache.org>
List-Post: <mailto:commits@sling.apache.org>
List-Id: <commits.sling.apache.org>
Reply-To: dev@sling.apache.org
Delivered-To: mailing list commits@sling.apache.org
Received: (qmail 22631 invoked by uid 99); 17 May 2013 08:58:25 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 08:58:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 08:58:24 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B722E23888D2
	for <commits@sling.apache.org>; Fri, 17 May 2013 08:58:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r862235 - in /websites/staging/sling/trunk/content: ./
 documentation/the-sling-engine/servlets.html
Date: Fri, 17 May 2013 08:58:04 -0000
To: commits@sling.apache.org
From: buildbot@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130517085804.B722E23888D2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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