Commit d6540f5e authored by Rieks Joosten's avatar Rieks Joosten

Merge branch 'master' into terminology-rieks

# Conflicts:
#	docs/functional-architecture.md
#	docs/terminology-maintenance-script.rieks
#	docs/terms/action-type.md
#	docs/terms/action.md
#	docs/terms/agent.md
#	docs/terms/author.md
#	docs/terms/business-transaction.md
#	docs/terms/colleague.md
#	docs/terms/commitment-decision.md
#	docs/terms/communication-session.md
#	docs/terms/concept-file.md
#	docs/terms/credential-catalogue.md
#	docs/terms/credential-type.md
#	docs/terms/data-collector.md
#	docs/terms/data-discloser.md
#	docs/terms/definition.md
#	docs/terms/dependent.md
#	docs/terms/dictionary-file.md
#	docs/terms/digital-policy.md
#	docs/terms/employer.md
#	docs/terms/glossary-file.md
#	docs/terms/governor.md
#	docs/terms/guardian.md
#	docs/terms/guardianship.md
#	docs/terms/holder.md
#	docs/terms/identifier.md
#	docs/terms/issuer.md
#	docs/terms/jurisdiction.md
#	docs/terms/legal-entity.md
#	docs/terms/legal-system.md
#	docs/terms/owned.md
#	docs/terms/party.md
#	docs/terms/pattern-file.md
#	docs/terms/pattern-guardianship.md
#	docs/terms/pattern.md
#	docs/terms/presentation.md
#	docs/terms/principal.md
#	docs/terms/scope-file.md
#	docs/terms/term-file.md
#	docs/terms/transaction-data-collector.md
#	docs/terms/transaction-id.md
#	docs/terms/transaction-request.md
#	docs/terms/transaction-type.md
#	docs/terms/verifier.md
parents 26020985 1fa142c6
Pipeline #17226 passed with stage
in 2 minutes and 35 seconds
// Purpose: resolve all merge conflicts by accepting the CURRENT changes (change $1 to $2 to accept INCOMING changese)
// This is a script that can be run by the Batch Replacer extension of VSCode .
// Press Ctrl-Shift-P as you are editing this script, then search for `Batch Replacer`, and execute it.
// If you do not specify the files to work on, the replace will be global (throughout the workspace).
// `filter "document.txt"` - document.txt file in the root folder
// `filter "Documents/document.txt"` - document.txt file in the Documents folder in the root folder
// `filter "**/document.txt"` - document.txt files anywhere
// `filter "*.txt"` - any .txt file in the root folder
// `filter "**/*.txt"` - any .txt file
filter "docs/**/*.md"
replace-regex "^<<<<<<<.*\n((?:.*\n)*)=======\n((?:.*\n)*)>>>>>>>.*\n"
// To accept CURRENT changes
with "$1"
// To accept INCOMING changes
// with "$2"
......@@ -10,7 +10,8 @@
// Now, you have to manually execute /(?<=\|)([A-Z][^%]*)(?=%%)/\L$1/g/
// 4. `|ref-text%% is being checked to see if modifications need to be made (e.g. plurals to singular etc.)
// 5. There is a cleanup phase that removes any %%...|...%% syntax from the docusaurus header, markdown headers, and <img /> constructs.
replace-regex "^<<<<<<<.*\n((?:.*\n)*)=======\n((?:.*\n)*)>>>>>>>.*\n"
with "$1"
// Complex regular expressions can be created using variables. Variables are applied to the entire script, and should be defined at the beginning of the script. Variables are defined as ... = "..." and are used as %{...}. Variables can only be used in the replace and replace-regex instructions.
// variables can reference themselves and be overwritten - see documentation of 'batch replacer' extension
......
......@@ -22,6 +22,8 @@ We may use the phrase %%natural guardianship|guardianship%% to refer to an guard
The %%Guardianship pattern|pattern-guardianship%% provides an overview of how this concept fits in with related concepts.
The %%Guardianship pattern|pattern-guardianship%% provides an overview of how this concept fits in with related concepts.
### Purpose
**Guardianship** is a means by which %%jurisdictions|jurisdiction%% provide assurances to %%parties|party%% (within its scope) that they can enjoy, dispose of and control in pretty much any way they like. The %%legal system|legal-system%% of the %%jurisdiction|jurisdiction%% specifies these rights, and provides ways in which the %%owner|owner%% can exercize them (that provides the assurance).
......
......@@ -14,6 +14,8 @@ A **Legal System** is a system in which rules are defined ([legislature](https:/
The %%Jurisdictions pattern|pattern-jurisdiction%% provides an overview of how this concept fits in with related concepts.
The %%Jurisdictions pattern|pattern-jurisdiction%% provides an overview of how this concept fits in with related concepts.
### Purpose
The ability to distinguish between (non)legal-systems is a very generic enabler to tell which rules (laws, policies, guidelines, etc.) will apply within its %%scope|scope%%, as well as to evaluate the risks that we run when not complying with the rules. Conversely, the %%party|party%% that operates a legal system may provide additional rules to help mitigate such risks.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment