[jackrabbit-filevault] branch master updated: releng: clarify import modes for acls

[kw...@apache.org]

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

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


The following commit(s) were added to refs/heads/master by this push:
     new de5c1a4d releng: clarify import modes for acls
de5c1a4d is described below

commit de5c1a4df86b75b19802bc07c8f8dab0b8a51111
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jun 21 17:49:45 2022 +0200

    releng: clarify import modes for acls
---
 src/site/markdown/importmode.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/site/markdown/importmode.md b/src/site/markdown/importmode.md
index 8fd54aa3..13f92610 100644
--- a/src/site/markdown/importmode.md
+++ b/src/site/markdown/importmode.md
@@ -23,9 +23,15 @@ Details on how node ids are treated during import are outlined at [Referenceable
 
 <!-- MACRO{toc} -->
 
+Regular content
+----------------
 The import mode handling is inconsistent and has many edge cases for the mode `MERGE` and `UPDATE`. Therefore FileVault 3.5.0 introduces the new modes `MERGE_PROPERTIES` and `UPDATE_PROPERTIES` (in [JCRVLT-255][JCRVLT-255]) which behave much more predicatable. The details are outlined at the [JavaDoc][api.ImportMode].
 
-Import Mode behaviour on authorizables
+Access control list
+----------------------------------------------------
+The import mode handling for access control lists (name `rep:ACL`, `rep:CugPolicy` or `rep:PrincipalPolicy`) is  only affected by the [`acHandling` package property](properties.html) and not by the import mode set on the filter rule.
+
+Authorizables
 ----------------------------------------------------
 If an authorizable with the same name already exists, the active `ImportMode` controls how the existing authorizables are affected:
 
@@ -54,7 +60,7 @@ The authorizables are imported using the JCR import content handler and rely on
 
 
 ### Scope of the workspace filter
-Note that the workspace filter of the package refers on the content of the package and not the existing authorizable. For example, if the package contains a user at `/home/users/t/test` which already exists in the repository at `/home/users/custom/te/test` then the workspace filter `/home/users/t` covers the user, but not `/home/users/custom`.
+Note that the workspace filter of the package refers to the content of the package and not the existing authorizable. For example, if the package contains a user at `/home/users/t/test` which already exists in the repository at `/home/users/custom/te/test` then the workspace filter `/home/users/t` covers the user, but not `/home/users/custom`.
 
 However, the importer keeps track of potential remapping of existing users and tries to calculate the filters accordingly.