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

[bu...@apache.org]

Author: buildbot
Date: Thu May 16 09:17:40 2013
New Revision: 862148

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 16 09:17:40 2013
@@ -1 +1 @@
-1483268
+1483269

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html Thu May 16 09:17:40 2013
@@ -122,12 +122,8 @@
 <li>Call <code>HttpServletRequest.getScheme(), .getServerName(), getServerPort</code> to get an absolute path out of the request URL: [scheme]()/[host].[port][path] (<code>resolve(HttpServletRequest, String)</code> method only, which)</li>
 <li>Check whether any virtual path matches the absolute path. If such a match exists, the next step is entered with the match.</li>
 <li>Apply a list of mappings in order to create a mapped path. The first mapped path resolving to a Resource is assumed success and the Resource found is returned.</li>
-<li>
-<p>If no mapping created a mapped path addressing an existing Resource, the method fails and returns:</p>
-</li>
-<li>
-<p>The <code>resolve(String)</code> and <code>resolve(HttpServletRequest,String)</code> methods return a <code>NonExistingResource</code></p>
-</li>
+<li>If no mapping created a mapped path addressing an existing Resource, the method fails and returns:</li>
+<li>The <code>resolve(String)</code> and <code>resolve(HttpServletRequest,String)</code> methods return a <code>NonExistingResource</code></li>
 <li>The <code>getResource(String path)</code> and <code>getResource(Resource base, String path)</code> methods return null</li>
 </ol>
 <p>The virtual path mapping may be used to create shortcut URLs for otherwise long and complicated URLs. An example of such an URL might be the main administrative page of a CMS system. So, administrators may access the root of the web application and directed to the main administrative page.</p>
@@ -170,7 +166,7 @@
 <h2 id="wrapdecorate-resources">Wrap/Decorate Resources</h2>
 <p>The Sling API provides an easy way to wrap or decorate a resource before returning. Details see <a href="/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or Decorate Resources</a>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1483268 by bdelacretaz on Thu, 16 May 2013 09:16:08 +0000
+        Rev. 1483269 by bdelacretaz on Thu, 16 May 2013 09:17:34 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project