From 1bec4421dbf6384105ceb6de4e0b6a555c86796c Mon Sep 17 00:00:00 2001
From: Luud Slagter <l.slagter@furore.com>
Date: Wed, 17 Apr 2024 15:35:05 +0200
Subject: [PATCH 1/3] Escape characters in markdown comments

---
 resources/nl-core/ext-AdditionalCategory.xml                | 2 +-
 .../nl-core/nl-core-HealthProfessional-PractitionerRole.xml | 2 +-
 resources/nl-core/nl-core-Procedure-request.xml             | 2 +-
 resources/zib/ext-Procedure.ProcedureMethod.xml             | 2 +-
 resources/zib/zib-ContactPerson.xml                         | 2 +-
 resources/zib/zib-HealthProfessional-Practitioner.xml       | 2 +-
 resources/zib/zib-HealthProfessional-PractitionerRole.xml   | 4 ++--
 resources/zib/zib-HealthcareProvider.xml                    | 4 ++--
 resources/zib/zib-Patient.xml                               | 6 +++---
 resources/zib/zib-Procedure-request.xml                     | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/nl-core/ext-AdditionalCategory.xml b/resources/nl-core/ext-AdditionalCategory.xml
index 29afdf03a..293eb23e6 100644
--- a/resources/nl-core/ext-AdditionalCategory.xml
+++ b/resources/nl-core/ext-AdditionalCategory.xml
@@ -18,7 +18,7 @@
       <use value="work" />
     </telecom>
   </contact>
-  <description value="An extension that mimics the default FHIR `Resource.category` element that can be used if multiple categories need to be captured, while the cardinality of the core element is 0..1. Resource types where this is the case are for example MedicationAdministration, MedicationDispense, MedicationStatement and Procedure. Note that in the current FHIR R5 build of these resource types, the cardinality of `.category` has been changed to 0..*." />
+  <description value="An extension that mimics the default FHIR `Resource.category` element that can be used if multiple categories need to be captured, while the cardinality of the core element is 0..1. Resource types where this is the case are for example MedicationAdministration, MedicationDispense, MedicationStatement and Procedure. Note that in the current FHIR R5 build of these resource types, the cardinality of `.category` has been changed to 0..\*." />
   <purpose value="In addition to using this extension, a binding should be added to `extension.valueCodeableConcept` referring to the ValueSet of its respective resource type category and with a binding strength that matches the FHIR core binding strength, along with an appropriate definition and short." />
   <copyright value="Copyright and related rights waived via CC0, https://creativecommons.org/publicdomain/zero/1.0/. This does not apply to information from third parties, for example a medical terminology system. The implementer alone is responsible for identifying and obtaining any necessary licenses or authorizations to utilize third party IP in connection with the specification or otherwise." />
   <fhirVersion value="4.0.1" />
diff --git a/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml b/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
index b21f12ce5..fadc671c7 100644
--- a/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
+++ b/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
@@ -53,7 +53,7 @@
     </element>
     <element id="PractitionerRole.organization">
       <path value="PractitionerRole.organization" />
-      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile nl-core-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (0..*) does not match the zib concept (0..1) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile nl-core-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
+      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile nl-core-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (0..\*) does not match the zib concept (0..1) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile nl-core-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
       <type>
         <code value="Reference" />
         <targetProfile value="http://hl7.org/fhir/StructureDefinition/Organization" />
diff --git a/resources/nl-core/nl-core-Procedure-request.xml b/resources/nl-core/nl-core-Procedure-request.xml
index 7f29216ba..b7a29b75a 100644
--- a/resources/nl-core/nl-core-Procedure-request.xml
+++ b/resources/nl-core/nl-core-Procedure-request.xml
@@ -51,7 +51,7 @@
     </element>
     <element id="ServiceRequest.requester">
       <path value="ServiceRequest.requester" />
-      <comment value="The zib mapping contains a known cardinality difference (0..* versus 0..1). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the 0..1 cardinality for the requester.&#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [nl-core-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [nl-core-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
+      <comment value="The zib mapping contains a known cardinality difference (0..\* versus 0..1). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the 0..1 cardinality for the requester.&#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [nl-core-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [nl-core-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
       <type>
         <code value="Reference" />
         <profile value="http://nictiz.nl/fhir/StructureDefinition/pattern-NlCoreHealthProfessionalReference" />
diff --git a/resources/zib/ext-Procedure.ProcedureMethod.xml b/resources/zib/ext-Procedure.ProcedureMethod.xml
index 7e9b8ac5b..3625f2f2d 100644
--- a/resources/zib/ext-Procedure.ProcedureMethod.xml
+++ b/resources/zib/ext-Procedure.ProcedureMethod.xml
@@ -19,7 +19,7 @@
     </telecom>
   </contact>
   <description value="An extension to provide the method or technique that was used to perform the procedure, e.g. approach, lavage, pressuring, etc." />
-  <purpose value="This extension represents the ProcedureMethod concept of the Dutch [zib ('Zorginformatiebouwsteen', i.e. Health and Care Information Model) Procedure v5.2 (2020)](https://zibs.nl/wiki/Procedure-v5.2(2020EN)). The FHIR procedure method extension (http://hl7.org/fhir/StructureDefinition/procedure-method) cannot be used in R4 because it has a 0..1 cardinality which does not match the zib cardinality of 0..* for this concept. The next release of FHIR, R5, will fix the cardinality to 0..* (https://jira.hl7.org/browse/FHIR-30769) allowing the replacement of this extension with the HL7 FHIR core extension." />
+  <purpose value="This extension represents the ProcedureMethod concept of the Dutch [zib ('Zorginformatiebouwsteen', i.e. Health and Care Information Model) Procedure v5.2 (2020)](https://zibs.nl/wiki/Procedure-v5.2(2020EN)). The FHIR procedure method extension (http://hl7.org/fhir/StructureDefinition/procedure-method) cannot be used in R4 because it has a 0..1 cardinality which does not match the zib cardinality of 0..\* for this concept. The next release of FHIR, R5, will fix the cardinality to 0..\* (https://jira.hl7.org/browse/FHIR-30769) allowing the replacement of this extension with the HL7 FHIR core extension." />
   <copyright value="Copyright and related rights waived via CC0, https://creativecommons.org/publicdomain/zero/1.0/. This does not apply to information from third parties, for example a medical terminology system. The implementer alone is responsible for identifying and obtaining any necessary licenses or authorizations to utilize third party IP in connection with the specification or otherwise." />
   <fhirVersion value="4.0.1" />
   <mapping>
diff --git a/resources/zib/zib-ContactPerson.xml b/resources/zib/zib-ContactPerson.xml
index 668e2ad69..4fd7034e8 100644
--- a/resources/zib/zib-ContactPerson.xml
+++ b/resources/zib/zib-ContactPerson.xml
@@ -148,7 +148,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="The contact’s telephone number and/or e-mail address." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the containers TelephoneNumbers (0..*) and EmailAddresses (0..*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-contactperson-v3.4-2020EN" />
diff --git a/resources/zib/zib-HealthProfessional-Practitioner.xml b/resources/zib/zib-HealthProfessional-Practitioner.xml
index 310d48e83..6a37de9cc 100644
--- a/resources/zib/zib-HealthProfessional-Practitioner.xml
+++ b/resources/zib/zib-HealthProfessional-Practitioner.xml
@@ -135,7 +135,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="Health professional’s telephone number(s) or e-mail address(es)." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the containers TelephoneNumbers (0..*) and EmailAddresses (0..*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-healthprofessional-v3.5-2020EN" />
diff --git a/resources/zib/zib-HealthProfessional-PractitionerRole.xml b/resources/zib/zib-HealthProfessional-PractitionerRole.xml
index 278e5b848..7bc1236aa 100644
--- a/resources/zib/zib-HealthProfessional-PractitionerRole.xml
+++ b/resources/zib/zib-HealthProfessional-PractitionerRole.xml
@@ -54,7 +54,7 @@
       <path value="PractitionerRole.organization" />
       <short value="HealthcareProvider" />
       <definition value="The organization the health professional works for." />
-      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile zib-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (0..*) does not match the zib concept (0..1) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile zib-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
+      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile zib-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (0..\*) does not match the zib concept (0..1) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile zib-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
       <alias value="Zorgaanbieder" />
       <type>
         <code value="Reference" />
@@ -106,7 +106,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="Health professional’s telephone number(s) or e-mail address(es) that are specific to the role/location/service." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the containers TelephoneNumbers (0..*) and EmailAddresses (0..*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-healthprofessional-v3.5-2020EN" />
diff --git a/resources/zib/zib-HealthcareProvider.xml b/resources/zib/zib-HealthcareProvider.xml
index 8cbc17ea2..bc1df4840 100644
--- a/resources/zib/zib-HealthcareProvider.xml
+++ b/resources/zib/zib-HealthcareProvider.xml
@@ -77,7 +77,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="The information needed to contact the healthcare organization via telephone and/or e-mail." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the containers TelephoneNumbers (0..*) and EmailAddresses (0..*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-healthcareprovider-v3.4-2020EN" />
@@ -109,7 +109,7 @@
     <element id="Location.address">
       <path value="Location.address" />
       <definition value="The physical address of the healthcare provider’s location." />
-      <comment value="The cardinality mismatch with the zib (0..1 versus 0..*) is explained by the restriction of FHIR to limit the `Location.address` to a physical address while the zib allows for other types of addresses (e.g. a postal address). Other types of addresses than a physical address are given in `Organization.address` which is referenced by `Location.managingOrganization`." />
+      <comment value="The cardinality mismatch with the zib (0..1 versus 0..\*) is explained by the restriction of FHIR to limit the `Location.address` to a physical address while the zib allows for other types of addresses (e.g. a postal address). Other types of addresses than a physical address are given in `Organization.address` which is referenced by `Location.managingOrganization`." />
       <type>
         <code value="Address" />
         <profile value="http://nictiz.nl/fhir/StructureDefinition/zib-AddressInformation" />
diff --git a/resources/zib/zib-Patient.xml b/resources/zib/zib-Patient.xml
index f27c0a543..cd50149e2 100644
--- a/resources/zib/zib-Patient.xml
+++ b/resources/zib/zib-Patient.xml
@@ -78,7 +78,7 @@
     <element id="Patient.extension:nationality">
       <path value="Patient.extension" />
       <sliceName value="nationality" />
-      <comment value="Due to the nature of the nationality core extension (which allows for a period to be placed next to the nationality and thus allows for different nationalities over time), the cardinality of the extension is left at 0..* instead of the zib cardinality of 0..1." />
+      <comment value="Due to the nature of the nationality core extension (which allows for a period to be placed next to the nationality and thus allows for different nationalities over time), the cardinality of the extension is left at 0..\* instead of the zib cardinality of 0..1." />
       <type>
         <code value="Extension" />
         <profile value="http://hl7.org/fhir/StructureDefinition/patient-nationality" />
@@ -180,7 +180,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="Patient’s telephone number(s) or e-mail address(es)." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the containers TelephoneNumbers (0..*) and EmailAddresses (0..*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-patient-v3.2-2020EN" />
@@ -481,7 +481,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="The contact’s telephone number and/or e-mail address." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the containers TelephoneNumbers (0..*) and EmailAddresses (0..*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-contactperson-v3.4-2020EN" />
diff --git a/resources/zib/zib-Procedure-request.xml b/resources/zib/zib-Procedure-request.xml
index 93789ce5f..8b3c734dc 100644
--- a/resources/zib/zib-Procedure-request.xml
+++ b/resources/zib/zib-Procedure-request.xml
@@ -164,7 +164,7 @@
       <path value="ServiceRequest.requester" />
       <short value="Requester" />
       <definition value="The healthcare provider who requested the procedure." />
-      <comment value="The zib mapping contains a known cardinality difference (0..* versus 0..1). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the 0..1 cardinality for the requester. &#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [zib-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [zib-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
+      <comment value="The zib mapping contains a known cardinality difference (0..\* versus 0..1). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the 0..1 cardinality for the requester. &#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [zib-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [zib-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
       <alias value="Aanvrager" />
       <type>
         <code value="Reference" />

From 5dba6b833a2d53c0a28dbb337688048aef7066aa Mon Sep 17 00:00:00 2001
From: Luud Slagter <l.slagter@furore.com>
Date: Thu, 18 Apr 2024 11:41:05 +0200
Subject: [PATCH 2/3] Put all cardinalities between backticks

---
 release-notes.md                              | 34 +++++++++----------
 resources/nl-core/ext-AdditionalCategory.xml  |  2 +-
 .../nl-core/ext-Context-EpisodeOfCare.xml     |  2 +-
 ...re-HealthProfessional-PractitionerRole.xml |  2 +-
 .../nl-core/nl-core-Procedure-request.xml     |  2 +-
 .../zib/ext-Procedure.ProcedureMethod.xml     |  2 +-
 resources/zib/zib-ContactPerson.xml           |  2 +-
 .../zib-HealthProfessional-Practitioner.xml   |  2 +-
 ...ib-HealthProfessional-PractitionerRole.xml |  4 +--
 resources/zib/zib-HealthcareProvider.xml      |  4 +--
 resources/zib/zib-HelpFromOthers.xml          |  2 +-
 resources/zib/zib-NursingIntervention.xml     |  2 +-
 resources/zib/zib-Patient.xml                 |  6 ++--
 resources/zib/zib-Procedure-request.xml       |  2 +-
 resources/zib/zib-TextResult.xml              |  2 +-
 resources/zib/zib-TreatmentDirective2.xml     |  4 +--
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/release-notes.md b/release-notes.md
index f934c7f26..566a7fa1a 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -40,19 +40,19 @@ This document contains release notes per zib, indicating differences with their
 * Added constraints in the profile on the choice that the zib provides between Concern and AlertName. Added guidance on which code to add to `Flag.code` if a reference to Concern is added.
 
 ## zib-AdvanceDirective
-* Moved TypeOfLivingWill from `Consent.category` to `Consent.provision.code`, renamed it to LivingWillType in accordance with the zib and made the element 0..1 rather than 1..1 to adhere to the conceptual cardinalities of the zib.
+* Moved TypeOfLivingWill from `Consent.category` to `Consent.provision.code`, renamed it to LivingWillType in accordance with the zib and made the element `0..1` rather than `1..1` to adhere to the conceptual cardinalities of the zib.
 * Moved LivingWillDocument from `Consent.source[x]` to `Consent.source[x]:sourceAttachment.data`.
 * Moved Representative from `Consent.consentingParty` to `Consent.provision.actor:representative.reference` because the element is removed in R4. Also `Consent.provision.actor:representative.role` has now a fixed value for this mapping.
 * Replaced fixed zib code 11341000146107#http://snomed.info/sct on `Consent.category` with acd#http://terminology.hl7.org/CodeSystem/consentcategorycodes because this is an applicable code bound in the extensible ValueSet.
 * Removed references that are not defined by the zib (e.g. `Consent.organization` and `Consent.actor`).
-* Adjusted the `Consent.dateTime` cardinality from 1..1 to 0..1 to adhere to the conceptual cardinalities of the zib.
+* Adjusted the `Consent.dateTime` cardinality from `1..1` to `0..1` to adhere to the conceptual cardinalities of the zib.
 * Added guidance for mandatory elements `Consent.status`,`Consent.scope` and `Consent.policy` or `Consent.policyRule`.
 
 # zib-AllergyIntolerance
 * Applied 'combined ValueSets' to `.code` and `.reaction.substance` instead of slicing per ValueSet.
 * The code-specification extensions have been removed from `.clinicalStatus` and `.reaction.severity` because the zib concepts can be fully mapped to FHIR.
-* Because AlleryStatus maps to both `.clinicalStatus` and `.verificationStatus`, but `.verificationStatus` now has cardinality 0..1 compared to 1..1 in STU3, guidance on how to interpret the mapping has been added to the root, but has been simplified.
-* Changed cardinality of `.note` from 0..* to 0..1 to align with the zib.
+* Because AlleryStatus maps to both `.clinicalStatus` and `.verificationStatus`, but `.verificationStatus` now has cardinality `0..1` compared to `1..1` in STU3, guidance on how to interpret the mapping has been added to the root, but has been simplified.
+* Changed cardinality of `.note` from `0..*` to `0..1` to align with the zib.
 
 ## zib-AnatomicalLocation
 * New partial zib. The anatomical location in FHIR is usually mapped on `.bodySite` (CodeableConcept with example binding). This zib has therefore been mapped onto a data type profile that can be used for `.bodySite`.
@@ -106,7 +106,7 @@ This document contains release notes per zib, indicating differences with their
 
 ## zib-ContactPerson
 * Added textual guidance on the root to guide usage of RelatedPerson versus Patient.
-* Removed the role extension (http://fhir.nl/fhir/StructureDefinition/nl-core-relatedperson-role) because `RelatedPerson.relationship` has changed from 0..1 to 0..*. The zib concept role is now mapped to a slice on relationship.
+* Removed the role extension (http://fhir.nl/fhir/StructureDefinition/nl-core-relatedperson-role) because `RelatedPerson.relationship` has changed from `0..1` to `0..*`. The zib concept role is now mapped to a slice on relationship.
 * Updated to new zib-NameInformation, zib-AddressInformation and zib-ContactInformation profiles.
 
 ## zib-DevelopmentChild
@@ -125,7 +125,7 @@ This document contains release notes per zib, indicating differences with their
 ## zib-Encounter
 * ContactWith is mapped on a slice of `Encounter.participant`.
 * `Encounter.participant.type` now honors the maximum cardinality of HealthProfessionalRole.
-* `Encounter.period.start` changed to cardinality 0..1 due to the zibs conceptual cardinalities concept.
+* `Encounter.period.start` changed to cardinality `0..1` due to the zibs conceptual cardinalities concept.
 * The mapping of concepts Problem, Procedure and DeviatingResult is moved to `Encounter.reasonReference`.
 * The mapping of Location is moved to `Encounter.location.location`.
 * References to other profiles not accounted for by the zib have been removed.
@@ -165,14 +165,14 @@ This document contains release notes per zib, indicating differences with their
 
 ## zib-HealthcareProvider
 * `Organization.identifier` is now sliced based on a pattern.
-* Changed cardinality of `Organization.type[DepartmentSpecialty]` and `Organization.type[OrganizationType]` from 0..* to 0..1.
+* Changed cardinality of `Organization.type[DepartmentSpecialty]` and `Organization.type[OrganizationType]` from `0..*` to `0..1`.
 * For `Organization.type` the slicing discriminator is changed from fixed system values to a ValueSet binding.
 * Removed comments on `Organization.alias` because it has no basis in the zib.
 * Added comments on the root to point out the usage of the Location resource and the `Organization.partOf`.
 * Major change: use of Location resource.
 
 ## zib-HealthProfessional
-* `Practitioner.identifier` slices changed cardinality from 0..1 to 0..*.
+* `Practitioner.identifier` slices changed cardinality from `0..1` to `0..*`.
 * Added HealthProfessionalIdentificationNumber mapping on `PractitionerRole.identifier`.
 * Added new mapping of Gender in Practitioner.
 * Added textual guidance on the root to clarify the use of Practitioner and PractitionerRole.
@@ -182,7 +182,7 @@ This document contains release notes per zib, indicating differences with their
 
 ## zib-HearingFunction
 * Changed fixed slice on `.code.coding` to a pattern on `.code`.
-* Relaxed cardinality of `.value[x]` to 0..1 of the conceptual cardinalities of the zib.
+* Relaxed cardinality of `.value[x]` to `0..1` of the conceptual cardinalities of the zib.
 
 ## zib-HelpFromOthers
 * The mappings on `CarePlan.identifier`, `CarePlan.subject`, `CarePlan.author` and `CarePlan.careTeam` have been removed.
@@ -256,7 +256,7 @@ This document contains release notes per zib, indicating differences with their
 ## zib-PainScore
 * Removed mapping on `Observation.bodySite` because the AnatomicalLocation concept has been removed from the zib.
 * Removed laterality extension because the Laterality concept has been removed from the zib.
-* Cardinality of `Observation.method` has changed from 1..1 to 0..1. 
+* Cardinality of `Observation.method` has changed from `1..1` to `0..1`. 
 * The data type of `Observation.value[x]` (zib concept PainScoreValue) has been changed from Quantity to Integer.
 
 ## zib-ParticipationInSociety
@@ -264,9 +264,9 @@ This document contains release notes per zib, indicating differences with their
 
 ## zib-Patient
 * Includes Nationality, MaritalStatus, LanguageProficiency.
-* Cardinality of `Patient.extension:nationality` left at 0..* due to the nature of the nationality core extension (which allows for a period to be placed next to the nationality and thus allows for different nationalities over time).
-* Cardinality of `Patient.name` left at 0..* to allow including several name elements with a different `name.use` each.
-* Cardinality of `Patient.telecom` left at 0..* to allow including several contact elements, because the zib ContactInformation includes a container that FHIR does not.
+* Cardinality of `Patient.extension:nationality` left at `0..*` due to the nature of the nationality core extension (which allows for a period to be placed next to the nationality and thus allows for different nationalities over time).
+* Cardinality of `Patient.name` left at `0..*` to allow including several name elements with a different `name.use` each.
+* Cardinality of `Patient.telecom` left at `0..*` to allow including several contact elements, because the zib ContactInformation includes a container that FHIR does not.
 * Added a comment to `deceased[x]`: When exporting the data, if `.deceasedDateTime` (DateOfDeath) is present and has a value, DeathIndicator may be set to 'true', since DeathIndicator and DateOfDeath cannot both be represented at the same time.
 
 ## zib-Payer
@@ -311,8 +311,8 @@ This document contains release notes per zib, indicating differences with their
 ## Procedure
 * Renamed profiles from zib-Procedure and zib-ProcedureRequest to zib-Procedure-event and zib-Procedure-request conform profiling guidelines.
 * ProcedureStartDate and ProcedureEndDate have been mapped to `Procedure.performed[x]` instead of `Procedure.performedPeriod` to account for the use of `Procedure.performedDateTime` when the zib Procedure concerns an instantaneous procedure.
-* Changed cardinality of the ProcedureMethod concept to 0..* instead of 0..1.
-* The ProcedureAnatomicalLocation is mapped on `Procedure.bodySite` and the cardinality has been set to 0..1 instead of 0..*.
+* Changed cardinality of the ProcedureMethod concept to `0..*` instead of `0..1`.
+* The ProcedureAnatomicalLocation is mapped on `Procedure.bodySite` and the cardinality has been set to `0..1` instead of `0..*`.
 * The resource ProcedureRequest has been renamed to ServiceRequest and now includes a mapping for all the possible concepts of zib Procedure. Compared to STU3 a mapping has been added for ProcedureMethod, ProcedureAnatomicalLocation, MedicalDevice, ProcedureStartDate and ProcedureEndDate.
 * `Procedure.location` and `ServiceRequest.locationReference` are used to reference the zib HealthcareProvider instead of `Procedure.performer` and `ProcedureRequest.performer` to indicate where the Procedure takes place.
 * The `Procedure.performer` only references the zib HealthProfessional represented in a PractitionerRole resource. Other references not dictated by the zib are removed.
@@ -378,7 +378,7 @@ This document contains release notes per zib, indicating differences with their
 ## zib-Vaccination
 * Renamed profile names: zib-Vaccination to zib-Vaccination-event and zib-VaccinationRecommendation to zib-Vaccination-request conform new profiling guidelines.
 * Removed references not accounted for by the zib (e.g. `Immunization.location`, `Immunization.manufacturer` and `ImmunizationRecommendation.recommendation.supportingImmunization`).
-* Aligned cardinality of `Immunization.note` with the zib by making it 0..1.
+* Aligned cardinality of `Immunization.note` with the zib by making it `0..1`.
 * Moved VaccinationDate on a type slice on `Immunization.occurrence[x]:occurrenceDateTime`. This element has been renamed from `date` to `occurrence[x]` in R4.
 * Moved Administrator to a slice on `Immunization.performer` with a mandatory fixed pattern in `Immunization.performer.function`.
 * Added a pattern on `Immunization.doseQuantity` to mandate the use of mL by UCUM because the definition of Dose states to use milliliters. 
@@ -388,4 +388,4 @@ This document contains release notes per zib, indicating differences with their
 
 ## zib-VisualFunction
 * Changed fixed slice on `.code.coding` to a pattern on `.code`.
-* Relaxed cardinality of `value[x]` to 0..1 of the conceptual cardinalities of the zib.
\ No newline at end of file
+* Relaxed cardinality of `value[x]` to `0..1` of the conceptual cardinalities of the zib.
\ No newline at end of file
diff --git a/resources/nl-core/ext-AdditionalCategory.xml b/resources/nl-core/ext-AdditionalCategory.xml
index 293eb23e6..433473b77 100644
--- a/resources/nl-core/ext-AdditionalCategory.xml
+++ b/resources/nl-core/ext-AdditionalCategory.xml
@@ -18,7 +18,7 @@
       <use value="work" />
     </telecom>
   </contact>
-  <description value="An extension that mimics the default FHIR `Resource.category` element that can be used if multiple categories need to be captured, while the cardinality of the core element is 0..1. Resource types where this is the case are for example MedicationAdministration, MedicationDispense, MedicationStatement and Procedure. Note that in the current FHIR R5 build of these resource types, the cardinality of `.category` has been changed to 0..\*." />
+  <description value="An extension that mimics the default FHIR `Resource.category` element that can be used if multiple categories need to be captured, while the cardinality of the core element is `0..1`. Resource types where this is the case are for example MedicationAdministration, MedicationDispense, MedicationStatement and Procedure. Note that in the current FHIR R5 build of these resource types, the cardinality of `.category` has been changed to `0..*`." />
   <purpose value="In addition to using this extension, a binding should be added to `extension.valueCodeableConcept` referring to the ValueSet of its respective resource type category and with a binding strength that matches the FHIR core binding strength, along with an appropriate definition and short." />
   <copyright value="Copyright and related rights waived via CC0, https://creativecommons.org/publicdomain/zero/1.0/. This does not apply to information from third parties, for example a medical terminology system. The implementer alone is responsible for identifying and obtaining any necessary licenses or authorizations to utilize third party IP in connection with the specification or otherwise." />
   <fhirVersion value="4.0.1" />
diff --git a/resources/nl-core/ext-Context-EpisodeOfCare.xml b/resources/nl-core/ext-Context-EpisodeOfCare.xml
index 8ffda2cd3..3f8484b46 100644
--- a/resources/nl-core/ext-Context-EpisodeOfCare.xml
+++ b/resources/nl-core/ext-Context-EpisodeOfCare.xml
@@ -18,7 +18,7 @@
       <use value="work" />
     </telecom>
   </contact>
-  <description value="`Observation.context` and `MedicationRequest.context` have been renamed and remodeled in R4 to only contain a reference to Encounter. `MedicationStatement.context` and `MedicationAdministration.context` are a 0..1 reference to Encounter|EpisodeOfCare. This extension allows to add a reference to EpisodeOfCare (potentially next to a reference to an Encounter). From R5 onwards, this extension will likely be replaced by an HL7 core extension." />
+  <description value="`Observation.context` and `MedicationRequest.context` have been renamed and remodeled in R4 to only contain a reference to Encounter. `MedicationStatement.context` and `MedicationAdministration.context` are a `0..1` reference to Encounter|EpisodeOfCare. This extension allows to add a reference to EpisodeOfCare (potentially next to a reference to an Encounter). From R5 onwards, this extension will likely be replaced by an HL7 core extension." />
   <purpose value="This extension provides a generic method to add a reference to an EpisodeOfCare resource." />
   <copyright value="Copyright and related rights waived via CC0, https://creativecommons.org/publicdomain/zero/1.0/. This does not apply to information from third parties, for example a medical terminology system. The implementer alone is responsible for identifying and obtaining any necessary licenses or authorizations to utilize third party IP in connection with the specification or otherwise." />
   <fhirVersion value="4.0.1" />
diff --git a/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml b/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
index fadc671c7..0cfbe8dfe 100644
--- a/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
+++ b/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
@@ -53,7 +53,7 @@
     </element>
     <element id="PractitionerRole.organization">
       <path value="PractitionerRole.organization" />
-      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile nl-core-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (0..\*) does not match the zib concept (0..1) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile nl-core-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
+      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile nl-core-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (`0..*`) does not match the zib concept (`0..1`) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile nl-core-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
       <type>
         <code value="Reference" />
         <targetProfile value="http://hl7.org/fhir/StructureDefinition/Organization" />
diff --git a/resources/nl-core/nl-core-Procedure-request.xml b/resources/nl-core/nl-core-Procedure-request.xml
index b7a29b75a..33bca8111 100644
--- a/resources/nl-core/nl-core-Procedure-request.xml
+++ b/resources/nl-core/nl-core-Procedure-request.xml
@@ -51,7 +51,7 @@
     </element>
     <element id="ServiceRequest.requester">
       <path value="ServiceRequest.requester" />
-      <comment value="The zib mapping contains a known cardinality difference (0..\* versus 0..1). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the 0..1 cardinality for the requester.&#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [nl-core-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [nl-core-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
+      <comment value="The zib mapping contains a known cardinality difference (`0..*` versus `0..1`). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the `0..1` cardinality for the requester.&#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [nl-core-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [nl-core-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
       <type>
         <code value="Reference" />
         <profile value="http://nictiz.nl/fhir/StructureDefinition/pattern-NlCoreHealthProfessionalReference" />
diff --git a/resources/zib/ext-Procedure.ProcedureMethod.xml b/resources/zib/ext-Procedure.ProcedureMethod.xml
index 3625f2f2d..af819bb6d 100644
--- a/resources/zib/ext-Procedure.ProcedureMethod.xml
+++ b/resources/zib/ext-Procedure.ProcedureMethod.xml
@@ -19,7 +19,7 @@
     </telecom>
   </contact>
   <description value="An extension to provide the method or technique that was used to perform the procedure, e.g. approach, lavage, pressuring, etc." />
-  <purpose value="This extension represents the ProcedureMethod concept of the Dutch [zib ('Zorginformatiebouwsteen', i.e. Health and Care Information Model) Procedure v5.2 (2020)](https://zibs.nl/wiki/Procedure-v5.2(2020EN)). The FHIR procedure method extension (http://hl7.org/fhir/StructureDefinition/procedure-method) cannot be used in R4 because it has a 0..1 cardinality which does not match the zib cardinality of 0..\* for this concept. The next release of FHIR, R5, will fix the cardinality to 0..\* (https://jira.hl7.org/browse/FHIR-30769) allowing the replacement of this extension with the HL7 FHIR core extension." />
+  <purpose value="This extension represents the ProcedureMethod concept of the Dutch [zib ('Zorginformatiebouwsteen', i.e. Health and Care Information Model) Procedure v5.2 (2020)](https://zibs.nl/wiki/Procedure-v5.2(2020EN)). The FHIR procedure method extension (http://hl7.org/fhir/StructureDefinition/procedure-method) cannot be used in R4 because it has a `0..1` cardinality which does not match the zib cardinality of `0..*` for this concept. The next release of FHIR, R5, will fix the cardinality to `0..*` (https://jira.hl7.org/browse/FHIR-30769) allowing the replacement of this extension with the HL7 FHIR core extension." />
   <copyright value="Copyright and related rights waived via CC0, https://creativecommons.org/publicdomain/zero/1.0/. This does not apply to information from third parties, for example a medical terminology system. The implementer alone is responsible for identifying and obtaining any necessary licenses or authorizations to utilize third party IP in connection with the specification or otherwise." />
   <fhirVersion value="4.0.1" />
   <mapping>
diff --git a/resources/zib/zib-ContactPerson.xml b/resources/zib/zib-ContactPerson.xml
index 4fd7034e8..277b95ae4 100644
--- a/resources/zib/zib-ContactPerson.xml
+++ b/resources/zib/zib-ContactPerson.xml
@@ -148,7 +148,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="The contact’s telephone number and/or e-mail address." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (`0..1`) and FHIR (`0..*`) is explained by the containers TelephoneNumbers (`0..*`) and EmailAddresses (`0..*`) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-contactperson-v3.4-2020EN" />
diff --git a/resources/zib/zib-HealthProfessional-Practitioner.xml b/resources/zib/zib-HealthProfessional-Practitioner.xml
index 6a37de9cc..77dca3113 100644
--- a/resources/zib/zib-HealthProfessional-Practitioner.xml
+++ b/resources/zib/zib-HealthProfessional-Practitioner.xml
@@ -135,7 +135,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="Health professional’s telephone number(s) or e-mail address(es)." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (`0..1`) and FHIR (`0..*`) is explained by the containers TelephoneNumbers (`0..*`) and EmailAddresses (`0..*`) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-healthprofessional-v3.5-2020EN" />
diff --git a/resources/zib/zib-HealthProfessional-PractitionerRole.xml b/resources/zib/zib-HealthProfessional-PractitionerRole.xml
index 7bc1236aa..187e1fa4c 100644
--- a/resources/zib/zib-HealthProfessional-PractitionerRole.xml
+++ b/resources/zib/zib-HealthProfessional-PractitionerRole.xml
@@ -54,7 +54,7 @@
       <path value="PractitionerRole.organization" />
       <short value="HealthcareProvider" />
       <definition value="The organization the health professional works for." />
-      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile zib-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (0..\*) does not match the zib concept (0..1) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile zib-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
+      <comment value="A HealthcareProvider in zib terms is primarily a location where care is provided, and so the zib concept HealthcareProvider (NL-CM:17.1.6) would normally be fulfilled using a reference to a Location resource (profile zib-HealthcareProvider). However, this particular context refers to the organizational aspects of a HealthcareProvider rather than its physical location:&#xD;&#xA;* the zib concept name is not preceded by a role indicator of the zib (like Location::HealthcareProvider, concept id NL-CM:14.1.5, in the zib Procedure).&#xD;&#xA;* the `PractitionerRole.location` cardinality (`0..*`) does not match the zib concept (`0..1`) and restricting it is not correct as a health professional could be working on multiple locations.&#xD;&#xA;&#xD;&#xA;Therefore, this concept is fulfilled using a reference to the Organization resource (profile zib-HealthcareProvider-Organization) and mapped onto `PractitionerRole.organization` instead of `PractitionerRole.location`." />
       <alias value="Zorgaanbieder" />
       <type>
         <code value="Reference" />
@@ -106,7 +106,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="Health professional’s telephone number(s) or e-mail address(es) that are specific to the role/location/service." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (`0..1`) and FHIR (`0..*`) is explained by the containers TelephoneNumbers (`0..*`) and EmailAddresses (`0..*`) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-healthprofessional-v3.5-2020EN" />
diff --git a/resources/zib/zib-HealthcareProvider.xml b/resources/zib/zib-HealthcareProvider.xml
index bc1df4840..46319720f 100644
--- a/resources/zib/zib-HealthcareProvider.xml
+++ b/resources/zib/zib-HealthcareProvider.xml
@@ -77,7 +77,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="The information needed to contact the healthcare organization via telephone and/or e-mail." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (`0..1`) and FHIR (`0..*`) is explained by the containers TelephoneNumbers (`0..*`) and EmailAddresses (`0..*`) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-healthcareprovider-v3.4-2020EN" />
@@ -109,7 +109,7 @@
     <element id="Location.address">
       <path value="Location.address" />
       <definition value="The physical address of the healthcare provider’s location." />
-      <comment value="The cardinality mismatch with the zib (0..1 versus 0..\*) is explained by the restriction of FHIR to limit the `Location.address` to a physical address while the zib allows for other types of addresses (e.g. a postal address). Other types of addresses than a physical address are given in `Organization.address` which is referenced by `Location.managingOrganization`." />
+      <comment value="The cardinality mismatch with the zib (0..1 versus `0..*`) is explained by the restriction of FHIR to limit the `Location.address` to a physical address while the zib allows for other types of addresses (e.g. a postal address). Other types of addresses than a physical address are given in `Organization.address` which is referenced by `Location.managingOrganization`." />
       <type>
         <code value="Address" />
         <profile value="http://nictiz.nl/fhir/StructureDefinition/zib-AddressInformation" />
diff --git a/resources/zib/zib-HelpFromOthers.xml b/resources/zib/zib-HelpFromOthers.xml
index 5a0a5e5be..8f10e54ff 100644
--- a/resources/zib/zib-HelpFromOthers.xml
+++ b/resources/zib/zib-HelpFromOthers.xml
@@ -76,7 +76,7 @@
     </element>
     <element id="CarePlan.activity">
       <path value="CarePlan.activity" />
-      <comment value="The zib HelpFromOthers always consists of a single type of help. For this reason, the cardinality of `.activity` is restricted to 0..1." />
+      <comment value="The zib HelpFromOthers always consists of a single type of help. For this reason, the cardinality of `.activity` is restricted to `0..1`." />
       <max value="1" />
     </element>
     <element id="CarePlan.activity.detail.code">
diff --git a/resources/zib/zib-NursingIntervention.xml b/resources/zib/zib-NursingIntervention.xml
index da0093b6a..fa90364c1 100644
--- a/resources/zib/zib-NursingIntervention.xml
+++ b/resources/zib/zib-NursingIntervention.xml
@@ -189,7 +189,7 @@
     </element>
     <element id="CarePlan.activity">
       <path value="CarePlan.activity" />
-      <comment value="A nursing intervention in the Dutch realm always consists of a single activity. For this reason, the cardinality of `.activity` is restricted to 0..1." />
+      <comment value="A nursing intervention in the Dutch realm always consists of a single activity. For this reason, the cardinality of `.activity` is restricted to `0..1`." />
       <max value="1" />
     </element>
     <element id="CarePlan.activity.detail.extension:medicalDevice">
diff --git a/resources/zib/zib-Patient.xml b/resources/zib/zib-Patient.xml
index cd50149e2..a52fb2f07 100644
--- a/resources/zib/zib-Patient.xml
+++ b/resources/zib/zib-Patient.xml
@@ -78,7 +78,7 @@
     <element id="Patient.extension:nationality">
       <path value="Patient.extension" />
       <sliceName value="nationality" />
-      <comment value="Due to the nature of the nationality core extension (which allows for a period to be placed next to the nationality and thus allows for different nationalities over time), the cardinality of the extension is left at 0..\* instead of the zib cardinality of 0..1." />
+      <comment value="Due to the nature of the nationality core extension (which allows for a period to be placed next to the nationality and thus allows for different nationalities over time), the cardinality of the extension is left at `0..*` instead of the zib cardinality of `0..1`." />
       <type>
         <code value="Extension" />
         <profile value="http://hl7.org/fhir/StructureDefinition/patient-nationality" />
@@ -180,7 +180,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="Patient’s telephone number(s) or e-mail address(es)." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (`0..1`) and FHIR (`0..*`) is explained by the containers TelephoneNumbers (`0..*`) and EmailAddresses (`0..*`) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-patient-v3.2-2020EN" />
@@ -481,7 +481,7 @@
       </slicing>
       <short value="ContactInformation" />
       <definition value="The contact’s telephone number and/or e-mail address." />
-      <comment value="The cardinality mismatch between the zib (0..1) and FHIR (0..\*) is explained by the containers TelephoneNumbers (0..\*) and EmailAddresses (0..\*) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
+      <comment value="The cardinality mismatch between the zib (`0..1`) and FHIR (`0..*`) is explained by the containers TelephoneNumbers (`0..*`) and EmailAddresses (`0..*`) inside the ContactInformation model. The FHIR datatype ContactPoint does not have these containers." />
       <alias value="Contactgegevens" />
       <mapping>
         <identity value="zib-contactperson-v3.4-2020EN" />
diff --git a/resources/zib/zib-Procedure-request.xml b/resources/zib/zib-Procedure-request.xml
index 8b3c734dc..dd1bd4246 100644
--- a/resources/zib/zib-Procedure-request.xml
+++ b/resources/zib/zib-Procedure-request.xml
@@ -164,7 +164,7 @@
       <path value="ServiceRequest.requester" />
       <short value="Requester" />
       <definition value="The healthcare provider who requested the procedure." />
-      <comment value="The zib mapping contains a known cardinality difference (0..\* versus 0..1). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the 0..1 cardinality for the requester. &#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [zib-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [zib-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
+      <comment value="The zib mapping contains a known cardinality difference (`0..*` versus `0..1`). The zib will be aligned in a future version with the cardinality of FHIR, therefore this profile pre-adopts the `0..1` cardinality for the requester. &#xD;&#xA;&#xD;&#xA;Each occurrence of the zib HealthProfessional is normally represented by _two_ FHIR resources: a PractitionerRole resource (instance of [zib-HealthProfessional-PractitionerRole](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-PractitionerRole)) and a Practitioner resource (instance of [zib-HealthProfessional-Practitioner](http://nictiz.nl/fhir/StructureDefinition/zib-HealthProfessional-Practitioner)). The Practitioner resource is referenced from the PractitionerRole instance. For this reason, sending systems should fill the reference to the PractitionerRole instance here, and not the Practitioner resource. Receiving systems can then retrieve the reference to the Practitioner resource from that PractitionerRole instance.&#xD;&#xA;&#xD;&#xA;In rare circumstances, there is only a Practitioner instance, in which case it is that instance which will be referenced here. However, since this should be the exception, the zib-HealthProfessional-Practitioner profile is not explicitly mentioned as a target profile." />
       <alias value="Aanvrager" />
       <type>
         <code value="Reference" />
diff --git a/resources/zib/zib-TextResult.xml b/resources/zib/zib-TextResult.xml
index 7919cc2e4..8a4060f02 100644
--- a/resources/zib/zib-TextResult.xml
+++ b/resources/zib/zib-TextResult.xml
@@ -49,7 +49,7 @@
       <path value="DiagnosticReport.status" />
       <short value="TextResultStatus" />
       <definition value="The status of the result." />
-      <comment value="Additional information about the mapping of the optional (0..1) TextResultStatus to the mandatory (1..1) `.status`: because `.status` is 1..1 implementers shall have to support `.status` one way or another although the _unknown_ code can be used as a fallback. When TextResultStatus is absent, other codes may be used than from the zib. In that case, the ext-CodeSpecification extension should be omitted." />
+      <comment value="Additional information about the mapping of the optional (`0..1`) TextResultStatus to the mandatory (`1..1`) `.status`: because `.status` is `1..1` implementers shall have to support `.status` one way or another although the _unknown_ code can be used as a fallback. When TextResultStatus is absent, other codes may be used than from the zib. In that case, the ext-CodeSpecification extension should be omitted." />
       <alias value="TekstUitslagStatus" />
       <binding>
         <strength value="required" />
diff --git a/resources/zib/zib-TreatmentDirective2.xml b/resources/zib/zib-TreatmentDirective2.xml
index 232914599..b337647a5 100644
--- a/resources/zib/zib-TreatmentDirective2.xml
+++ b/resources/zib/zib-TreatmentDirective2.xml
@@ -87,7 +87,7 @@
     </element>
     <element id="Consent.extension:additionalAdvanceDirective.value[x]">
       <path value="Consent.extension.value[x]" />
-      <comment value="`Consent.source:sourceReference` is the primary target for referencing zib AdvanceDirective (zib concept NL-CM:2.2.8). However, the cardinality of `Consent.source[x]` is restricted to 0..1. If more than one AdvanceDirective needs to be referenced, the _additional_ references can be communicated using this extension. If this extension is used, `Consent.source:sourceReference` SHALL be populated and it SHALL not contain the same reference as this extension." />
+      <comment value="`Consent.source:sourceReference` is the primary target for referencing zib AdvanceDirective (zib concept NL-CM:2.2.8). However, the cardinality of `Consent.source[x]` is restricted to `0..1`. If more than one AdvanceDirective needs to be referenced, the _additional_ references can be communicated using this extension. If this extension is used, `Consent.source:sourceReference` SHALL be populated and it SHALL not contain the same reference as this extension." />
       <condition value="zib-TreatmentDirective2-1" />
     </element>
     <element id="Consent.modifierExtension:specificationOther">
@@ -175,7 +175,7 @@
       <sliceName value="sourceReference" />
       <short value="AdvanceDirective" />
       <definition value="A (written) statement in which a person indicates wishes concerning future medical action, in the event that this person is at that point no longer (deemed) capable of taking decisions on the matter." />
-      <comment value="The cardinality of this `Consent.source[x]` element is restricted to 0..1, which is narrower than the AdvanceDirective concept (NL-CM:2.2.8) specified in the HCIM TreatmentDirective2. If additional AdvanceDirective references are needed, the additionalAdvanceDirective extension can be used _in addition to_ this element. If the additionalAdvanceDirective extension is used, this element SHALL be populated and it SHALL not contain a reference that is also present in the extension." />
+      <comment value="The cardinality of this `Consent.source[x]` element is restricted to `0..1`, which is narrower than the AdvanceDirective concept (NL-CM:2.2.8) specified in the HCIM TreatmentDirective2. If additional AdvanceDirective references are needed, the additionalAdvanceDirective extension can be used _in addition to_ this element. If the additionalAdvanceDirective extension is used, this element SHALL be populated and it SHALL not contain a reference that is also present in the extension." />
       <alias value="Wilsverklaring" />
       <type>
         <code value="Reference" />

From 1c420b2c77defa7a0c8368137ef78601c023e74b Mon Sep 17 00:00:00 2001
From: Luud Slagter <l.slagter@furore.com>
Date: Thu, 18 Apr 2024 11:44:40 +0200
Subject: [PATCH 3/3] Put remaining cardinality between backticks

---
 resources/zib/zib-HealthcareProvider.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/zib/zib-HealthcareProvider.xml b/resources/zib/zib-HealthcareProvider.xml
index 46319720f..6d131423e 100644
--- a/resources/zib/zib-HealthcareProvider.xml
+++ b/resources/zib/zib-HealthcareProvider.xml
@@ -109,7 +109,7 @@
     <element id="Location.address">
       <path value="Location.address" />
       <definition value="The physical address of the healthcare provider’s location." />
-      <comment value="The cardinality mismatch with the zib (0..1 versus `0..*`) is explained by the restriction of FHIR to limit the `Location.address` to a physical address while the zib allows for other types of addresses (e.g. a postal address). Other types of addresses than a physical address are given in `Organization.address` which is referenced by `Location.managingOrganization`." />
+      <comment value="The cardinality mismatch with the zib (`0..1` versus `0..*`) is explained by the restriction of FHIR to limit the `Location.address` to a physical address while the zib allows for other types of addresses (e.g. a postal address). Other types of addresses than a physical address are given in `Organization.address` which is referenced by `Location.managingOrganization`." />
       <type>
         <code value="Address" />
         <profile value="http://nictiz.nl/fhir/StructureDefinition/zib-AddressInformation" />