Merge with 6.0.2

--HG--
branch : feature/issue-229

1 files changed, 7 insertions, 4 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 9929aaf6..8be5c3dd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,14 +12,17 @@
 # autogenerated file.
 #
 # All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import setup as setup_script
+# serve to show the default
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
+
+# Allow Sphinx to find the setup command that is imported below, as referenced above.
+import sys, os
+sys.path.append(os.path.abspath('..'))
+
+import setup as setup_script
 
 # -- General configuration -----------------------------------------------------