updates to main

input/pagecontent/available_trust_domains.md

@@ -1,5 +1,6 @@
 Currently, the following trust domains are available:
 
+
 - [DDCC](https://smart.who.int/ddcc/) : The Digital Documentation of COVID-19 Certificates (DDCC) Trust Domain covers the utilization of COVID-19 Vaccine Certificates and Test Results
 
 - [IPS-PILGRIMAGE](https://worldhealthorganization.github.io/smart-ips-pilgrimage/index.html) implementation Guide is intended to support the utilization of variable International Patient Summary (IPS) documents during pilgrimage.

input/pagecontent/community.xml

@@ -1,5 +1,5 @@
 <div xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hl7.org/fhir ../../input-cache/schemas/R5/fhir-single.xsd">
   <p>Sign up on <a href="https://chat.fhir.org/">chat.fhir.org</a> community and follow the stream who-smart-guidelines for questions, queries and chats related to WHO SMART Guidelines</p>
 
-  <p>WHO also hosts weekly calls on authoring and implementing WHO SMART Guidelines where participation is welcome. Please send an email at <a href= "mailto:tng-support@who.int?subject = TNG FHIR IG">tng-support@who.int</a> in order to get invited.</p>
+  <p>WHO also hosts weekly calls on authoring and implementing WHO SMART Guidelines where participation is welcome. Please send an email at <a href= "mailto:gdhcn-support@who.int?subject = SMART Trust FHIR IG">gdhcn-support@who.int</a> in order to get invited.</p>
 </div>

input/pagecontent/concepts_onboarding.md

@@ -22,13 +22,13 @@ The <i>GDHCN Administrative and Operational Framework</i> should be considered t
 
 ### On-boarding Process Overview
 
-The GDHCN Secretariat manages the on-boarding process and applications of eligible Trust Network Participants to connect as a trusted party to the trust network. Prepared on-boarding records will be handed over to the TNG operator with the request to process the technical on-boarding of the trusted party. An organizational and technical successful application results in a confirmation and the Trust Network Participant can connect to the trust network as a trusted party.
+The GDHCN Secretariat manages the on-boarding process and applications of eligible GDHCN Participants to connect as a trusted party to the trust network. Prepared on-boarding records will be handed over to the GDHCN Secretariat with the request to process the technical on-boarding of the trusted party. An organizational and technical successful application results in a confirmation and the GDHCN Participant can connect to the trust network as a trusted party.
 
 <img src="OnboardingOverview.drawio.png" style="float:none; margin: 0px 0px 0px 0px;"/>
 
 Starting in September of 2023, participation will be opened to other eligible participants following the Full On-boarding Process (FOP).
 
-Starting in June of 2023 and running through December 2023, participation in the GDHCN will be open to current participants of the European Union (EU) Digital COVID Certificate (DCC) network following a Transitive Trust On-boarding Process (TTOP).  The IOP is an abbreviated version of the FOP leveraging the notion of transitive trust.
+Starting in June of 2023 and running through December 2023, participation in the GDHCN will be open to current participants of the European Union (EU) Digital COVID Certificate (DCC) network following a Transitive Trust On-boarding Process (TTOP).  The TTOP is an abbreviated version of the FOP leveraging the notion of transitive trust.
 
 Please review the:
 * [Concepts](concepts.html) underpinning the description of these on-boarding processes including the general description of the Terms of Participation; and
@@ -37,7 +37,7 @@ Please review the:
 
 #### On-boarding Application Requirements
 
-The application of the Trust Network Participant must contain at least:
+The application of the GDHCN Participant must contain at least:
 
 * One or more TNP<sub>SCA</sub>s, one TNP<sub>TLS</sub> and one TNP<sub>UP</sub> ; 
 * A statement about the acceptance of keys and processes of other jurisdictions which are present in the gateway lists; and
@@ -47,7 +47,7 @@ The application of the Trust Network Participant must contain at least:
 #### Secretariat Tasks
 The secretariat must handle the following tasks to establish the on-boarding process:
 
-* providing a Secure Channel for the Trust Network Participant to deliver secure and trustworthy applications SCA and/or DID information; 
+* providing a Secure Channel for the GDHCN Participant to deliver secure and trustworthy applications SCA and/or DID information; 
 * creation and Securing a Key Pair (Trust Anchor)  to sign/confirm on-boarding requests for the gateway; 
 * delivering the Public Key of the Trust Anchor to the Gateway Operations; and
 * transmitting On-boarding Requests to the Gateway Operations.
@@ -57,24 +57,24 @@ The secretariat must handle the following tasks to establish the on-boarding pro
 
 This section describes the steps for the Transitive Trust On-boarding Process (TTOP) to the GDHCN.
 
-As the launch of the WHO Digital Health Trust Network, is expected to be 1 June 2023, only the Trusted Services related to issuance and verification of COVID-19 Certificates will be supported.   WHO will not have access to any of the data contained within a Verifiable Digital Health Certificate that is issued by a Trust Network Participant under one of these Trusted Services.
+As the launch of the WHO Global Digital Health Certification Network, is expected to be 1 June 2023, only the Trusted Services related to issuance and verification of COVID-19 Certificates will be supported. WHO will not have access to any of the data contained within a Verifiable Digital Health Certificate that is issued by a GDHCN Participant under one of these Trusted Services.
 
 #### Period of Applicability
-The IOP will be in effect at the launch date of the GDHCN on 1 June 2023 and be in effect through December 31, 2023.
+The TTOP will be in effect at the launch date of the GDHCN on 1 June 2023 and be in effect through December 31, 2023.
 
 ##### Eligibility
-At launch of IOP, for technical reasons, eligibility to join the GDHCN is limited to WHO Member States which are participants in the EU DCC.
+At launch of TTOP, for technical reasons, eligibility to join the GDHCN is limited to WHO Member States which are participants in the EU DCC.
 
 
 #### Transitive Trust
-The principle of Transitive Trust leverages the trusted relationship that the EC has already established among its participants within the EU DCC network and uses that principle as a basis to allow for EU DCC participants to participate in the GDHCN without any overly burdensome on-boarding process. This will be referred to as the WHO-EC transitive trust relationship. The IOP outlined in this document is intended to serve as a quick and structured mechanism to onboard those eligible Trust Network Participants.
+The principle of Transitive Trust leverages the trusted relationship that the EC has already established among its participants within the EU DCC network and uses that principle as a basis to allow for EU DCC participants to participate in the GDHCN without any overly burdensome on-boarding process. This will be referred to as the WHO-EC transitive trust relationship. The TTOP outlined in this document is intended to serve as a quick and structured mechanism to onboard those eligible GDHCN Participants.
 
 #### Transitive Trust -  Terms of Participation
-The requirements in this document will subsume those outlined in the EC DCC Equivalence Decision Annex II Technical procedure to onboard third countries.  The following abbreviated Terms of Participation will apply during the IOP:
+The requirements in this document will subsume those outlined in the EC DCC Equivalence Decision Annex II Technical procedure to onboard third countries.  The following abbreviated Terms of Participation will apply during the TTOP:
 * ***TOP0***  Will leverage current EC processes and share TNP<sub>TLS</sub> keys with WHO.  These TNP<sub>TLS</sub> keys will be signed by WHO.
 * ***TOP1***  Will be considered fulfilled 
 * ***TOP2***  Will be considered fulfilled
-* ***TOP3***  WHO will ask for an assertion/pledge by eligible Trust Network Participants to adhere to the applicable policies but will not be responsible for assessing or enforcing compliance with the policies or regulatory on which trusted services which are operated by participants of the trust network.
+* ***TOP3***  WHO will ask for an assertion/pledge by eligible GDHCN Participants to adhere to the applicable policies but will not be responsible for assessing or enforcing compliance with the policies or regulatory on which trusted services which are operated by participants of the trust network.
 
 
 #### Organizational Identify
@@ -83,23 +83,23 @@ The organizational identity will be considered established and verified under a
 
 #### On-boarding Steps
 
-As permissible, configuration information related to connections of EU DCC participant back-end systems will be provided by the EC to the WHO in order to facilitate establishing connections between EU DCC Trust Network Participants and the WHO Digital Health Trust Network infrastructure.  Otherwise, such configuration information will be shared directly by the eligible Trust Network Participant to the WHO
+As permissible, configuration information related to connections of EU DCC participant back-end systems will be provided by the EC to the WHO in order to facilitate establishing connections between EU DCC Trust Network Participants and the WHO Digital Health Trust Network infrastructure.  Otherwise, such configuration information will be shared directly by the eligible GDHCN Participant to the WHO
 
 
-* An eligible Trust Network Participant should submit its <a href="Letter_of_Application_Transitive_Trust.docx">Letter of Application using the Transitive Trust</a> procress to tng-secretariat@who.int.
-* Once eligibility is verified the eligible Trust Network Participant will be invited to submit a signed Trust Network Application Form (TO BE DEFINED) tng-secretariat@who.int with:
+* An eligible GDHCN Participant should submit its <a href="Letter_of_Application_Transitive_Trust.docx">Letter of Application using the Transitive Trust</a> process to gdhcn-secretariat@who.int.
+* Once eligibility is verified the eligible GDHCN Participant will be invited to submit a signed Trust Network Application Form (TO BE DEFINED) gdhcn-secretariat@who.int with:
     * the necessary information to connect to the production environment
     * attestation to comply with the Trust Network Terms of Participation.
 * After positively assessing the application form,  WHO will:
     * provide the necessary technical specifications and configuration information to connect to their back-end systems to the WHO TNG
-    * invite the Trust Network Participant to register their production certificates and promote them to the production environment.
+    * invite the GDHCN Participant to register their production certificates and promote them to the production environment.
 
 
 
 
 ### Full On-boarding Process
 
-This section describes the steps for the Full On-boarding Process (FOP)  to the GDHCN
+This section describes the steps for the Full On-boarding Process (FOP) to the GDHCN
 
 #### Period of Applicability
 The FOP will be in effect in September 2023.  
@@ -110,7 +110,7 @@ At launch of FOP at launch, for technical reasons, eligibility to join the GDHCN
 
 
 1. **Self-Assessment** Countries interested in joining the GDHCN should conduct a self-assessment using the provided checklist to ensure their system complies with the WHO's specifications. Eligible participants should adopt the same technical specifications described in the [On-boarding Checklist](concepts_onboarding_checklist.html) . Open source implementations should be utilized when possible.
-2. **Official Request**  If the self-assessment is successful, countries should submit a formal request to the WHO via an official letter expressing their interest in joining the GDHCN. The letter should include a description of the eligible Trust Network Participant's system and the completed checklist as an annex Upon receipt, the WHO will initiate the procedure to assess the eligible Trust Network Participant's system and determine if the on-boarding process can begin.
+2. **Official Request**  If the self-assessment is successful, countries should submit a formal request to the WHO via an official letter expressing their interest in joining the GDHCN. The letter should include a description of the eligible GDHCN Participant's system and the completed checklist as an annex Upon receipt, the WHO will initiate the procedure to assess the eligible GDHCN Participant's system and determine if the on-boarding process can begin.
 3. Steps for On-boarding
 
 
@@ -119,12 +119,12 @@ The organizational identity and contact will be established in an offline proces
 
 #### On-boarding Steps
 
-* An eligible Trust Network Participant should complete the [On-boarding Checklist](concepts_onboarding_checklist.html) to self-assess its readiness for the on-boarding process via the Technical Evaluation Form (TO BE DEFINED).
-* Eligible Trust Network Participants are invited to submit a signed <a href="Letter_of_Application_DDCC.docx">Letter of Application for DDCC by the Full Onboarding Process</a> with:
+* An eligible GDHCN Participant should complete the [On-boarding Checklist](concepts_onboarding_checklist.html) to self-assess its readiness for the on-boarding process via the Technical Evaluation Form (TO BE DEFINED).
+* Eligible GDHCN Participants are invited to submit a signed <a href="Letter_of_Application_DDCC.docx">Letter of Application for DDCC by the Full Onboarding Process</a> with:
     * the necessary information to connect to the production environment
-    * attestation to comply with the Trust Network Terms of Participation.
-* After positively assessing the Letter of Application and assessiung the Technical Evaluation Form,  WHO will:
-    * provide the necessary technical specifications and configuration information to connect to their back-end systems to the WHO TNG
-    * invite the Trust Network Participant to register their production certificates and promote them to the production environment.
+    * attestation to comply with the Terms of Participation.
+* After positively assessing the Letter of Application and assessing the Technical Evaluation Form, WHO will:
+    * provide the necessary technical specifications and configuration information to connect to their back-end systems to the WHO GDHCN Trust Network Gateway (TNG)
+    * invite the GDHCN Participant to register their production certificates and promote them to the production environment.
 
 

input/pagecontent/concepts_onboarding_checklist.md

@@ -51,7 +51,7 @@ As a transitive trust participant, you should limit the usage to http *GET* requ
 
 #### Full Onboarding
 
-For a successfull connection to the gateway using full onboarding, there are several steps to prepare:
+For a successful connection to the gateway using full onboarding, there are several steps to prepare:
 
  1) Certificates must be prepared for Acceptance Environment (self signed allowed) following the requirements in [Certificate Governance](concepts_certificate_governance.html)
     - Authentication: TNP<sub>TLS</sub>

input/pagecontent/concepts_onboarding_initialguideline_full.md

@@ -5,8 +5,8 @@ In order to start the onboarding participants need to Prepare Key Material Submi
 
 The main steps are:
 
-* The participant sets up a GitHub repository for each environment (UAT, Production).
-* The participant prepare their keys and push them to repository
+* The GDHCN Participant sets up a GitHub repository for each environment (UAT, Production).
+* The GDHCN Participant prepare their keys and push them to repository
 
  Please follow the steps described in the: [tng-participant-template](https://github.com/WorldHealthOrganization/tng-participant-template)
 and [README.md](https://github.com/WorldHealthOrganization/tng-participant-template/blob/main/README.md).

input/pagecontent/concepts_onboarding_process_full.md

@@ -33,7 +33,7 @@ In the following description the required steps are divided into three sections:
 
 ### Application and Verification
 
-**[1]** The eligible Trust Network Participant (TNP) has to submit its Statement of Interest [link to the form. [Document 5] ] to tng-support@who.int .
+**[1]** The eligible Trust Network Participant (TNP) has to submit its Statement of Interest [link to the form. [Document 5] ] to gdhcn-support@who.int .
 
 **[2 – 3]** WHO validates all provided data and verify that such a data follows WHO compliance with Trusted Network Terms of Participation (TOP 0 – 3) https://smart.who.int/trust/concepts.html as well as: Participant´s eligibility criteria, governmental entity/health agency, contact details of approvers and individuals. [See Elegibility Criteria]. [Document 16]
 

input/pagecontent/feedback.xml

@@ -5,7 +5,7 @@
   <ul>
     <li>Frequently asked questions can be viewed <a href="faq.html">here</a></li>
     <li>Clicking on one of the Feedbacks link to the right of any section header</li>
-    <li>Sending an email to <a href= "mailto:tng-support@who.int?subject = IG Feedback">tng-support@who.int</a></li>
+    <li>Sending an email to <a href= "mailto:gdhcn-support@who.int?subject = IG Feedback">gdhcn-support@who.int</a></li>
     <li>Creating an issue on GitHub <a href="{{ site.data.fhir.packageId | split: '.' | last | prepend: 'https://github.com/WorldHealthOrganization/' }}">{{ site.data.fhir.packageId | split: '.' | last }} repository</a></li>
   </ul>
 </div>