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 7b9ef2d74 Automatic website deployment from
https://ci-builds.apache.org/job/Sling/job/modules/job/sling-site/job/master/767/
7b9ef2d74 is described below
commit 7b9ef2d7440983c9df27e3f81678bcee2ad91a21
Author: jenkins <[email protected]>
AuthorDate: Thu Oct 12 11:49:03 2023 +0000
Automatic website deployment from
https://ci-builds.apache.org/job/Sling/job/modules/job/sling-site/job/master/767/
---
documentation/bundles/resource-merger.html | 4 ++--
pagefind/fragment/en_45131ea.pf_fragment | Bin 2963 -> 0 bytes
pagefind/fragment/en_9c3786f.pf_fragment | Bin 0 -> 2963 bytes
pagefind/index/en_9aa1f11.pf_index | Bin 40368 -> 0 bytes
pagefind/index/en_f633797.pf_index | Bin 0 -> 40368 bytes
pagefind/pagefind-entry.json | 2 +-
pagefind/pagefind.en_2c30e567a7.pf_meta | Bin 1828 -> 0 bytes
pagefind/pagefind.en_e699ffca0b.pf_meta | Bin 0 -> 1827 bytes
sitemap.xml | 4 ++--
9 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/documentation/bundles/resource-merger.html
b/documentation/bundles/resource-merger.html
index 83a7f2b70..36cc99a43 100644
--- a/documentation/bundles/resource-merger.html
+++ b/documentation/bundles/resource-merger.html
@@ -151,7 +151,7 @@
<p>Each <code>MergedResourcePicker</code> service implementation in the system
provides one unique mount point/root path (usually starting with
<code>/mnt</code>) exposing a view on merged resources from at least two
different locations.</p>
<p>The exact merging mechanism depends on the resource picker implementation
(see below). The order of the merging is important as the overlying resource
may overwrite properties/child resources from the underlying resource (but not
vice-versa). It is possible to</p>
<ul>
-<li>remove existing resource/properties from the underlying resources,</li>
+<li>remove existing resources/properties from the underlying resources,</li>
<li>modify existing properties/child resources of the underlying resources
and</li>
<li>add new properties/child resources</li>
</ul>
@@ -300,7 +300,7 @@ resulting order: child1, child5, child2, child3, child4
content/documentation/bundles/resource-merger.md
</a>
</div> <div class="revisionInfo">
- Last modified by <span class="author">Carsten
Ziegeler</span> on <span class="comment">2023-02-15</span>
+ Last modified by <span class="author">Konrad
Windszus</span> on <span class="comment">2023-10-12</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
diff --git a/pagefind/fragment/en_45131ea.pf_fragment
b/pagefind/fragment/en_45131ea.pf_fragment
deleted file mode 100644
index 077713e3e..000000000
Binary files a/pagefind/fragment/en_45131ea.pf_fragment and /dev/null differ
diff --git a/pagefind/fragment/en_9c3786f.pf_fragment
b/pagefind/fragment/en_9c3786f.pf_fragment
new file mode 100644
index 000000000..08e1296fa
Binary files /dev/null and b/pagefind/fragment/en_9c3786f.pf_fragment differ
diff --git a/pagefind/index/en_9aa1f11.pf_index
b/pagefind/index/en_9aa1f11.pf_index
deleted file mode 100644
index 06762ec0d..000000000
Binary files a/pagefind/index/en_9aa1f11.pf_index and /dev/null differ
diff --git a/pagefind/index/en_f633797.pf_index
b/pagefind/index/en_f633797.pf_index
new file mode 100644
index 000000000..cd2f72d33
Binary files /dev/null and b/pagefind/index/en_f633797.pf_index differ
diff --git a/pagefind/pagefind-entry.json b/pagefind/pagefind-entry.json
index 95b98ca07..785b4c556 100644
--- a/pagefind/pagefind-entry.json
+++ b/pagefind/pagefind-entry.json
@@ -1 +1 @@
-{"version":"1.0.3","languages":{"en":{"hash":"en_2c30e567a7","wasm":"en","page_count":187}}}
\ No newline at end of file
+{"version":"1.0.3","languages":{"en":{"hash":"en_e699ffca0b","wasm":"en","page_count":187}}}
\ No newline at end of file
diff --git a/pagefind/pagefind.en_2c30e567a7.pf_meta
b/pagefind/pagefind.en_2c30e567a7.pf_meta
deleted file mode 100644
index 6ee3e3fc5..000000000
Binary files a/pagefind/pagefind.en_2c30e567a7.pf_meta and /dev/null differ
diff --git a/pagefind/pagefind.en_e699ffca0b.pf_meta
b/pagefind/pagefind.en_e699ffca0b.pf_meta
new file mode 100644
index 000000000..29936e854
Binary files /dev/null and b/pagefind/pagefind.en_e699ffca0b.pf_meta differ
diff --git a/sitemap.xml b/sitemap.xml
index 352608e5a..718b72dc7 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/bundles/resource-merger.html</loc><lastmod>2023-10-12</lastmod>
+ </url><url>
<loc>https://sling.apache.org/project-information/project-team.html</loc><lastmod>2022-10-31</lastmod>
</url><url>
<loc>https://sling.apache.org/old-stuff/scriptengineintegration/groovy-support.html</loc><lastmod>2017-09-29</lastmod>
@@ -278,8 +280,6 @@
<loc>https://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html</loc><lastmod>2017-09-29</lastmod>
</url><url>
<loc>https://sling.apache.org/documentation/bundles/sling-health-check-tool.html</loc><lastmod>2020-08-04</lastmod>
- </url><url>
-
<loc>https://sling.apache.org/documentation/bundles/resource-merger.html</loc><lastmod>2023-02-15</lastmod>
</url><url>
<loc>https://sling.apache.org/documentation/bundles/osgi-installer.html</loc><lastmod>2022-12-05</lastmod>
</url><url>
