diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d33b1d468f42a67396e09ee870094ad5ad02d80d..d3127cc00020b10efa9c72a5bdda1b5653976e3c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # How to contribute to FAIDARE
 
-[_TOC_]
+[[_TOC_]]
 
 ## Git management
 
diff --git a/README.md b/README.md
index 2543f94e1f637a83f6744aca23dd53cd317e7ebf..20f005d61ee952e9fb69184bc31fbf5e6213a210 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # FAIDARE: FAIR Data-finder for Agronomic Research
 This application provides web services (based on the BrAPI standard) and a web interface with easy to use filters to facilitates the access to plant datasets from a federation of sources.
 
+[[_TOC_]]
+
 ## How to contribute
 
 Look at the [contribution guide](CONTRIBUTING.md).
diff --git a/frontend/src/app/navbar/navbar.component.html b/frontend/src/app/navbar/navbar.component.html
index 01465fc3472e0a2b325acb008b50edd4b00d1b20..bbafeb37306337841a7da56d215b34de6a2f179b 100644
--- a/frontend/src/app/navbar/navbar.component.html
+++ b/frontend/src/app/navbar/navbar.component.html
@@ -46,7 +46,7 @@
               <!-- Join us link -->
               <a class="dropdown-item" routerLink="/join" routerLinkActive="true" title="Join us">Join us</a>
               <!-- Legal mentions link -->
-              <a class="dropdown-item" routerLink="/legal" routerLinkActive="true" title="Legal mentions" >Legal mentions</a>
+              <a class="dropdown-item" routerLink="/legal" routerLinkActive="true" title="Terms of use">Terms of use</a>
               <!-- Help link -->
               <a class="dropdown-item" routerLink="/help" routerLinkActive="true" title="Help">Help</a>
             </div>
diff --git a/frontend/src/assets/faidare/ABOUT.md b/frontend/src/assets/faidare/ABOUT.md
index dd96099fbd84cf52d7941189fa8412b3b4c431cb..a1daa9927d99974feb930f3252ae86d14e4e5fd5 100644
--- a/frontend/src/assets/faidare/ABOUT.md
+++ b/frontend/src/assets/faidare/ABOUT.md
@@ -10,4 +10,4 @@ FAIDARE offers more detailed search and data retrieval capabilities and it takes
 
 It has been developed by [INRA-URGI](http://urgi.versailles.inra.fr/) in collaboration with [**Elixir Plant**](https://elixir-europe.org/communities/plant-sciences), [**Phenome-Emphasis.fr**](https://www.phenome-emphasis.fr/phenome_eng/Methodological-projects/MCP2-Distributed-Information-system) and [**Elixir-fr/IFB**](https://www.france-bioinformatique.fr).
 
-If you want to join the FAIDARE federation, please read the [HOW TO JOIN guide](HOW-TO-JOIN.md) and [contact us](mailto:urgi-contact@inra.fr?subject=%5BFAIDARE%5D).
+If you want to join the FAIDARE federation, please read the "Join us" section and [contact us](mailto:urgi-contact@inra.fr?subject=%5BFAIDARE%5D).
diff --git a/frontend/src/assets/faidare/LEGAL-MENTIONS.md b/frontend/src/assets/faidare/LEGAL-MENTIONS.md
index 6710d8b81b583cc5d6b1b7321dbbe6c075873ced..21aa25f5359596345684b6786ca40e46de74b8ca 100644
--- a/frontend/src/assets/faidare/LEGAL-MENTIONS.md
+++ b/frontend/src/assets/faidare/LEGAL-MENTIONS.md
@@ -5,16 +5,23 @@ By browsing this web site, you acknowledge and accept its general terms of use d
 ## Intellectual property
 
 Except where otherwise noted, content on this site is licensed under a [Creative Commons Attribution 4.0 International license](https://creativecommons.org/licenses/by/4.0/).
-The logo is the property of INRA and you are not allowed to re-use it for your own work and purpose.
+
+The logo is the property of INRAE and you are not allowed to re-use it for your own work and purpose.
 
 ## Content
 
-The portal maintained by INRA allows to find public data across a federation of databases.
+The portal is maintained by URGI, an INRAE unit, and its [Data Management Plan (DOI: 10.15454/9HM5UI)](https://doi.org/10.15454/9HM5UI) has been defined in the frame of the [Plant Bioinformatics Facility (PlantBioinfoPF, DOI: 10.15454/1.5572414581735654E12)](https://doi.org/10.15454/1.5572414581735654E12) that hosts the portal.
+
+Access to this web site can be interrupted at any time and without prior warning in case of force majeure.
+In case of a planned service interruption, users will be notified in advance by the editor as far as possible.
+
+The portal allows to find public data across a federation of databases.
 The licences associated to data are therefore defined by the institutes in charge of them.
 
-Users are sole responsible for the searches they carry out, as well as for the interpretation and for the use they make of the results.
+The portal links to external web sites.
+INRAE does not take responsibility of the content of these web site.
 
-The access to the web site can be interrupted at any moment and without prior warning in case of force majeure or if the editor decides to terminate its provision of service.
+Users are sole responsible for the searches they carry out, as well as for the interpretation and for the use they make of the results.
 
 Users are informed that their use of the results should not infringe on current legislation or the recommendations of the French Data Protection Authority (CNIL) with respect to personal data.
 Users are warned that the information must be used for strictly professional purposes only and downloading screen shots in order to constitute or enrich a database is contrary to French law and therefore forbidden, as is its use for commercial or advertising purposes (CNIL).
@@ -23,11 +30,6 @@ The portal may give access to personal and professional data concerning technica
 This information helps to identify and acknowledge the authors of the scientific works.
 This personal information is attached to the produced datasets and follows the data life cycle.
  
-## Hyperlinks
-
-The portal links to external web sites.
-INRA does not take responsibility of the content of these web site.
-
 ## Personal data
 
 Technical data (date, hour, IP address of the computer of the visitor, pages viewed) are collected only for the statistical analysis of the usage of the portal.
@@ -46,4 +48,4 @@ If you wish to exercise this right and obtain information about yourself, please
 
 The editor might change the terms of use and user’s rights without prior warning.
 
-Last update: 2019 June 25th
+Last update: 2021 February 22th