This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 746b9e6  Automatic website deployment from 
https://ci-builds.apache.org/job/Sling/job/modules/job/sling-site/job/master/331/
746b9e6 is described below

commit 746b9e6b7714626c879f9ec1f62d7ab085664980
Author: jenkins <[email protected]>
AuthorDate: Mon Nov 22 14:03:06 2021 +0000

    Automatic website deployment from 
https://ci-builds.apache.org/job/Sling/job/modules/job/sling-site/job/master/331/
---
 documentation/the-sling-engine/resources.html | 5 ++---
 sitemap.xml                                   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/documentation/the-sling-engine/resources.html 
b/documentation/the-sling-engine/resources.html
index 29d8a2f..c17ac14 100644
--- a/documentation/the-sling-engine/resources.html
+++ b/documentation/the-sling-engine/resources.html
@@ -265,8 +265,7 @@
 <p>The Filesystem Resource Provider provides access to the operating system's 
filesystem through the Sling ResourceResolver. Multiple locations may be mapped 
into the resource tree by configuring the filesystem location and the resource 
tree root path for each location to be mapped.</p>
 <p>For details see <a 
href="/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">File
 System Resources</a>.</p>
 <h3><a href="#merged-resources" id="merged-resources">Merged Resources</a></h3>
-<p>The merged resource provider exposes a view on merged resources from 
multiple locations.</p>
-<p>For details see <a 
href="/documentation/bundles/resource-merger.html">Resource Merger</a>.</p>
+<p>The merged resource provider exposes a view on merged resources from 
multiple locations. For details see <a 
href="/documentation/bundles/resource-merger.html">Resource Merger</a>. Another 
approach is taken by the <a 
href="https://github.com/apache/sling-org-apache-sling-superimposing";>Superimposing
 Resource Provider</a>.</p>
 <h3><a href="#custom-resource-providers" id="custom-resource-providers">Custom 
Resource providers</a></h3>
 <p>Custom ResourceProvider services can be used to integrate your own custom 
resources in the Sling resource tree.</p>
 <p>For a simple example of that, see the <a 
href="https://github.com/apache/sling-org-apache-sling-launchpad-test-services/tree/master/src/main/java/org/apache/sling/launchpad/testservices/resourceprovider";>PlanetResourceProvider</a>
 used in our integration tests.</p>
@@ -296,7 +295,7 @@
                             content/documentation/the-sling-engine/resources.md
                         </a>
                     </div>                    <div class="revisionInfo">
-                        Last modified by <span class="author">Konrad 
Windszus</span> on <span class="comment">2021-07-26</span>
+                        Last modified by <span class="author">Konrad 
Windszus</span> on <span class="comment">2021-11-22</span>
                     </div><p>
                         Apache Sling, Sling, Apache, the Apache feather logo, 
and the Apache Sling project logo are trademarks of The Apache Software 
Foundation. All other marks mentioned may be trademarks or registered 
trademarks of their respective owners.
                     </p><p>
diff --git a/sitemap.xml b/sitemap.xml
index 61df0c8..6aad7e2 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 
http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd";>
     <url>
+        
<loc>https://sling.apache.org/documentation/the-sling-engine/resources.html</loc><lastmod>2021-11-22</lastmod>
+    </url><url>
         
<loc>https://sling.apache.org/documentation/the-sling-engine/servlets.html</loc><lastmod>2021-11-22</lastmod>
     </url><url>
         
<loc>https://sling.apache.org/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html</loc><lastmod>2021-11-19</lastmod>
@@ -37,8 +39,6 @@
     </url><url>
         
<loc>https://sling.apache.org/news.html</loc><lastmod>2021-07-26</lastmod>
     </url><url>
-        
<loc>https://sling.apache.org/documentation/the-sling-engine/resources.html</loc><lastmod>2021-07-26</lastmod>
-    </url><url>
         
<loc>https://sling.apache.org/documentation/bundles/installer-provider-installhook.html</loc><lastmod>2021-07-24</lastmod>
     </url><url>
         
<loc>https://sling.apache.org/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html</loc><lastmod>2021-07-21</lastmod>

Reply via email to