diff --git a/Assertion-Manager/installation.md b/Assertion-Manager/installation.md
index 787afb31076653e3699a7df5c40f65abd4720046..4cd4e94453ac59686c25a044762a68b94353ed94 100755
--- a/Assertion-Manager/installation.md
+++ b/Assertion-Manager/installation.md
@@ -3,8 +3,8 @@ title:  Installation Manual
 subtitle: Assertion Manager
 author: Jean-Francois LABBE
 function: Engineer
-date: 02/09/2016
-toolversion: 4.x
+date: 10/12/2019
+toolversion: 4.1.x
 version: 1.02
 status: Approved document
 reference: KER1-MAN-IHE-ASSERTION\_MANAGER\_INSTALLATION-1\_02
@@ -12,32 +12,24 @@ customer: IHE-EUROPE
 ---
 # Purpose
 
-Here is a guide to help you install Assertion Manager.
-# Requirements
+Here is a guide to help you installing Assertion Manager.
 
-* Debian squeeze or ubuntu 12.04 64bits with an Internet access.
-* Database : PostGresql 8.4
-* Java virtual machine : JDK 1.6 or other
-* Application server : Jboss 5.1.0-GA
-    * It must be installed in: `/usr/local/jboss`
-    * A server named gazelle must be here: `/usr/local/jboss/server/gazelle/`
+# Minimal Requirements
 
-To install those requirements you can run this as root: 
+* Debian squeeze or ubuntu 12.04 64bits or higher with an Internet access.
+* Database : Postgresql 9.1+
+* Java virtual machine : JDK 1.7
+* Application server : JBoss 7.2.0.
+    * It must be installed in: `/usr/local/jboss7`
 
-```bash
-wget https://gazelle.ihe.net/jenkins/job/gazelle-public-release/ws/gazelle-tm-ear/src/main/scripts/setup.sh
-chmod +x setup.sh
-./setup.sh
-```
+To install those requirements you can refer to the documentation of installation of JBoss : [*General Requirements JBOSS 7*](https://gazelle.ihe.net/gazelle-documentation/General/jboss7.html)
 
 # Quick start
 
-Assertion manager can be installed 
-
-As a gazelle user on your server:
+Assertion manager has to be installed as a gazelle user on your server:
 
 ```bash
-wget https://gazelle.ihe.net/jenkins/job/AssertionManager-Gui-SNAPSHOT/ws/install_assertion_manager_gui.sh
+wget https://gitlab.inria.fr/gazelle/applications/test-design/AssertionManager/blob/master/install_assertion_manager_gui.sh
 chmod +x install_assertion_manager_gui.sh
 sudo install_assertion_manager_gui.sh
 ```
@@ -45,63 +37,19 @@ sudo install_assertion_manager_gui.sh
 It will: 
 
 * Backup the previous EAR
-* Get the latest released version of Assertion Manager and deploy it in your jboss.
-* Create the database if it doesn't exists.
+* Get the latest released version of Assertion Manager and deploy it in your JBoss server.
+* Create the database if it doesn't exist.
 
 ## Insert configuration values
 
-Go to [*insert configuration values chapter*](https://gazelle.ihe.net/content/configurationsValues) to configure your Assertion manager
-
-## Restart Jboss service
-```bash
-sudo service jboss restart
-```
-
-**Assertion manager is now deployed.**
-
-# Compile from sources
-
-The following chapters will explain how to build and configure Assertion manager from sources.
-
-This is useful only to change the database configuration.
-
-Assertion Manager is an open source project under Apache2 licence. The sources are available on the INRIA's Forge:
-```bash
-sudo apt-get install maven2 git
-git clone https://gitlab.inria.fr/gazelle/applications/test-design/AssertionManager.git assertion-manager-gui
-git clone https://gitlab.inria.fr/gazelle/applications/test-design/AssertionManager.git assertion-manager
-cd assertion-manager
-mvn clean install
-cd ../assertion-manager-gui
-mvn clean package -U -Pproduction
-```
-
-If maven cannot download dependencies checkout the maven configuration guide: [*https://gazelle.ihe.net/content/development-support-tools*](https://gazelle.ihe.net/content/development-support-tools)
-
-## Database creation and initialization
-
-The names of the databases are defined in the pom.xml file. Use the following commands with the adaptations you want:
-```bash
-su postgres
-psql
-postgres=\# CREATE USER gazelle;
-postgres=\# ALTER USER gazelle WITH ENCRYPTED PASSWORD 'password';
-postgres=\# CREATE DATABASE "assertion-manager" OWNER gazelle ENCODING UTF-8;
-postgres=\# CREATE DATABASE "assertion-manager-gui" OWNER gazelle ENCODING UTF-8;
-postgres=\# \\q
-exit
-```
-
-### Insert configuration values
-
-Configuration can be done through the Administration interface, or with a sql script
+Configuration can be done through the Administration interface or with an sql script.
 
 Each time a configuration is modified, the application needs to be restarted.
 
-To restart the application there are 2 options:
+To restart the application, there are 2 options:
 
 * Restart jboss: *sudo service jboss restart*
-* Touch the ear: *touch /pathToJbossServer/deploy/AssertionManagerGui.ear*
+* Touch the ear: *touch /usr/local/jboss7/standalone/deployments/AssertionManagerGui.ear*
 
 ![](./media/application_preference_menu.png)
 
@@ -126,19 +74,19 @@ Here is the list of configuration variables that must be defined: 
 | X-WebKit-CSP-Report-Only                  | Use X-Content-Security-Policy-Report-Only values | |
 | X-Content-Security-Policy-Report-Only     | default-src self \*.ihe-europe.net; script-src self unsafe-eval unsafe-inline ; style-src self unsafe-inline ; |  https://developer.mozilla.org/en-US/docs/Web/Security/CSP/Using_Content_Security_Policy |
 | sql_injection_filter_switch               | true |  Enable sql injection filtering|
-| gazelle_test-managment-url                | https://server_domain:8080/gazelle/rest/ | points to gazelle test managment rest interface|
+| gazelle_test-management-url               | https://server_domain:8080/gazelle/rest/ | points to gazelle test management rest interface|
 | application_documentation                 | https://gazelle.ihe.net/content/assertion-manager| |
 | documentation_url                         | https://gazelle.ihe.net/content/assertion-manager| |
 | application_release_notes_url             | https://gazelle.ihe.net/jira/browse/AS#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel | |
 | application_issue_tracker_url             | https://gazelle.ihe.net/browse/EVSCLT| URL of the project in the issue tracking system |
 
-To insert values with a sql script, connect to the database
+To insert values with an sql script, connect to the database :
 ```bash
 su postgres
 psql assertion-manager-gui
 ```
 
-Then copy paste the folowing script:
+Then copy paste the following script:
 ```sql
 SET statement\_timeout = 0;
 SET lock\_timeout = 0;
@@ -202,9 +150,42 @@ INSERT INTO app\_configuration VALUES (20, 'https://gazelle.ihe.net/content/asse
 INSERT INTO app\_configuration VALUES (21, 'https://gazelle.ihe.net/jira/browse/AS\#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel', 'application\_release\_notes\_url');
 ```
 
+# Compile from sources
+
+The following chapters will explain how to build and configure Assertion Manager from sources.
+
+This is useful only to change the database configuration.
+
+Assertion Manager is an open source project under Apache2 licence. The sources are available in the INRIA's Gitlab project :
+```bash
+sudo apt-get install maven2 git
+git clone https://gitlab.inria.fr/gazelle/applications/test-design/AssertionManager.git assertion-manager-gui
+git clone https://gitlab.inria.fr/gazelle/applications/test-design/AssertionManager.git assertion-manager
+cd assertion-manager
+mvn clean install
+cd ../assertion-manager-gui
+mvn clean package -U -Pproduction
+```
+
+If maven cannot download the required dependencies, checkout the maven configuration guide: [*https://gazelle.ihe.net/content/development-support-tools*](https://gazelle.ihe.net/content/development-support-tools)
+
+## Database creation and initialization
+
+The name of the databases are defined in the pom.xml file. Use the following commands with the adaptations you want:
+```bash
+su postgres
+psql
+postgres=\# CREATE USER gazelle;
+postgres=\# ALTER USER gazelle WITH ENCRYPTED PASSWORD 'password';
+postgres=\# CREATE DATABASE "assertion-manager" OWNER gazelle ENCODING UTF-8;
+postgres=\# CREATE DATABASE "assertion-manager-gui" OWNER gazelle ENCODING UTF-8;
+postgres=\# \\q
+exit
+```
+
 ## Compile
 
-Before compiling, go to the directory gazelle-tm and edit the file pom.xml. Open this file and adapt the properties of profile prod to your case :
+Before compiling, go into gazelle-tm's directory and edit the file pom.xml. Open this file and adapt the properties of prod profile to your needs :
 
 * jdbc.connection.url : jdbc:postgresql:assertion-manager-gui
 * jdbc.connection.url2 : jdbc:postgresql:assertion-manager
@@ -223,10 +204,10 @@ The archive (EAR) and the distribution file are created and placed into assertio
 
 ## Deployment
 
-Copy the AssertionManagerGui.ear into the "server/gazelle/deploy" directory of your JBoss server. Finally, start your server.
+Copy the AssertionManagerGui.ear into the "/usr/local/jboss7/standalone/deployments" directory of your JBoss server. Finally, start your server.
 
 When the application is deployed, open a browser and go to http://yourserver/AssertionManagerGui.
 
-If the deployment and the database initialization are successful you should see the home page.
+If the deployment and the database initializations are successful, you should see the home page.
 
 ![](./media/home_page.png)
diff --git a/Authentication-Simulator/installation.md b/Authentication-Simulator/installation.md
index e0fb214099763b817aaf4f6a2d8c9f3513d5ef17..0007f3d5ac2238aae44911b7568e0362dce84b4c 100644
--- a/Authentication-Simulator/installation.md
+++ b/Authentication-Simulator/installation.md
@@ -3,8 +3,8 @@ title:  Installation Manual
 subtitle: Authentication Simulator
 author: Malo TOUDIC
 function: Developer
-date: 2019-09-17
-toolversion: 0.1.1
+date: 2019-12-10
+toolversion: 0.1.x
 version: 1.0
 status: Approved
 reference: KER1-MAN-IHE-AUTHENTICATION_SIMULATOR_INSTALLATION
@@ -17,7 +17,7 @@ Authentication Simulator is an open-source project under Apache License Version
 
 The latest public packaged release can be downloaded from our Nexus repository [https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~authentication-simulator-ear](https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~authentication-simulator-ear) (search for **authentication-simulator-X.X.X.ear**) for Authentication Simulator and [https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~idp-adapter-ear](https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~idp-adapte-ear) (search for **idp-adapte-X.X.X.ear**) for the IDP Adapter.
 
-If you need for any reason a more recent version (hotfix, experimental feature...), The public packaged application of our development trunk can be found at [https://gazelle.ihe.net/jenkins/job/authentication-simulator/ws/authentication-simulator-ear/target/authentication-simulator.ear](https://gazelle.ihe.net/jenkins/job/authentication-simulator/ws/authentication-simulator-ear/target/authentication-simulator.ear). This package can be unstable. The IDP Adapter ear can be found in the same directory.
+If you need for any reason a more recent version (hotfix, experimental feature...), the public packaged application of our development trunk can be found at [https://gazelle.ihe.net/jenkins/job/authentication-simulator/ws/authentication-simulator-ear/target/authentication-simulator.ear](https://gazelle.ihe.net/jenkins/job/authentication-simulator/ws/authentication-simulator-ear/target/authentication-simulator.ear). This package can be unstable. The IDP Adapter ear can be found in the same directory.
 
 # Installation
 
@@ -25,7 +25,7 @@ If you are installing a Gazelle tool for the first time in your environment, mak
 
 ## Database creation
 
-Your database must have a user **gazelle**
+Your database must have a user **gazelle** :
 
 1.  Connect to your database
 ```bash
@@ -41,16 +41,16 @@ CREATE DATABASE "authentication-simulator" OWNER gazelle ENCODING 'UTF8' ;
 
 To deploy Authentication :
 
-1. Download the ear from our Nexus repository
+1. Download the ear file from our Nexus repository
 
-1.  Paste the archive **authentication-simulator.ear** in the JBoss deployment directory `${JBOSS7\_HOME}/standalone/deployments/`
+1. Paste the archive **authentication-simulator.ear** in the JBoss deployment directory `${JBOSS7\_HOME}/standalone/deployments/`
 
-1.  Display JBoss server logs, start JBoss and wait for **ear** deployment.
+1. Display JBoss server logs, start JBoss and wait for **ear** deployment.
 
-1.  The application can be browsed at [http://localhost:8080/authentication-simulator](http://localhost:8080/authentication-simulator)
-_Port could also be different whether you have modified the JBoss configuration._
+1. The application can be browsed at [http://yourserver/authentication-simulator](http://yourserver/authentication-simulator)
+_Port could also be different whether you have modified the JBoss server configurations or not._
 
-Authentication Simulator needs an another ear to parse the shibboleth logs. This ear does not need a database, just put the ear in a jboss. This ear need to be installed in the same machine as Shibboleth IDP but not necessarily the same machine as Authentication Simulator.
+Authentication Simulator needs an another ear to parse the shibboleth logs. This ear does not need a database, just put the ear in a jboss. This ear needs to be installed in the same machine as Shibboleth IDP but not necessarily in the same machine as Authentication Simulator.
 
 ## Application configuration
 
@@ -58,9 +58,9 @@ Authentication Simulator needs an another ear to parse the shibboleth logs. This
 
 1. Unzip the archive
 
-1. Edit the application_url value in init.sql. You might also want to edit application_works_without_cas and the idp_adapter_wsdl_endpoint
+1. Edit the application_url value in init.sql. You might also want to edit application_works_without_cas and the idp_adapter_wsdl_endpoint configurations.
 
-1.  From the bash, update the application configuration by running :
+1. From the bash, update the application configuration by running :
 ```bash
 psql -U gazelle authentication-simulator < init.sql
 ```
diff --git a/CDA-Generator/installation.md b/CDA-Generator/installation.md
index 8de1ee2c6349ba853bd8a7c90fdbc7c50fb463e6..cc708a42f03a27ad6e972cd63c37e8bd2410fb17 100755
--- a/CDA-Generator/installation.md
+++ b/CDA-Generator/installation.md
@@ -3,8 +3,8 @@ title:  Installation manual
 subtitle: CDA Generator
 author: Abderrazek BOUFAHJA
 function: Engineer
-date: 22/12/2016
-toolversion: 2.1.x
+date: 10/12/2019
+toolversion: 2.2.x
 version: 1.03
 status: approved document
 reference: KER1-MAN-IHE-CDA_GENERATOR_INSTALLATION-1_03
@@ -13,11 +13,11 @@ customer: IHE-EUROPE
 
 # CDAGenerator - Installation & Configuration
 
-Here is a guide to help you installing CDAGenerator
+Here is a guide to help you installing CDAGenerator.
 
 ## Requirements
 
-* Debian squeeze or ubuntu 12.04 64bits with an Internet access.
+* Debian squeeze or ubuntu 12.04 64bits or higher with an Internet access.
 * Database : PostGresql 9.1+
 * Java virtual machine : JDK 1.7
 * Application server : Jboss 7.2.0. It must be installed in: `/usr/local/jboss7`
@@ -31,7 +31,7 @@ To install those requirements you can refer to the documentation of installation
 3. Execute on the root of the project : `mvn clean install`
 4. Create a database : cda-generator, in postgresql (createdb -U gazelle -EUTF8 cda-generator)
 5. Copy the ear from CDAGenerator-ear/target/CDAGenerator.ear to /usr/local/jboss7/standalone/deployment/
-6. Start your jboss and access to http://localhost:port/CDAGenerator
+6. Start your JBoss server and access to http://localhost:port/CDAGenerator
 
 ## Folder Creation
 
@@ -66,7 +66,7 @@ To insert values you can connect to the database
 psql -U gazelle cda-generator
 ```
 
-Then copy paste the folowing script:
+Then copy paste the following script:
 
 ```--
 -- PostgreSQL database dump
@@ -212,7 +212,7 @@ INSERT INTO cmn\_application\_preference VALUES (49, 'scorecard_next_index', '1'
 
 ## Compile
 
-Before compiling, go to the directory CDAGenerator and edit the file pom.xml. Open this file and adapt the properties of profile 'prod' to your case :
+Before compiling, go to the CDAGenerator's project directory and edit the file pom.xml. Open this file and adapt the properties of profile 'prod' to your case :
 
 * jdbc.connection.url : jdbc:postgresql:cda-generator
 
@@ -225,7 +225,7 @@ cd CDAGenerator
 mvn clean package
 ```
 
-The archive (EAR) and the distribution file are created and placed into CDAGenerator /CDAGenerator-ear/target directory.
+The archive (EAR) and the distribution file are created and placed into CDAGenerator/CDAGenerator-ear/target directory.
 
 ## Deployment
 
@@ -233,56 +233,57 @@ Copy the CDAGenerator.ear into the "standalone/deployments" directory of your JB
 
 When the application is deployed, open a browser and go to **http://yourserver/CDAGenerator**.
 
-If the deployment and the database initialization are successful you should see the home page.
+If the deployment and the database initializations are successful, you should see the home page of the tool.
 
 # Configuration of the documentation of MBV
 
 The administrator is able to configure the documentation of the validation constraints and rules
 
-First the user shall be logged in as an administrator.
+First, the user shall be logged in as an administrator.
 
-Then, go to administration -&gt; Constraints Management -&gt; Constraints-admin
+Then, go to Administration &gt; Constraints Management &gt; Constraints-admin
 
 ![](./media/image28.png)
 
-The user shall then upload the XML file, generated from the model of constraints, into the tool using the button "Add" (see screenshot above).
+The user shall then upload the XML file generated from the model of constraints into the tool using the button "Add" (see screenshot above).
 
-After the upload is complete, click on the button "Delete and Generate". This button will delete all the constraints related to packages that are mentionned into the uploaded XML file. If there are some constraints related to other packages, there will not be deleted. All the information into the XML document are inserted in the database of the tool.
+After the upload process is complete, click on the button "Delete and Generate". This button will delete all the constraints related to packages that are mentioned in the uploaded XML file. If there are some constraints related to other packages, there will not be deleted. 
+All the informations of the XML document are inserted in the database of the tool.
 
 # CDA Generator – Configuration of BBR
 
-This part is for administrators of CDAGenerator.
+This part is dedicated to administrators of CDAGenerator.
 
-To access to the BBR configuration page you need to go to menu -> Administration -> Building Block Repository
+To access the BBR configuration pag,e you need to go to the  menu Administration > Building Block Repository
 
 ![](./media/image29.png)
 
-A BBR is the export coming from ART-DECOR in HL7 Templates format. This tool allows to generate validators based on this export, and using Gazelle ObjectsChecker technology. You can find in the paragraph [references](#references), some references to the documentation of both Gazelle ObjectsChecker and ART-DECOR.
+A BBR is the export coming from ART-DECOR in HL7 Templates format. This tool allows to generate validators based on this export and using Gazelle ObjectsChecker technology. You can find in the paragraph [references](#references), some references to the documentation of both Gazelle ObjectsChecker and ART-DECOR.
 
 The main idea regarding the definition of the BBRs in CDA is to compile them and to deploy them. You are able to create a new BBR using the button "Create BBR" :
 
 ![](./media/image30.png)
 
-You need to specify the name of your validation tool, also you need to specify the link to the BBR. You can provide the xml export as a file, and upload it, or you can provide an URL to the BBR.
+You need to specify the name of your validation tool and the link to the BBR as well. You can provide the xml export as a file and upload it, or you can provide an URL to the BBR.
 
 Example of URL : https://art-decor.ihe-europe.net/decor/services/RetrieveProject?prefix=IHE-EYE-SUM-&version=&mode=verbatim&language=en-US&download=true&format=xml
 
-The checkbox "Is Active?" is to expose the BBR for the validation or not.
+The checkbox "Is Active?" is used to expose the BBR for the validation or not.
 
-In the table we have six buttons in the "Actions" column :
+In the table, we have six buttons in the "Actions" column :
 
 * View: Allows to view the information related to the BBR
 * Edit: Redirects to the edition page of the BBR
 * Delete: Deletes the BBR from the database, it does not delete the validator from the server
 * Download: Allows to download the BBR, not the validator
 * Compile: Allows to compile the BBR and to create the validator
-* Deploy documentation:  Allows to deploy the documentation in CDAGenerator. The documentation will be seen in [*Constraint Documentation*](http://yoursever/CDAGenerator/docum/constraints/constraints.seam)
+* Deploy documentation:  Allows to deploy the documentation in CDAGenerator. The documentation will be located in [*Constraint Documentation*](http://yoursever/CDAGenerator/docum/constraints/constraints.seam)
 
 We can filter BBRs using the filter part of the page :
 
 ![](./media/image31.png)
 
-The parameter of filtering are :
+The parameters used in filters are :
 
 * Validator name
 * Version : version of the validator
@@ -306,7 +307,7 @@ The workflow for the Administrator is described by this sequence diagram :
 
 ## Validators on the server
 
-When you click on the button "Validate" the application executes on the server the generation of the validation tool based on the BBR uploaded on the tool. The default folder used is in this case is **/opt/CDAGenerator/BBR**. You can customize this location by changing the preference of the application named "bbr_folder".
+When you click on the button "Validate" the application executes on the server the generation of the validation tool based on the BBR uploaded in the tool. The default folder used in this case is **/opt/CDAGenerator/BBR**. You can customize this location by changing the preference of the application named "bbr_folder".
 The architecture of this folder is described below:
 
 BBR
@@ -365,8 +366,8 @@ BBR
   * The __execs__ folder contains the current executable used for the validation.
   * The __archive__ folder contains the list of zip generated through the tool. When you click on the "compile" button from the BBR  manager page, you create a zip file archived in archive folder, and unzipped in exec folder.
 * The folder __generator__ contains the generator used to generate the validators based on the BBR URL. This generator can be used outside the CDAGenerator tool. In the same way, the generated validators can be used outside the CDAGenerator tool, as a standalone validation tool. The generated validators contains three main folders : __bin__, __repo__ and __documentation__.
-  * __bin__ folder contains an executable  : validator.sh and validator.bat. This
-executable is used by CDAGenerator during the validation of CDA documents.
+  * __bin__ folder contains an executable  : validator.sh and validator.bat. 
+  This executable is used by CDAGenerator during the validation of CDA documents.
   * __repo__ folder contains a list of jars used by the validator.sh.
   * __documentation__ folder contains a the documentation that needs to be deployed in CDAGenerator, in XML format.
 
@@ -388,12 +389,12 @@ executable is used by CDAGenerator during the validation of CDA documents.
 
 The validators describer is a link between the documentation and the validators. This allows us to have an architecture of the validators.
 
-To access this page you need to go to menu Administration -> Validators Packages
+To access this page you need to go to menu Administration > Validators Packages :
 
 ![](./media/image35.png)
 
-This page is for the administrator of the tool. It represents an association between validators and packages of documentation. For each association we have
-an id, the validator name, the list of the validator's parents, and the list of packages directly related to the validator. The complete list of packages related to
+This page is for the administrators of the tool. It represents an association between validators and packages of documentation. For each association we have
+an id, the validator name, the list of the validator's parents and the list of packages directly related to the validator. The complete list of packages related to
 a validator is the concatenation of the direct related packages, and the sum of all the packages list related to the parents, grand-parents (and so) of the validator.
 You can create a new validator association by clicking on the button "Create Validator association".
 
diff --git a/Demographic-Data-Server/installation.md b/Demographic-Data-Server/installation.md
index 44e587102bf59f14742f36bb7ed86f489d26ea55..6330b220b516dc3e9f82ea360ff5ac792d513932 100644
--- a/Demographic-Data-Server/installation.md
+++ b/Demographic-Data-Server/installation.md
@@ -2,7 +2,7 @@
 title:  Installation Manual
 subtitle: Demographic Data Server
 author: Maxime ARIF
-date: 19/03/2019
+date: 10/12/2019
 toolversion: 4.2.x
 function: Engineer
 version: 1.02
@@ -12,37 +12,37 @@ customer: IHE-EUROPE
 ---
 # Sources and package
 
-Demographic Data Server is a maven project. Sources are available on the INRIA Source Forge at the following URL:
+Demographic Data Server is a Maven project. Sources are available on the INRIA's Gitlab project at the following URL :
 
 [*https://gitlab.inria.fr/gazelle/applications/test-design/DemographicDataServer.git*](https://gitlab.inria.fr/gazelle/applications/test-design/DemographicDataServer.git)
 
-If you'd like to checkout the sources on your system you might want to use the following svn command, provided subversion is installed on your system.
+If you would like to checkout the sources on your system you might want to use the following git command, provided git is installed on your system.
 
 ```bash
 git clone https://gitlab.inria.fr/gazelle/applications/test-design/DemographicDataServer.git
 ```
 
-Note that the latest executable can be extracted from our nexus repository as well  at
+Note that the latest executable can be extracted from our nexus repository as well at :
 [*Nexus Repository Manager*](https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~DemographicDataServer-ear).
 
-**Important**, if you download the **ear** from Nexus it will have a name such as `DemographicDataServer-ear-X.X.X.ear`, then be sure to rename it to `DemographicDataServer.ear` otherwise the deployment will fail.
+**Important**, if you download the **ear** from Nexus, it will have a name such as `DemographicDataServer-ear-X.X.X.ear`. Then be sure to rename it to `DemographicDataServer.ear` otherwise the deployment will fail.
 
 # Installation
 
-This tool is to be installed in a Jboss 7.2 application server and runs with a PosgreSQL database.
+This tool has to be deployed  using a JBoss 7.2 application server and runs with a PostgreSQL database.
 
-If you do not have yet a Jboss installed in your environment, proceed as described in [General consideration page](https://gazelle.ihe.net/gazelle-documentation/General/jboss7.html).
+If you do not have yet a JBoss server installed in your environment, proceed as described in [General consideration page](https://gazelle.ihe.net/gazelle-documentation/General/jboss7.html).
 
 ## Database creation
 
-Your database must have a user **gazelle**.
+Your database must have a user named **gazelle**.
 1. Download the SQL scripts archive from [*Nexus Repository Manager*](https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~DemographicDataServer-ear) (search for **DemographicDataServer-ear-X.X.X-sql.zip**).
 2. Unzip the archive into a folder `DemographicDataServer-sql`
-3. Connect to your database
+3. Connect to your database :
 ```bash
 psql -U gazelle
 ```
-4. Excute the SQL statement to create the database.
+4. Execute the SQL statement to create the database.
 ```sql
 CREATE DATABASE "demographic-data-server" OWNER gazelle ENCODING UTF8 ;
 ```
@@ -65,15 +65,15 @@ Database name : demographic-data-server
 
 # Update from a previous version
 
-1. Download the new **ear** and its associated update SQL script from our [*Nexus Repository Manager*](https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~DemographicDataServer-ear) (search for **DemographicDataServer-X.X.X.ear** and **DemographicDataServer-X.X.X-sql.zip**). Not each version has an update sql to execute.
+1. Download the new **ear** and its associated update SQL script from our [*Nexus Repository Manager*](https://gazelle.ihe.net/nexus/index.html#nexus-search;quick~DemographicDataServer-ear) (search for **DemographicDataServer-X.X.X.ear** and **DemographicDataServer-X.X.X-sql.zip**). Not each version has an update sql script to execute.
 
-1. Unzip the SQL archive
+1. Unzip the SQL archive.
 
 1. Execute SQL statements. Check that the database is correctly updated.
 
 1. Deploy the new **ear**
 
-**Due to the update mechanism of the database, it is important to not skip any version of the application in an overall update. You cannot go directly from 2.0.0 to 2.3.0, you will have to repeat the process from 2.0.0 to 2.0.1, 2.0.2, 2.0.3 and so on.**
+**Due to the update mechanism of the database, it is important to do not skip any version of the application in an overall update. You cannot go directly from 2.0.0 to 2.3.0 : you will have to repeat the process from 2.0.0 to 2.0.1, 2.0.2, 2.0.3 and so on.**
 
 # Configuration
 
diff --git a/EVS-Client/installation.md b/EVS-Client/installation.md
index 58449b3899fe25d9910beca775db4d8e9fa25b80..2be23a634374fa3dfdf9cbe4908c181edcbc084d 100644
--- a/EVS-Client/installation.md
+++ b/EVS-Client/installation.md
@@ -3,7 +3,7 @@ title:  Installation Manual
 subtitle: EVS Client
 author: Eric Poiseau
 function: IHE Europe Technical Project Manager
-date: 4/11/2019
+date: 10/12/2019
 toolversion: 5.12.x
 version: 1.03
 status: Approved document
@@ -13,25 +13,24 @@ customer: IHE-EUROPE
 
 # EVSClient - Installation & Configuration
 
-External Validation Service Front-end is a maven project which calls several the web services exposed by the Gazelle tools to validate messages and documents.
-It may also be used to access validation services compliant to the [*GITB3*](https://www.nen.nl/GITB/Test-Beds.htm) specifications. 
+External Validation Service Front-end is a Maven project which calls several the web services exposed by the Gazelle tools to validate messages and documents.
 
 ## Sources
 
-Sources of this project are available on the INRIA GitLab; sources are managed using git. An anonymous access is available if you only want to checkout the sources (read-only access). If you intent to build the tool and to install it on your own server, we recommand to use a tagged version; not the trunk which is the development branch.
+Sources of this project are available on the INRIA GitLab; sources are managed using git. An anonymous access is available if you only want to checkout the sources (read-only access). If you intend to build the tool and to install it on your own server, we recommend you to use a tagged version; not the trunk which is the development branch.
 
 ```bash
 git clone --branch "TAG_VERSION" https://gitlab.inria.fr/gazelle/applications/test-execution/validator/EVSClient.git
 ```
 
-To retrieve the current version of the tool, consult the release notes of the project in [*Jira*](https://gazelle.ihe.net/jira/browse/EVSCLT#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel).
+To retrieve the current version of the tool, take a look into the release notes of the project in [*Jira*](https://gazelle.ihe.net/jira/browse/EVSCLT#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel).
 
 Before compiling the application for the first time, you might want have to update the pom.xml file of the parent project (EVSClient) in order to configure the database connection. 
 
 ## Maven artifact
 
 Each version of the tool is published in our Nexus repository, download the latest release
-from [*here*](https://gazelle.ihe.net/nexus/index.html#nexus-search;gav%7E%7EEVSClient-ear%7E%7E%7E). Be carreful, this
+from [*here*](https://gazelle.ihe.net/nexus/index.html#nexus-search;gav%7E%7EEVSClient-ear%7E%7E%7E). Be careful, this
 released artifact is configured to connect to a database named evs-client-prod and owned by user gazelle.
 
 ## Installation
@@ -39,14 +38,14 @@ released artifact is configured to connect to a database named evs-client-prod a
  **WARNING** : From version 5.11.1, datasources have been extracted from the **ear**. The template file can be found in /src/main/application/datasource in the source or in the file EVSClient-X.X.X-datasource.zip from the nexus.
 For more informations about how to manage that externalization, please refer to [general considerations for JBoss7](https://gazelle.ihe.net/gazelle-documentation/General/jboss7.html).
 
-
 Datasource name : EVSClientDS
 
 Database name : evs-client-prod
 
-Once you have retrieved the archive, copy it to your JBoss7 server in the ``standalone/deployments`` directory. Be carreful, the file copied in this folder shall be named ``EVSClient.ear``. This means you may have to rename the file before copying it.
 
-EVS Client, when deploying, will try to connect to a postgresql database named *evs-client-prod* and owned by the user *gazelle*. Make sure that the database exists before starting Jboss7.
+Once you have retrieved the archive, copy it to your JBoss7 server in the ``standalone/deployments`` directory. Be careful, the file copied in this folder shall be named ``EVSClient.ear``. This means you may have to rename the file before copying it.
+
+EVSClient, when deploying, will try to connect to a Postgresql database named *evs-client-prod* and owned by the user *gazelle*. Make sure that the database exists before starting JBoss7.
 
 
 ```bash
@@ -54,16 +53,16 @@ cp EVSClient-ear-${version}.ear /usr/local/jboss7/standalone/deployments/EVSClie
 ```
 Users of the EVSClient tool will upload files to be validated on the server, those files are stored in the file system in specific directories. `
 Only the root of the main directory is configured in the database. Under debian-like systems, we usually store those files at /opt/EVSClient\_prod. A ZIP
-file is available  [*https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.0.2/EVSClient-ear-5.X.X-dist.zip*](https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.0.X/EVSClient-ear-5.0.X-dist.zip),
+file is available at [*https://gazelle.ihe.net/nexus/#nexus-search;quick~EVSClient*](https://gazelle.ihe.net/nexus/#nexus-search;quick~EVSClient)(search for the last released **EVSClient-X.X.X-dist.zip**)
 that you can unzip in order to easily create all the required directories, starting at /opt.
 
 ```bash
-wget -nv -O /tmp/EVSClient-dist.zip "[*https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.0.2/EVSClient-ear-5.X.X-dist.zip*](https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.0.2/EVSClient-ear-5.X.X-dist.zip)"
+wget -nv -O /tmp/EVSClient-dist.zip "[*https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.X.X/EVSClient-ear-5.X.X-dist.zip*](https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.0.2/EVSClient-ear-5.X.X-dist.zip)"
 unzip /tmp/EVSClient-dist.zip -d /
 ```
 
 To finalize the installation, you must run the script which initializes the application preferences. A SQL script is
-available [*https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.0.2/EVSClient-ear-5.X.X-sql.zip*](https://gazelle.ihe.net/nexus/service/local/repositories/releases/content/net/ihe/gazelle/EVSClient-ear/5.0.2/EVSClient-ear-5.X.X-sql.zip), edit it and check its content before running it.
+available at [*https://gazelle.ihe.net/nexus/#nexus-search;quick~EVSClient*](https://gazelle.ihe.net/nexus/#nexus-search;quick~EVSClient)(search for the last released **EVSClient-X.X.X-dist.zip**), edit it and check its content before running it.
 
 In order to take into account the new preferences, the application SHALL be restarted, once the sql script is executed.
 
@@ -93,7 +92,7 @@ The following sections explain how to configure the tool.
 
 ## Application preferences
 
-Users with admin\_role role can access the application preference section through the menu **Administration --&gt; Manage application preferences**.
+Users with admin\_role role can access the application preferences section through the menu **Administration --&gt; Manage application preferences**.
 
 ![List of application preferences](./media/installation/manage-preferences.png)
 
@@ -127,7 +126,7 @@ The table below summarizes the preferences which are used by the tool along with
 | application\_database\_initialization\_flag  | database\_successfully\_initialized                     | Indicates that the DB has been initialized                                                   |
 | application\_issue\_tracker\_url             | https://gazelle.ihe.net/browse/EVSCLT                   | URL of the project in the issue tracking system                                              |
 | application\_url                             | http://localhost:8080/EVSClient                         | URL to reach the tool                                                                        |
-| assertion_manager_url                         | https://gazelle.ihe.net/AssertionManagerGui           | URL to the Gazelle Assertion Manager Application |
+| assertion_manager_url                        | https://gazelle.ihe.net/AssertionManagerGui             | URL to the Gazelle Assertion Manager Application                                             |
 | atna\_repository                             | /opt/EVSClient\_prod/validatedObjects/ATNA              | Where to store ATNA messages                                                                 |
 | cas\_enabled                                 | false                                                   | Indicates authentication mechanism to use                                                    |
 | cas\_url                                     | Not defined                                             | URL of the CAS service                                                                       |
@@ -136,9 +135,9 @@ The table below summarizes the preferences which are used by the tool along with
 | dicom\_scp\_screener\_xsl                    | dicom/TestDicomResults.xsl                              | XSL used to display Dicom SCP Screener results                                               |
 | display\_SCHEMATRON\_menu                    | false                                                   | Indicates if we need a link to the list of schematrons for download                          |
 | dsub\_repository                             | /opt/EVSClient\_prod/validatedObjects/DSUB              | Where to store DSUB files                                                                    |
-| epsos\_repository\_codes                     | /opt/EVSClient\_prod/bin/EpsosRepository                | path to epsos codes for epsos-cda-display-tool                                               |
-| gazelle\_hl7v2\_validator\_url               | https://gazelle.ihe.net/GazelleHL7Validator              | Path to Gazelle HL7 Validator                                                                |
-| gazelle\_home\_path                          | /opt/EVSClient\_prod                                    | Absolute path to Gazelle home. Here is where are stored generated datas, reports and other required binaries for application|
+| epsos\_repository\_codes                     | /opt/EVSClient\_prod/bin/EpsosRepository                | Path to epsos codes for epsos-cda-display-tool                                               |
+| gazelle\_hl7v2\_validator\_url               | https://gazelle.ihe.net/GazelleHL7Validator             | Path to Gazelle HL7 Validator                                                                |
+| gazelle\_home\_path                          | /opt/EVSClient\_prod                                    | Absolute path to Gazelle home. Here is where are stored generated data, reports and other required binaries for application|
 | hl7v3\_repository                            | /opt/EVSClient\_prod/validatedObjects/HL7v3             | Where to store HL7v3 messages                                                                |
 | hpd\_repository                              | /opt/EVSClient\_prod/validatedObjects/HPD               | Where to store HPD messages                                                                  |
 | include\_country\_statistics                 | true                                                    | Authorize or not the application to query geoip to retrieve the countries the users are from |
@@ -148,21 +147,21 @@ The table below summarizes the preferences which are used by the tool along with
 | number\_of\_segments\_to\_display            | 40                                                      | Number of segment to display when displaying HL7v2 messages                                  |
 | object\_for\_validator\_detector\_repository | /opt/EVSClient\_prod/validatedObjects/validatorDetector | path to the repository where object for validator\_detector are stored                       |
 | pdf\_repository                              | /opt/EVSClient\_prod/validatedObjects/PDF               | Where to store PDF files                                                                     |
-| reports_path                                 | reports                                                 | Path to jasper reports in gazelle home
+| reports_path                                 | reports                                                 | Path to jasper reports in gazelle home                                                       |
 | root\_oid                                    | 1.2.3                                                   | Root of the OID used to uniquely identify validation requests                                |
 | saml\_repository                             | /opt/EVSClient\_prod/validatedObjects/SAML              | Where to store SAML assertions                                                               |
-| show\_logs\_from\_colleagues             | false                     | Set to true if you would like users from the same organization to share logs  |
+| show\_logs\_from\_colleagues                 | false                                                   | Set to true if you would like users from the same organization to share logs                 |
 | svs\_repository                              | /opt/EVSClient\_prod/validatedObjects/SVS               | Where to store SVS messages                                                                  |
 | time\_zone                                   | Europe/Paris                                            | Time zone to display time to users                                                           |
 | tls\_repository                              | /opt/EVSClient\_prod/validatedObjects/TLS               | Where to store certificates                                                                  |
-| x_validation_editor | true | if true the Cross validator editor can be called from the menu |
-| x_validation_enabled                         | false                                                     | Set to true to enable the Cross Validation components |
-| x_validation_validator  | true | if true the Cross validator validaiton can be called from the menu|
+| x_validation_editor                          | true                                                    | if true the Cross validator editor can be called from the menu                               |
+| x_validation_enabled                         | false                                                   | Set to true to enable the Cross Validation components                                        |
+| x_validation_validator                       | true                                                    | if true the Cross validator validation can be called from the menu                           |
 | xds\_repository                              | /opt/EVSClient\_prod/validatedObjects/XDS               | Where to store XDS messages                                                                  |
 | xdw\_repository                              | /opt/EVSClient\_prod/validatedObjects/XDW               | Where to store XDW messages                                                                  |
-| xvalidation_root_oid                         | 1.1.1.1.1.                                             |  Root OID for Cross Validation reports|
-| xvalidator\_directory                        | /opt/EVSClient_prod/x_validation                        | Path to Cross Validation files   |
-| xvalidator_xsl_url                            | https://gazelle.ihe.net/GazelleXValidatorRuleEditor/stylesheet/gazelleXValidator.xsl | URL to the XSL stylesheet used by the Cross Validator for the transformation of the results |
+| xvalidation_root_oid                         | 1.1.1.1.1.                                              | Root OID for Cross Validation reports                                                        |
+| xvalidator\_directory                        | /opt/EVSClient_prod/x_validation                        | Path to Cross Validation files                                                               |
+| xvalidator_xsl_url                           | https://gazelle.ihe.net/GazelleXValidatorRuleEditor/stylesheet/gazelleXValidator.xsl | URL to the XSL stylesheet used by the Cross Validator for the transformation of the results |
 
 ### Application URL
 One of the first preference to set is the URL to the application. If not configured correctly you may not be able to
@@ -175,7 +174,7 @@ update cmn_application_preference set preference_value  = '.*' where preference_
 
 ### Login
 There is no user database in the EVS Client application. The application can be configured to work with a Jasig CAS service, in which case the users
-will be authenfied throught CAS. The role of the users will then be provided by the CAS service.
+will be authenticated through the CAS. The role of the users will then be provided by the CAS service.
 
 Set of SQL commands to activate the CAS authentication. Make sure to use the actual URL to your CAS server in the following example.
 
@@ -202,7 +201,7 @@ What we call a referenced standard in the EVS Client tool is an entry which indi
 integration profile implemented by the system which produces the documents and/or messages that the tool is able
 to validate. We use this concept to structure both the Java code and the graphical user interface.
 
-A referenced standard is defined by a name, optionaly a version and an extension. Then each entry in the database
+A referenced standard is defined by a name, optionally a version and an extension. Then each entry in the database
 is given a unique label and we can also provide a name to be displayed to the user in the drop-down menus and a
 description explaining what is the standard and what the tool is going to validate.
 
@@ -231,7 +230,7 @@ to nicely display the document/message to the user.
 in menus that uses that reference.
 * **Name** is name of the referenced standard to use. This a value picked in a list box.
 * **Version** this is a free text field to describe the version of the referenced standard that is used.
-* **Extension** this is a label that describles the context in which that standard is used. **epSOS** for CDA validation in the context of the epSOS project. This value might be used as a key to query the validation service for the list of available validation methods.
+* **Extension** this is a label that describes the context in which that standard is used. **epSOS** for CDA validation in the context of the epSOS project. This value might be used as a key to query the validation service for the list of available validation methods.
 * **Description** is a free text field that may contain the description of the referenced standard.
 * **Name of the icon** is the font character name to use for the icon. This is a font awesome name ``fa fa-book``.
 See [*here*](http://fontawesome.io/icons/) for a complete list of available icons.
@@ -257,7 +256,7 @@ or a binary executed directly on the server or even a JAR library called by the
 created in the tool to store all the information about those services. It makes easier the management of
 the services and allows a different configuration depending on the location of the EVSClient tool.
 
-Going to **Adminisration --&gt; Manage validation services**, the administrator will access the list of all the
+Going to **Administration --&gt; Manage validation services**, the administrator will access the list of all the
 validation services which are declared and used by the application. Each entry can be edited. Administrator of the application can also create new entries, in order to
 declare new validation services
 
@@ -274,13 +273,13 @@ When defining a validation service you need to provide:
     * **schematron** if the validation service that is called is of type Schematron
     * **model-based** if the validation service that is called is of type model based (Gazelle Objects Checker)
     * **hapi** if the validation service that is call uses HAPI
-    * **null** otherwize
-* **Target endpoint or path to the binary** Place here the URL to the endpoind (i.e. [*https://gazelle.ihe.net/XDStarClient-ejb/ModelBasedValidationWSService/ModelBasedValidationWS?wsdl*]https://gazelle.ihe.net/XDStarClient-ejb/ModelBasedValidationWSService/ModelBasedValidationWS?wsdl) Note that we are expecting the wsdl at the end of the url.
+    * **null** otherwise
+* **Target endpoint or path to the binary** Place here the URL to the endpoint (i.e. [*https://gazelle.ihe.net/XDStarClient-ejb/ModelBasedValidationWSService/ModelBasedValidationWS?wsdl*]https://gazelle.ihe.net/XDStarClient-ejb/ModelBasedValidationWSService/ModelBasedValidationWS?wsdl). Note that we are expecting the wsdl at the end of the url.
     In case the service is not actually a service, but a tool on the server hosting the EVS Client application, then provide the path to the executable.
 * **XSL for transforming results (URL)** is the link to the XSL to be used to display the validation report.
 * **Description** a field to provide documentation, information about the service.
 * **Provider** is a free text field intended to differentiate the different validation service providers.
-* **Name of Jasper Report** is a field that indicated the relative path to the Jasper report used to create a PDF validation report. The absolute path will be obtain by concatenation of gazelle_home_path preference value, reports_path preference value and the value of the field. The full path will be display below the form fied to the user. 
+* **Name of Jasper Report** is a field that indicated the relative path to the Jasper report used to create a PDF validation report. The absolute path will be obtain by concatenation of gazelle_home_path preference value, reports_path preference value and the value of the field. The full path will be display below the form field to the user. 
 
 ![Jasper report path form field](./media/installation/jasper-report-name-field.png)
 
@@ -290,7 +289,7 @@ Jasper reports can be found in the EVS Client sources. To be able to use them to
 git clone https://gitlab.inria.fr/gazelle/applications/test-execution/validator/EVSClient.git
 cd EVSClient/EVSClient-ear/src/main/dist/opt/EVSClient_prod/reports
 ```
-If you want to use any other path than the default /opt/EVSClient_prod/reports path, be sure ot set the appropriate values to gazelle_home_path and report_path preferences in your application.
+If you want to use any other path than the default /opt/EVSClient_prod/reports path, be sure to set the appropriate values to gazelle_home_path and report_path preferences in your application.
 
 Services can be enabled or disabled using the check box "is available ?". When the check box is checked the service can be used and added to a menu. Enabling/Disabling services can be convenient when
 adding a replacement to an existing service. It allows the user to prepare its configuration without disturbing the running system.
@@ -308,9 +307,9 @@ The next step in the addition of a validation service is to associate standards
 ## Configuring the top bar menu
 
 A menu bar is made of two kinds of entities, the menu groups which are the menu entries displayed in the top bar
-and the menu entries which are the entries displayed in the drop-down list.  The top bar menu of EVSClient is
+and the menu entries which are the entries displayed in the drop-down list. The top bar menu of EVSClient is
 built using a list of menu groups stored in the database. Administrator users can update this list from the
-page accessible at **Administration --&gt; Menu configuration**. On this page are lists all the menu groups defined
+page accessible at **Administration --&gt; Menu configuration**. On this page are listed all the menu groups defined
 for this instance of the tool. 
 
 A menu group is defined by:
@@ -321,7 +320,7 @@ A menu group is defined by:
 * a boolean which indicates whether or not displaying the menu group
 
 For each standard listed in the menu group, the icon will be the one defined at standard level. For each menu
-(except for DICOM) the sub menus will be "validate", "validation logs" and "statistics". Links to these sections
+(except for DICOM one), the sub menus will be "validate", "validation logs" and "statistics". Links to these sections
 are automatically built from the standard name and extension.
 
 ## Calling tools
@@ -333,7 +332,7 @@ maintain a list of tools which are likely to redirect the user to the EVS Client
 This list is accessible under **Administration --&gt; Calling tools**.
 
 For each tool, we need an OID which uniquely identifies the instance of the tool and the URL used to send back results.
-Currently two categories of tools can use the EVSClient in this way, Gazelle proxy instances and Gazelle Test Management
+Currently two categories of tools can use the EVSClient in this way : Gazelle proxy instances and Gazelle Test Management
 instances; you need to precise it to the tool so that the EVS Client knows how to send back results (if the feature is available
 in the calling tool).
 
@@ -350,18 +349,18 @@ It is possible to add new calling tools. There are 3 types of tools known by EVS
 
 ### Dicom3Tools
 
-If a dicom validation is wished, then Dicom3Tools need to be installed on the host machine.
+If a DICOM validation is wished, then Dicom3Tools needs to be installed on the host machine.
 
 The following instructions are for a linux system based on the apt package system. Any other distribution
 may find instructions for installation of the tool from David Clunie.
-This is not the scope of this document to provide installation instructions for all plateforms.
+This is not the scope of this document to provide installation instructions for all platforms.
 
 ```bash
  sudo apt-get install g++
  sudo apt-get install xutils-dev
 ```
 
-Download the last dicom3tools version [here](http://www.dclunie.com/dicom3tools/workinprogress/index.html) and untar it.
+Download the last Dicom3tools version [here](http://www.dclunie.com/dicom3tools/workinprogress/index.html) and untar it.
 
 Go in the untar folder.
 
@@ -385,7 +384,7 @@ sudo chown -R gazelle:gazelle dicom3tools/
 #### Build and install
 
 * Launch a build of [http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/](http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/)
-* Download Pixelmed-jar-x.x.x-script.zip (exemple : http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/ws/target/Pixelmed-jar-1.0.1-SNAPSHOT-script.zip)
+* Download Pixelmed-jar-x.x.x-script.zip (example : http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/ws/target/Pixelmed-jar-1.0.1-SNAPSHOT-script.zip)
 
 ```bash
 sudo mkdir /opt/pixelmed
@@ -412,7 +411,7 @@ sudo chown gazelle:jboss-admin /opt/pixelmed/
 * Click on "Artifact upload"
 * Select GAV definition : From POM
 * Select your new pom to upload it
-* Add artificats : sourceFiles.jar and executable.jar
+* Add artifacts : sourceFiles.jar and executable.jar
 * To finish click on upload artifacts
 
-You can now get your new dependency in the project [http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/](http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/) and do the build and install.
+You can now get your new dependency in the project [http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/](http://gazelle.ihe.net/jenkins/job/Pixelmed-jar/), do the build and install.
diff --git a/Gazelle-Calibration/installation.md b/Gazelle-Calibration/installation.md
index 0486ae00ebf9f077655a2e4b1419ab9a51d8268c..7671c427ad0984f62df3f8bab2eb9b902ebf68ee 100644
--- a/Gazelle-Calibration/installation.md
+++ b/Gazelle-Calibration/installation.md
@@ -3,7 +3,7 @@ title:  Installation Manual
 subtitle: Gazelle-Calibration
 author: Guillaume Thomazon
 function: Engineer
-date: 25/01/2018
+date: 11/12/2019
 toolversion: N/A
 version: 1.02
 status: Approved Document
@@ -13,7 +13,7 @@ customer: IHE-EUROPE
 
 # Introduction
 
-The purpose of this document is the installation of Gazelle-calibration on a VM
+The purpose of this document is the installation of Gazelle-calibration on a VM.
 
 # gazelle-calibration Installation
 
@@ -23,7 +23,7 @@ The purpose of this document is the installation of Gazelle-calibration on a VM
 
 The project can be found at [https://scm.gforge.inria.fr/anonscm/svn/gazelle/Maven/gazelle-calibration/trunk/](https://scm.gforge.inria.fr/anonscm/svn/gazelle/Maven/gazelle-calibration/trunk/)
 
-If you don't have already a zip of the project create one with :
+If you don't already have a zip of the project, create one with :
 - icons/
 - scripts/
 - site/
@@ -139,27 +139,27 @@ sudo mkdir /var/www/html/admin
 cd /var/www/html/admin
 ```
 
-Connect the project from the forge
+Connect the project from the forge :
 
 ```bash
 sudo svn co https://scm.gforge.inria.fr/anonscm/svn/gazelle/Maven/gazelle-calibration/trunk/admin .
 cd ..
 ```
 
-If base html folder is /var/www/html, create a symbolik link
+If base html folder is /var/www/html, create a symbolic link :
 
 ```bash
 sudo ln -s admin/admin.php admin.php
 ```
 
-If base html folder is /var/www/, create a symbolik link of the symbolic link
+If base html folder is /var/www/, create a symbolic link of the symbolic link :
 
 ```bash
 cd ..
 sudo ln -s html/admin.php admin.php
 ```
 
-Go back to /var/www/html/admin and make a copy of getToolsArraysTemplate.php
+Go back to /var/www/html/admin and make a copy of getToolsArraysTemplate.php :
 
 ```bash
 cd /var/www/html/admin
@@ -169,15 +169,15 @@ sudo cp getToolsArraysTemplate.php getToolsArrays.php
 This file contains arrays which list tools.
 
 
-Go back to /var/www/html/ and create a symbolik link of getToolsArrays.php
-If base html folder is /var/www/html, create a symbolik link
+Go back to /var/www/html/ and create a symbolic link of getToolsArrays.php.
+If base html folder is /var/www/html, create a symbolic link :
 
 ```bash
 cd /var/www/html
 sudo ln -s admin/getToolsArrays.php getToolsArrays.php
 ```
 
-If base html folder is /var/www/, create a symbolik link of the symbolic link
+If base html folder is /var/www/, create a symbolic link of the symbolic link :
 
 ```bash
 cd ..
@@ -197,9 +197,9 @@ sudo vi /var/www/html/getToolsArrays.php
 array("AssertionManagerGui", "Assertion Manager", 1, 1,"Assertion-Manager", "Assertion Manager tool is used to stored the requirements on which the tests and tools are based. It also allows the linkage between tests, steps, validators and requirements."),
 ```
 
-* **toolLink** : link to the tool (eg: [_https://gazelle.ihe.net/_**AssertionManagerGui**](https://gazelle.ihe.net/AssertionManagerGui) )
+* **toolLink** : link to the tool (eg: [https://gazelle.ihe.net/_**AssertionManagerGui**](https://gazelle.ihe.net/AssertionManagerGui))
 
-   Be careful, for Gazelle Test Management the link could be "EU-CAT" or "gazelle".
+Be careful, for Gazelle Test Management the link could be "EU-CAT" or "gazelle".
 
 * **toolName** : the name of the tool display in home page.
 
@@ -207,7 +207,7 @@ array("AssertionManagerGui", "Assertion Manager", 1, 1,"Assertion-Manager", "Ass
 
 * **doc installed** : 0=false the icon about the doc will not be displayed, 1=true the icon about the doc will be displayed.
 
-* **doc link** : the tool link in the gazelle-documention (eg: [_https://gazelle.ihe.net/gazelle-documentation/_**Assertion-Manager**_/user.html_](https://gazelle.ihe.net/gazelle-documentation/Assertion-Manager/user.html) )
+* **doc link** : the tool link in the gazelle-documentation (eg: [_https://gazelle.ihe.net/gazelle-documentation/_**Assertion-Manager**_/user.html_](https://gazelle.ihe.net/gazelle-documentation/Assertion-Manager/user.html))
 
 * **toolDescription** : the description of the tool display in the home page.
 
@@ -219,7 +219,7 @@ sudo cp /var/www/html/admin/customerLogo.png /var/www/html/logo
 sudo cp /var/www/html/admin/providerLogo.png /var/www/html/logo
 ```
 
-If base html folder is /var/www/, create a symbolik link of the symbolic link
+If base html folder is /var/www/, create a symbolic link of the symbolic link
 
 ```bash
 cd /var/www/html/
diff --git a/Patient-Manager/release-note.md b/Patient-Manager/release-note.md
index d16fd07115ebb186bf26b601f8e8941df8a71187..505844354986423cc2f1bf95d3b1a4d44b1c75ef 100644
--- a/Patient-Manager/release-note.md
+++ b/Patient-Manager/release-note.md
@@ -1,13 +1,21 @@
 ---
 title: Release note
 subtitle: PatientManager
-toolversion: 9.11.5
-releasedate: 2020-01-03
+toolversion: 9.11.6
+releasedate: 2020-01-17
 author: Anne-Gaëlle BERGE
 function: Software Engineer
 customer: IHE Europe
 reference: KER1-RNO-IHE-PATIENT_MANAGER
 ---
+# 9.11.6
+_Release date: 2020-01-17_
+
+__Improvement__
+
+* \[[PAM-666](https://gazelle.ihe.net/jira/browse/PAM-666)\] Change type of pam_phone_number.type to string
+* \[[PAM-667](https://gazelle.ihe.net/jira/browse/PAM-667)\] Add a UUID to uniquely identify a patient regardless of its database id or patient identifiers
+* \[[PAM-670](https://gazelle.ihe.net/jira/browse/PAM-670)\] We need to store the keyword of the actor
 
 # 9.11.5
 _Release date: 2020-01-03_
diff --git a/Proxy/user.md b/Proxy/user.md
index dcaae8bce09201988d7ff27d009edbefb716054c..6c30b0f61533a3ac56988474293e1461f9f6d86d 100644
--- a/Proxy/user.md
+++ b/Proxy/user.md
@@ -145,4 +145,4 @@ The current privacy state of the connection can be found as an icon on the top r
 
 ![](./media/message_details.png)
 
-At any moment this mode can be enabled or disabled. Between two activations, connection will keep the same privacy status (shared or private). When the mode is diasbled, all connection and all messages can be accessed by all users again. The fact that they are private in Admin only mode has no impact when the mode is disabled.
\ No newline at end of file
+At any moment this mode can be enabled or disabled. Between two activations, connection will keep the same privacy status (shared or private). When the mode is diasbled, all connection and all messages can be accessed by all users again. The fact that they are private in Admin only mode has no impact when the mode is disabled.
diff --git a/XDStar-Client/installation.md b/XDStar-Client/installation.md
deleted file mode 100755
index cd5b4bb62a14a97585611cdf689719a63f683c82..0000000000000000000000000000000000000000
--- a/XDStar-Client/installation.md
+++ /dev/null
@@ -1,272 +0,0 @@
----
-title:  Installation Manual
-subtitle: XD* Client
-author: Cédric EOCHE-DUVAL
-date: 14/10/2019
-toolversion: 2.5.x
-function: Engineer
-version: 2.02
-status: Approved document
-reference: KER1-MAN-IHE-XDSTAR_CLIENT_INSTALLATION-2_02
-customer: IHE-EUROPE
----
-
-# XDStarClient - Installation & Configuration
-
-Here is a guide to help you installing XDStarClient.
-
-# Requirements
-
-Debian squeeze or ubuntu 12.04/14.04 64bits with an Internet access.
-
-* Database : PostGresql 9.4
-* Java virtual machine : JDK 1.7
-* Application server : Jboss 7.2.0.Final
-
-To install those requirements you need to follow instructions of installation of jboss7 : [https://gazelle.ihe.net/content/general-considerations-jboss-7](https://gazelle.ihe.net/content/general-considerations-jboss-7)
-
-# Quick start
-
-XDStarClient can be installed using gazelle user on your server:
-
-```bash
-wget https://gazelle.ihe.net/jenkins/job/XDStarClient/ws/install_xdstar_client.sh
-wget https://gazelle.ihe.net/jenkins/job/Installer_script/ws/jboss7/common.sh
-sudo chmod +x install_xdstar_client.sh
-sudo chmod +x common.sh
-sudo ./install_xdstar_client.sh $HOSTANDPORT
-```
-
-`$HOSTANDPORT` are the host and the port number to which your application will deployed, you may use the value `localhost:8380` if you are testing locally and you have not changed the configuration of your jboss7 installed.
-
-It will: 
-
-1. Backup the previous EAR
-1. Get the latest released version of XDStarClient and deploy it in your jboss.
-1. Create the database if it doesn't exists.
-1. Create /opt/XDStarClient folder (used for validation, samples storage) if this folder is not already there
-
-All these steps are done by the script. The next paragraph are only details of how these steps are done (for developper who need more details).
-
-# Compile Sources
-
-XDStarClient is an open source project under Apache2 licence. The sources are available on the INRIA's Forge:
-
-```bash
-svn checkout https://scm.gforge.inria.fr/svn/gazelle/Maven/simulators/XDStar-modules/trunk XDStar-modules
-svn checkout https://scm.gforge.inria.fr/svn/gazelle/Maven/simulators/XDStarClient/trunk XDStarClient
-```
-
-Before compiling, go to the directory XDStarClient and edit the file pom.xml. Open this file and adapt the properties of profile prod to your case :
-
-`jdbc.connection.url` : `jdbc:postgresql:xdstar-client`
-`jdbc.connection.user` / `jdbc.connection.password` : credentials for database access
-
-```bash
-cd XDStar-modules/
-mvn clean install
-cd ../XDStarClient/
-mvn clean package -U -Pproduction
-```
-The archive (EAR) and the distribution file are created and placed into XDStarClient `/XDStarClient-ear/target` directory.
-If maven cannot download dependencies checkout the maven configuration guide: [https://gazelle.ihe.net/content/development-support-tools](https://gazelle.ihe.net/content/development-support-tools)
-
-# Database creation
-
-The names of the databases are defined in the pom.xml file. Use the following commands :
-
-```bash
-su postgresql
-psql
-postgres=\# CREATE DATABASE "xdstar-client" OWNER gazelle ENCODING UTF-8;
-postgres=\# \\q
-exit
-
-```
-
-# Deployment
-
-To deploy XDStar Client :
-1. Paste the archive **XDStarClient.ear** in the JBoss deployment directory `${JBOSS7\_HOME}/standalone/deployments/`
-2. Display JBoss server logs, start JBoss and wait for **ear** deployment.
-3. The application can be browsed at http://localhost:8080/XDStarClient. *Port could also be different whether you have modified the JBoss configuration*.
-4. **WARNING** : From version 2.4.0, datasources have been extracted from the **ear**. The template file can be found in /src/main/application/datasource in the source or in the file XDStarClientDS-X.X.X-datasource.zip from the nexus.
-For more informations about how to manage that externalization, please refer to [general considerations for JBoss7](https://gazelle.ihe.net/gazelle-documentation/General/jboss7.html).
-
-Datasource name : XDStarClientDS
-
-Database name : xdstar-client
-
-# Insert configuration values
-
-To insert values you can connect to the database:
-
-    psql -U gazelle xdstar-client
-
-Then copy paste the folowing script:
-
-```sql
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'cda.xsl', 'cda_xsl_path');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'XDR Test Pratician', 'default_pratician_id');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'UTC+01', 'application_time_zone');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/jira/browse/XDSTAR', 'application_issue_tracker_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'XDStarClient', 'application_name');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/jira/browse/XDSTAR#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel', 'application_release_notes_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/content/xdstarclient', 'app_documentation');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/xsl/xdsDetailedResult.xsl', 'validation_result_xslt');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'NOVAK', 'family');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'JAN', 'given');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '19501201', 'birthdate');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'root');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'gender');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'extension');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'street');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'city');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'country');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'postalcode');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'maidenname');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '50000', 'connection_timeout');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/xsl/mbcdaDetailedResult.xsl', 'cda_mbv_xslt');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/usr/bin/', 'dicom3tools_validator');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/XDStarClient/xsd/IHE/XDSI.b_ImagingDocumentSource.xsd', 'xds_xsd');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/XDStarClient/xsd/DSUB/soap-envelope.xsd', 'dsub_xsd');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/XDStarClient/', 'server_local_path');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'hra@kereval.com', 'application_admin_email');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'N/A', 'consent_template_path');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'N/A', 'dds_web_service');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'N/A', 'dispensation_template_path');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'N/A', 'epsosFolder');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/XDStarClient/uploadedFiles', 'registered_files_directory');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/XDStarClient/tmp', 'uploadFolder');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'N/A', 'xdstool_xca_query_wsdl');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'SAMEORIGIN', 'X-Frame-Options');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'private, no-cache, no-store, must-revalidate, max-age=0', 'Cache-Control');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'max-age=31536000 ; includeSubDomains', 'Strict-Transport-Security');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '', 'X-Content-Security-Policy');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'Use X-Content-Security-Policy values', 'X-WebKit-CSP');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'Use X-Content-Security-Policy-Report-Only values', 'X-WebKit-CSP-Report-Only');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'false', 'sql_injection_filter_switch');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'true', 'security-policies');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/china.jks', 'truststore_path');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'tomcat', 'key_alias');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'password', 'key_pass');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'password', 'keystore_pass');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'true', 'avoid_nist_validation_ihe');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/SchematronValidator-SchematronValidator-ejb/ScchematronValidatorWS?wsdl', 'schematron_validator');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'default-src ''self'' *.ihe.net *.ihe-europe.net *.ihe-c.org; script-src ''self'' ''unsafe-eval'' ''unsafe-inline''; style-src ''self'' ''unsafe-inline'';', 'X-Content-Security-Policy-Report-Only');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '1.3.6.1.4.1.12559.11.13.2.1.', 'document_root_oid');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '1.3.6.1.4.1.12559.11.13.2.2', 'epsos_source_root_oid');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '1.3.6.1.4.1.12559.11.13.2.3', 'homeCommunityID');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '1.3.6.1.4.1.12559.11.13.2.4', 'home_root_oid');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '1.3.6.1.4.1.12559.11.13.2.5', 'ihe_source_root_oid');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '1.3.6.1.4.1.12559.11.13.2.6.', 'submission_set_root_oid');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'Hilary Ramanantsalama', 'application_admin_name');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/AssertionManagerGui', 'assertion_manager_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'false', 'display_KSA_menu');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/XDStarClient/attachments/', 'attachement_files_directory');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/CDAGenerator-CDAGenerator-ejb/CDAValidatorWS?wsdl', 'cda_mbv_wsdl');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/CDAGenerator-CDAGenerator-ejb/CDAValidatorWS?wsdl', 'cda_mbv_wsdl');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'http://localhost/XDStarClient-XDStarClient-ejb/DSUBRecipientWS?wsdl', 'xdstar_dsub_recipient_endpoint');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/XDStarClient/', 'gazelle_home_path');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '2.16.840.1.113883.3.3731.1.1.100.1', 'ksa_aa_oid');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'http://localhost/XDStarClient-XDStarClient-ejb/XDSDeletetWS?wsdl', 'xdstar_delete_doc_endpoint');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/home/aboufahj/Téléchargements/36667D66.dcm', 'ksa_manifest_file');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/SVSSimulator/rest/RetrieveValueSetForSimulator', 'svs_repository_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/XDStarClient/', 'application_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/EVSClient/', 'evs_client_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/xdstools2/', 'ksa_xdstools_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'false', 'display_IHE_RAD_menu');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'false', 'display_IHE_ITI_menu');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'true', 'ip_login');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '.*', 'ip_login_admin');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '20', 'NUMBER_OF_ITEMS_PER_PAGE');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), '/opt/gazelle/cert/keystore.jks', 'keystore_path');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'https://gazelle.ihe.net/gazelle-documentation/XDStar-Client/user.html', 'documentation_url');
-INSERT INTO app_configuration VALUES (nextval('app_configuration_id_seq'), 'true', 'application_works_without_cas');
-
-```
-
-Finally When the application is deployed, open a browser and go to [http://localhost:8080/XDStarClient](http://localhost:8080/XDStarClient).
-If the deployment and the database initialization are successful you should see the home page.
-
-## List of application preferences
-
-| **Properties**                            | **Description**                                                                                                                            | **Default**                                                                                                                                      |
-|-------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|
-| **app\_documentation**                    | official documentation                                                                                                                     | https://gazelle.ihe.net/content/xdstarclient                                                                                                      |
-| **application\_admin\_email**             | email of the admin                                                                                                                         | hra@kereval.com                                                                                                               |
-| **application\_admin\_name**              | Admin name                                                                                                                                 | Hilary Ramanantsalama                                                                                                                              |
-| **application\_issue\_tracker\_url**      | issues tracker's url                                                                                                                       | https://gazelle.ihe.net/jira/browse/XDSTAR                                                                                                        |
-| **application\_name**                     | application name                                                                                                                           | XDStarClient                                                                                                                                     |
-| **application\_release\_notes\_url**      | release notes' url                                                                                                                         | https://gazelle.ihe.net/jira/browse/XDSTAR\#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel                                |
-| **application\_time\_zone**               | time zone                                                                                                                                  | UTC+01                                                                                                                                           |
-| **application\_url**                      | the url of XDStarClient (too important as it is used by permanent links)                                                                   | https://gazelle.ihe.net/XDStarClient/                                                                                                            |
-| **application_works_without_cas**                      | if the application needs the cas or not                                                                   | true                                                                                                          |
-| **assertion\_manager\_url**               | URL to the assertion manager used                                                                                                          | https://gazelle.ihe.net/AssertionManagerGui                                                                                                       |
-| **attachement\_files\_directory**         | file directory on the server, where documnent uploaded and downloaded will be saved                                                        | /opt/XDStarClient/attachments/                                                                                                                   |
-| **avoid\_nist\_validation\_ihe**          | set to false when validation using the nist validator is performed                                                                         | true                                                                                                                                             |
-| **birthdate**                             | used for initialization for XCPD request                                                                                                   | 19501201                                                                                                                                         |
-| **Cache-Control**                         | security parameter                                                                                                                         | private, no-cache, no-store, must-revalidate, max-age=0                                                                                          |
-| **cas\_url**                              | link to the SSO cas                                                                                                                        | https://gazelle.ihe.net/cas                                                                                                                       |
-| **cda\_mbv\_wsdl**                        | link to the CDA MBV tool ws                                                                                                                | https://gazelle.ihe.net/CDAGenerator-CDAGenerator-ejb/CDAValidatorWS?wsdl                                                                         |
-| **cda\_mbv\_xslt**                        | link to the stylesheet to render the result of validation of a CDA document                                                                | https://gazelle.ihe.net/xsl/mbcdaDetailedResult.xsl                                                                                               |
-| **cda\_xsl\_path**                        | link to the stylesheet to render a cda document                                                                                            | cda.xsl                                                                                                                                          |
-| **city**                                  | used for initialization for XCPD request                                                                                                   | Valeur de la préférence                                                                                                                          |
-| **connection\_timeout**                   | When the client want to rich a responder, this represent the time in millisecond, that the client shall wait before closing the connection | 50000                                                                                                                                            |
-|**consent_template_path**                  |                                             | N/A          |
-| **country**                               | used for initialization for XCPD request                                                                                                   | Valeur de la préférence                                                                                                                          |
-| **dds_web_service**                               | used to call DDS webservice                                                                                                  | N/A                                                                                                                         |
-| **default\_pratician\_id**                | used for epSOS purpose                                                                                                                     | XDR Test Pratician                                                                                                                               |
-| **dicom3tools\_validator**                | path where the dicom3tools is installed                                                                                                    | /usr/bin/                                                                                                                                        |
-| **dispensation\_template\_path**          | used for epSOS purpose                                                                                                                     | N/A                                                                                                                                              |
-| **display\_IHE\_ITI\_menu**               | display, or not, the IHE ITI transactions                                                                                                  | false                                                                                                                                            |
-| **display\_IHE\_RAD\_menu**               | display, or not, the IHE RAD transactions                                                                                                  | false                                                                                                                                            |
-| **display_KSA_menu**               | display, or not, the KSA transactions                                                                                                  | false                                                                                                                                            |
-| **document\_root\_oid**                   | unique identifier of documents                                                                                                             | 1.3.6.1.4.1.12559.11.13.2.1.                                                                                                                     |
-| **documentation_url**                   | link to the documentation                                                                          | https://gazelle.ihe.net/gazelle-documentation/XDStar-Client/user.html                                                                                                                   |
-| **dsub\_xsd**                             | path to the schema of DSUB                                                                                                                 | /opt/XDStarClient/xsd/DSUB/soap-envelope.xsd                                                                                                     |
-| **epsosFolder**                           | used for epSOS purpose                                                                                                                     | N/A                                                                                                                                              |
-| **epsos\_source\_root\_oid**              | used for epSOS purpose                                                                                                                     | 1.3.6.1.4.1.12559.11.13.2.2                                                                                                                      |
-| **evs\_client\_url**                      | link to evs client tool                                                                                                                    | https://gazelle.ihe.net/EVSClient/                                                                                                               |
-| **extension**                             | used for initialization for XCPD request                                                                                                   | Valeur de la préférence                                                                                                                          |
-| **family**                                | used for initialization for XCPD request                                                                                                   | NOVAK                                                                                                                                            |
-| **gazelle\_home\_path**                   | path to a folder used by the tool                                                                                                          | /opt/XDStarClient/                                                                                                                               |
-| **gender**                                | used for initialization for XCPD request                                                                                                   | Valeur de la préférence                                                                                                                          |
-| **given**                                 | used for initialization for XCPD request                                                                                                   | JAN                                                                                                                                              |
-| **homeCommunityID**                       | used by the XSD.b requests                                                                                                                 | 1.3.6.1.4.1.12559.11.13.2.3                                                                                                                      |
-| **home\_root\_oid**                       | used by the XSD.b requests                                                                                                                 | 1.3.6.1.4.1.12559.11.13.2.4                                                                                                                      |
-| **ihe\_source\_root\_oid**                | used by the XSD.b requests                                                                                                                 | 1.3.6.1.4.1.12559.11.13.2.5                                                                                                                      |
-| **ip\_login**                             |  used to confirm if the connexion is done using a cas or an ip authentification                                                            | true                                                                                                                                             |
-| **ip\_login\_admin**                      | list of accepted ip address                                                                                                                | .\*                                                                                                                                              |
-| **key\_alias**                            |  the alias of the keystore used for ssh connexion with responders                                                                          | tomcat                                                                                                                                           |
-| **key\_pass**                             |  password of the key                                                                                                                       | password                                                                                                                                         |
-| **keystore\_pass**                        |  password of the keystore                                                                                                                  | password                                                                                                                                         |
-| **keystore_path**                        | the keystore location                                                                                                                  | opt/gazelle/cert/keystore.jks                                                                                                                                         |
-| **ksa\_aa\_oid**                          |  assigning authority OID, for patients                                                                                                     | 2.16.840.1.113883.3.3731.1.1.100.1                                                                                                               |
-| **ksa\_manifest\_file**                   |  Manifest used in test plan, only related to k-project                                                                                     | /../36667D66.dcm                                                                                                                                 |
-| **ksa\_xdstools\_url**                    |  link to xdstools2 (only related to k-project)                                                                                             | https://gazelle.ihe.net/xdstools2/                                                                                                               |
-| **maidenname**                            |  used for initialization of XCPD request                                                                                                   | Valeur de la préférence                                                                                                                          |
-| **NUMBER_OF_ITEMS_PER_PAGE**                            |                                               | 20                                                                                     |
-| **postalcode**                            | used for initialization of XCPD request                                                                                                    | Valeur de la préférence                                                                                                                          |
-| **registered\_files\_directory**          |  used by the ITI-41 transaction                                                                                                            | /opt/XDStarClient/uploadedFiles                                                                                                                  |
-| **root**                                  | used for initialization of XCPD request                                                                                                    | Valeur de la préférence                                                                                                                          |
-| **schematron\_validator**                 | path to the ws of schematronValidator                                                                                                      | https://gazelle.ihe.net/SchematronValidator-SchematronValidator-ejb/SchematronValidatorWS?wsdl                                                 |
-| **security-policies**                     | confirm if security is used                                                                                                                | true                                                                                                                                             |
-| **server\_local\_path**                   |  path to a folder on the server                                                                                                            | /opt/XDStarClient/                                                                                                                               |
-| **sql\_injection\_filter\_switch**        |  security parameter                                                                                                                        | false                                                                                                                                            |
-| **street**                                | used for initialization of XCPD request                                                                                                    | Valeur de la préférence                                                                                                                          |
-| **Strict-Transport-Security**             |   security parameter                                                                                                                       | max-age=31536000 ; includeSubDomains                                                                                                             |
-| **submission\_set\_root\_oid**            |  used by ITI-41 transaction                                                                                                                | 1.3.6.1.4.1.12559.11.13.2.6.                                                                                                                     |
-| **svs\_repository\_url**                  |  link to SVS rest service                                                                                                                  | https://gazelle.ihe.net:8180/SVSSimulator/rest/RetrieveValueSetForSimulator                                                                       |
-| **truststore_path**                  |  path to the keystore                                                                                                                      | /opt/china.jks                                                                                                                                   |
-| **uploadFolder**                          |  path to folder for uploading file                                                                                                         | /opt/XDStarClient/tmp                                                                                                                            |
-| **validation\_result\_xslt**              |  path to xds transformer of validation result                                                                                              | https://gazelle.ihe.net/xsl/xdsDetailedResult.xsl                                                                                                 |
-| **X-Content-Security-Policy**             |  security parameter                                                                                                                        | Valeur de la préférence                                                                                                                          |
-| **X-Content-Security-Policy-Report-Only** |  security parameter                                                                                                                        | default-src 'self' \*.ihe.net \*.ihe-europe.net \*.ihe-c.org; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; |
-| **xdstar\_delete\_doc\_endpoint**         |  endpoint link to the delete webservice                                                                                                    | http://127.0.0.1:8180/XDStarClient-XDStarClient-ejb/XDSDeletetWS?wsdl                                                                            |
-| **xdstar\_dsub\_recipient\_endpoint**     |   endpoint link to the dsub recipient webservice                                                                                           | http://127.0.0.1:8180/XDStarClient-XDStarClient-ejb/DSUBRecipientWS?wsdl                                                                         |
-| **xds\_xsd**                              |  link to the schema of XDS-I.b                                                                                                             | /opt/XDStarClient/xsd/IHE/XDSI.b\_ImagingDocumentSource.xsd                                                                                      |
-| **xdstool_xca_query_wsdl**                              |                                                     | N/A                                                                                      |
-| **X-Frame-Options**                       |  security parameter                                                                                                                        | SAMEORIGIN                                                                                                                                       |
-| **X-WebKit-CSP**                          |   security parameter                                                                                                                       | Use X-Content-Security-Policy values                                                                                                             |
-| **X-WebKit-CSP-Report-Only**              |  security parameter                                                                                                                        | Use X-Content-Security-Policy-Report-Only values                                                                                                 |
diff --git a/XDStar-Client/release-note.md b/XDStar-Client/release-note.md
index ac565087e58de1543895afa7bcf736df419708e9..4a457b1a14e24d12176866d55cf23480bbb61b70 100644
--- a/XDStar-Client/release-note.md
+++ b/XDStar-Client/release-note.md
@@ -1,13 +1,30 @@
 ---
 title: Release note
 subtitle: XDStarClient
-toolversion: 2.5.1
-releasedate: 2019-10-31
+toolversion: 2.5.2
+releasedate: 2020-01-17
 author: Anne-Gaëlle BERGE
 function: Software Engineer
 customer: IHE Europe
 reference: KER1-RNO-IHE-XDSTARCLIENT
 ---
+# 2.5.2
+_Release date: 2020-01-17_
+
+__Remarks__
+This release includes the releases of the following sub-modules :
+
+* XDStar-modules in 1.1.17
+* xds-validator-jar in 1.0.9
+
+__Bug__
+
+* \[[XDSTAR-742](https://gazelle.ihe.net/jira/browse/XDSTAR-742)\] ITI-32 validator regex for SourcePatientInfo is wrong
+
+__Improvement__
+
+* \[[XDSTAR-743](https://gazelle.ihe.net/jira/browse/XDSTAR-743)\] Add PI as identifier type for PatientId in ITI-32 FR Validator
+* \[[XDSTAR-744](https://gazelle.ihe.net/jira/browse/XDSTAR-744)\] Make ServiceStartTime mandatory  for ITI-32 FR validator
 
 # 2.5.1
 _Release date: 2019-10-31_