From: vsr <vsr@opencascade.com>
Date: Thu, 31 May 2018 14:16:47 +0000 (+0300)
Subject: Merge branch 'V8_5_asterstudy'
X-Git-Tag: SHAPER_V9_1_0RC1~31
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f513b3c72c0c9c1a0c68bae34813cb41ac6fdcd5;p=modules%2Fsmesh.git

Merge branch 'V8_5_asterstudy'
---

f513b3c72c0c9c1a0c68bae34813cb41ac6fdcd5
diff --cc doc/salome/gui/SMESH/conf.py.in
index 31257973c,4d56b1b02..91124d948
--- a/doc/salome/gui/SMESH/conf.py.in
+++ b/doc/salome/gui/SMESH/conf.py.in
@@@ -23,9 -23,13 +23,13 @@@ import sys, o
  
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary',
-                'sphinxcontrib.napoleon'
- ]
 -extensions = ['sphinx.ext.autodoc']
++extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary']
+ try:
+   import sphinxcontrib.napoleon
+   extensions += ['sphinxcontrib.napoleon']
+ except:
+   pass
+ 
  #add pdfbuilder to build a pdf with rst2pdf
  #extensions = ['rst2pdf.pdfbuilder']