Merge from V7_3_BR branch 18/12/2013

[modules/jobmanager.git] / doc / conf.py.in

diff --git a/doc/conf.py.in b/doc/conf.py.in
index 8e2a17a9b6214619dd854823394aa19795c9af67..7e4cc2967e9d967c5ad1da84aa894196188d0018 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -46,9 +46,9 @@ copyright = '2010-2013 CEA/DEN, EDF R&D, A. Ribes'
 # built documents.
 #
 # The short X.Y version.
-version = '@SHORT_VERSION@'
+version = '@SALOMEJOBMANAGER_MAJOR_VERSION@.@SALOMEJOBMANAGER_MINOR_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
+release = '@SALOMEJOBMANAGER_VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -67,6 +67,11 @@ release = '@VERSION@'
 # for source files.
 exclude_trees = ['.build','ref','images','CVS']
 
+# A list of glob-style patterns that should be excluded when looking for source
+# files. They are matched against the source file names relative to the
+# source directory, using slashes as directory separators on all platforms.
+exclude_patterns = ['**/CVS']
+
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None