You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/11/04 11:51:05 UTC
[jackrabbit-filevault] branch master updated: fix broken link and
improve description for referenceable nodes
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 e2c4d09 fix broken link and improve description for referenceable nodes
e2c4d09 is described below
commit e2c4d09847358bdcee088d2cd30332097e209af8
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Nov 4 12:49:52 2021 +0100
fix broken link and improve description for referenceable nodes
---
src/site/markdown/referenceablenodes.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/site/markdown/referenceablenodes.md b/src/site/markdown/referenceablenodes.md
index 716df51..a03ca44 100644
--- a/src/site/markdown/referenceablenodes.md
+++ b/src/site/markdown/referenceablenodes.md
@@ -26,7 +26,7 @@ The import behavior depends on the used FileVault version.
## Import behavior prior FileVault 3.5.2
-The ids of referenceable nodes are only kept during import when a node with the same name (independent of its `jcr:uuid` value) does not yet exist in the repository. For existing nodes the ids are never updated with the value from the package. They either get a new id or keep their old one (in case the old node was already a referenceable node). In case of conflicts with nodes at a different path, the existing conflicting node is [removed][5] but all its references are kept (i.e. they po [...]
+The ids of referenceable nodes are only kept during import when a node with the same name does not yet exist in the repository. For existing nodes the ids are never updated with the value from the package. They either get a new id or keep their old one (in case the old node was already a referenceable node). In case of conflicts with nodes at a different path, the existing conflicting node is [removed][5] but all its references are kept (i.e. they point to a different path after the import).
## Import behavior since FileVault 3.5.2
@@ -34,10 +34,10 @@ Since version 3.5.2 ([JCRVLT-551](https://issues.apache.org/jira/browse/JCRVLT-5
### Id Conflict Policies
-The import behavior of packages with conflicting ids can be tweaked with `ImportOptions.setIdConflictPolicies(...)`. For further details refer to its [javadoc][3]. The old behavior can be achieved with `IdConflictPolicy.FORCE_REMOVE_CONFLICTING_ID`.
+The import behavior of packages with conflicting ids can be tweaked with `ImportOptions.setIdConflictPolicy(...)`. For further details refer to its [javadoc][3]. The old behavior can be achieved with `IdConflictPolicy.FORCE_REMOVE_CONFLICTING_ID`.
[1]: https://docs.adobe.com/content/docs/en/spec/jcr/2.0/3_Repository_Model.html#3.8%20Referenceable%20Nodes
[2]: https://docs.adobe.com/content/docs/en/spec/jcr/2.0/3_Repository_Model.html#3.8.2%20Referential%20Integrity
-[3]: apidocs/org/apache/jackrabbit/vault/fs/api/IdConflictPolicies.html
+[3]: apidocs/org/apache/jackrabbit/vault/fs/api/IdConflictPolicy.html
[4]: filter.html
[5]: https://docs.adobe.com/content/docs/en/spec/jcr/2.0/11_Import.html#11.8.2%20Remove%20Existing%20Node
\ No newline at end of file