From 797358dca3f1348a8ea10d19e8d2ddfa299f8ee5 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Sun, 30 Apr 2017 14:38:52 +0200 Subject: [PATCH] =?utf8?q?liens=20tutoriels=20fran=C3=A7ais=20et=20anglais?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- doc/salome/gui/HYDRO/input/mainpage.doc | 10 ++++++---- doc/salome/tutorial/conf.py.in | 4 ++-- doc/salome/tutorial/english/CMakeLists.txt | 2 +- doc/salome/tutorial/english/conf.py.in | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/doc/salome/gui/HYDRO/input/mainpage.doc b/doc/salome/gui/HYDRO/input/mainpage.doc index 5c393f6e..f8f7ebac 100644 --- a/doc/salome/gui/HYDRO/input/mainpage.doc +++ b/doc/salome/gui/HYDRO/input/mainpage.doc @@ -7,10 +7,12 @@ /** @mainpage - The HYDRO documentation is divided in two parts: - - the reference documentation below - - a Tutorial in French: Here or pdf - + The HYDRO documentation is divided in several parts: + - a tutorial in French: Here or in a pdf file + - the same tutorial in English: Here or in a pdf file + - the reference documentation below + +
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 429507ea..9bb4d12d 100644 --- 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 ffe414ea..462400c4 100644 --- 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 0e35d912..15fab4d9 100644 --- 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'), ] -- 2.39.2