liens tutoriels français et anglais

diff --git a/doc/salome/gui/HYDRO/input/mainpage.doc b/doc/salome/gui/HYDRO/input/mainpage.doc
index 5c393f6ebd1c160c79336d729ce278a3b1cf15c1..f8f7ebac552f4b1e7f71fddff896e4a16bc7890c 100644 (file)
--- a/doc/salome/gui/HYDRO/input/mainpage.doc
+++ b/doc/salome/gui/HYDRO/input/mainpage.doc
@@ -7,10 +7,12 @@
 /**
   @mainpage
 
-  <b>The HYDRO documentation is divided in two parts:</b>
-  - <b>the reference documentation below </b>
-  - <b>a Tutorial in French:</b> <A HREF="../HYDRO_tutorial/index.html">Here </A> or <A HREF="../HYDRO_tutorial/moduleHYDRO_tutoriel.pdf">pdf </A>
-  
+  <b>The HYDRO documentation is divided in several parts:</b>
+ - <b>a tutorial in French:</b> <A HREF="../HYDRO_tutorial/index.html">Here </A> or <A HREF="../HYDRO_tutorial/moduleHYDRO_tutoriel.pdf">in a pdf file</A>
+ - <b>the same tutorial in English:</b> <A HREF="../HYDRO_English_tutorial/index.html">Here </A> or <A HREF="../HYDRO_English_tutorial/moduleHYDRO_tutorial.pdf">in a pdf file</A>
+ - <b>the reference documentation below </b>
+   
+  <hr>
 
   The HYDRO GUI project has been developed for a hydrodynamic laboratory in the EDF R&D company
   in the domain of the landscape modelling (construction of channels, dams, changing the course of the rivers etc).

diff --git a/doc/salome/tutorial/conf.py.in b/doc/salome/tutorial/conf.py.in
index 429507eafaead39d48e30197fc20484845f84be2..9bb4d12d365f6e27554dc437097f41e1835bd139 100644 (file)
--- a/doc/salome/tutorial/conf.py.in
+++ b/doc/salome/tutorial/conf.py.in
@@ -65,10 +65,10 @@ copyright = u'2015-2017, EDF'
 #
 # The short X.Y version.
 #version = '@SALOMEHYDRO_VERSION@'
-version = '8.2.0'
+version = '8.3.0'
 # The full version, including alpha/beta/rc tags.
 #release = '@SALOMEHYDRO_VERSION@'
-release = '8.2.0- module HYDRO -2.0-2017.04.14'
+release = '8.3.0- module HYDRO -2.0-2017.04.27'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/salome/tutorial/english/CMakeLists.txt b/doc/salome/tutorial/english/CMakeLists.txt
index ffe414ea5efca9f1d23868e1ab3b00c630ab7f1f..462400c4b8cfb9f963da50b1c99d12478c469599 100644 (file)
--- a/doc/salome/tutorial/english/CMakeLists.txt
+++ b/doc/salome/tutorial/english/CMakeLists.txt
@@ -70,4 +70,4 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
   PATTERN ".buildinfo" EXCLUDE
 )
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/latex/moduleHYDRO_tutoriel.pdf DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO_English_tutorial)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/latex/moduleHYDRO_tutorial.pdf DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO_English_tutorial)

diff --git a/doc/salome/tutorial/english/conf.py.in b/doc/salome/tutorial/english/conf.py.in
index 0e35d912244df2b8ecae92dc61989d735a2583cb..15fab4d97cd5840c4bd8026232a0436a2f00c126 100644 (file)
--- a/doc/salome/tutorial/english/conf.py.in
+++ b/doc/salome/tutorial/english/conf.py.in
@@ -65,10 +65,10 @@ copyright = u'2015-2017, EDF'
 #
 # The short X.Y version.
 #version = '@SALOMEHYDRO_VERSION@'
-version = '8.2.0'
+version = '8.3.0'
 # The full version, including alpha/beta/rc tags.
 #release = '@SALOMEHYDRO_VERSION@'
-release = '8.2.0- module HYDRO -2.0-2017.04.14'
+release = '8.3.0- module HYDRO -2.0-2017.04.27'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -199,7 +199,7 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'moduleHYDRO_tutoriel.tex', u'module HYDRO Documentation',
+  ('index', 'moduleHYDRO_tutorial.tex', u'module HYDRO Documentation',
    u'EDF', 'manual'),
 ]