typo 3.0.0

simplify installation with java included

doc/Fiche_1_Installation_des_outils_FR.Rmd

@@ -106,7 +106,7 @@ La v2.2.4 de JDemetra+ nécessite une version de Java $\geq 8$ alors que la v3.0
 |            v2.2.4 |     $\geq 8$ |
 |            v3.0.2 |    $\geq 17$ |
 
-Pour la suite, les processus d'installation de ces 3 versions sont les mêmes. Il suffit de les répéter pour chaque version que l'on veut installer.
+Pour la suite, les processus d'installation de ces 2 versions sont les mêmes. Il suffit de les répéter pour chaque version que l'on veut installer.
 
 
 ## Processus d'installation
@@ -151,6 +151,14 @@ JDemetra+, il faut bien installer la version jPortable 64-bit (en bas de la page
 
 ## Java 17
 
+ℹ️ Remarques
+
+La version 3.0.2 de JDemetra+ contient une jdk 17 (version de java 17) packetée dans le [.zip](https://github.com/jdemetra/jdplus-main/releases/tag/v3.0.2). Ainsi pour utiliser l'interface, il n'est pas nécessaire d'installer java 17.
+
+En revanche, pour utiliser les packages R en version 3 sans télécharger la GUI (en version 3.0.2), il est obligatoire d'avoir java 17 et donc de l'installer soit même.
+
+### Installation
+
 Pour installer Java 17, il faut aller à l'adresse `r colFmt("https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html", color = html_color, url = TRUE)`.
 
 -   **Télécharger** la version `Compressed Archive` de Windows (`r colFmt("https://download.oracle.com/java/17/archive/jdk-17.0.4.1_windows-x64_bin.zip", color = html_color, url = TRUE)`)
@@ -159,11 +167,6 @@ Pour installer Java 17, il faut aller à l'adresse `r colFmt("https://www.oracle
 Après avoir installé Java (en version 8, 17 ou autre), il faut :
 
 - **Modifier** les variables d'environnement de `PATH` de Rstudio et de Windows (voir section [Variables d'environnement](#var_env))
-- **Modifier** les cibles de JDemetra+ pour informer de la localisation des nouvelles versions de Java.
-
-Ainsi par exemple, si vous avez installé la version 17 de Java pour utiliser la version 3.0.2 de JDemetra+. Il est nécessaire d'ajouter la localisation de Java 17 au raccourci de l'exécutable grace à l'option `--jdkhome`. La cible du raccourci devient `C:\Users\Software\nbdemetra-3.0.2\bin\nbdemetra64.exe --jdkhome "C:\Users\Software\Java17\jdk17"`
-
-![](../img/set_java_jdemetra.png)
 
 
 # Installation de **R** et Rstudio

doc/Sheet_1_Tools_installation_EN.Rmd

@@ -107,7 +107,7 @@ JDemetra+ v2.2.4 require Java version $\geq 8$ while v3.0.2 requires Java versio
 |            v2.2.4 |     $\geq 8$ |
 |            v3.0.2 |    $\geq 17$ |
 
-In the following procedure, the installation processes of this 3 versions are the same. You just have to repeat them for each version you want to install.
+In the following procedure, the installation processes of this 2 versions are the same. You just have to repeat them for each version you want to install.
 
 
 ## Installation process
@@ -150,6 +150,15 @@ To install Java 8, use the link `r colFmt("https://portableapps.com/apps/utiliti
 
 ## Java 17
 
+### Remark
+
+The version 3.0.2 of JDemetra+ contains a
+JDemetra+ version 3.0.2 contains a jdk 17 (java 17 version) packaged in [.zip](https://github.com/jdemetra/jdplus-main/releases/tag/v3.0.2). So to use the interface, it is not necessary to install Java 17.
+
+On the other hand, to use R packages in version 3 without downloading the GUI (in version 3.0.2), it is mandatory to have java 17 and therefore to install it yourself.
+
+### Installation
+
 To install Java 17, you need to head over to `r colFmt("https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html", color = html_color, url = TRUE)`.
 
 -   **Download** the version `Compressed Archive` of Windows (`r colFmt("https://download.oracle.com/java/17/archive/jdk-17.0.4.1_windows-x64_bin.zip", color = html_color, url = TRUE)`)
@@ -158,11 +167,6 @@ To install Java 17, you need to head over to `r colFmt("https://www.oracle.com/j
 After a Java installation (in version 8, 17 or other), you need to:
 
 - **Modify** the environment variable `PATH` of Rstudio and of Windows (See section [Environment variables](#var_env))
-- **Modify** the targets of JDemetra+ to set the localisation of the new Java versions.
-
-For example, if you installed Java version 17 in order to use the JDemetra+ version 3.0.2. You should add the localisation of Java 17 to the shortcut of the executable using the option `--jdkhome`. The target of the shortcut becomes `C:\Users\Software\nbdemetra-3.0.2\bin\nbdemetra64.exe --jdkhome "C:\Users\Software\Java17\jdk17"`
-
-![](../img/set_java_jdemetra.png)
 
 
 # Installation of **R** and Rstudio

doc/Sheet_1_simplified_Tools_installation_EN.Rmd

@@ -105,7 +105,7 @@ JDemetra+ v2.2.4 require Java version $\geq 8$ while v3.0.2 requires Java versio
 |            v2.2.4 |     $\geq 8$ |
 |            v3.0.2 |    $\geq 17$ |
 
-In the following procedure, the installation processes of this 3 versions are the same. You just have to repeat them for each version you want to install.
+In the following procedure, the installation processes of this 2 versions are the same. You just have to repeat them for each version you want to install.
 
 
 ## Installation process
@@ -148,14 +148,7 @@ To install Java 8, use the link `r colFmt("https://portableapps.com/apps/utiliti
 
 ## Java 17
 
-To install Java 17, you need to head over to `r colFmt("https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html", color = html_color, url = TRUE)`.
+ℹ️ Remark
 
--   **Download** the version `Compressed Archive` of Windows (`r colFmt("https://download.oracle.com/java/17/archive/jdk-17.0.4.1_windows-x64_bin.zip", color = html_color, url = TRUE)`)
--   **Unzip** the folder `r colFmt("jdk-17.0.6", windows_path_color, url = FALSE)` under `r colFmt("C:\\Users\\Software", windows_path_color, url = FALSE)` (for example)
-
-After a Java installation (in version 8, 17 or other), you need to:
-
-- **Modify** the environment variable `PATH` of Windows
-- **Modify** the targets of JDemetra+ to set the localisation of the new Java versions.
-
-For example, if you installed Java version 17 in order to use the JDemetra+ version 3.0.2. You should add the localisation of Java 17 to the shortcut of the executable using the option `--jdkhome`. The target of the shortcut becomes `C:\Users\Software\nbdemetra-3.0.2\bin\nbdemetra64.exe --jdkhome "C:\Users\Software\Java17\jdk17"`
+The version 3.0.2 of JDemetra+ contains a
+JDemetra+ version 3.0.2 contains a jdk 17 (java 17 version) packaged in [.zip](https://github.com/jdemetra/jdplus-main/releases/tag/v3.0.2). So to use the interface, it is not necessary to install Java 17.