Merge branch 'master' of ssh://leap.se/leap_client

1 files changed, 22 insertions, 4 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 05c8cf5b..39f17d9b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,7 +16,21 @@ import sys, os
 # 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.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../src'))
+sys.path.insert(0, os.path.abspath('../src/leap'))
+sys.path.insert(0, os.path.abspath('../src/leap/crypto'))
+sys.path.insert(0, os.path.abspath('../src/leap/keymanager'))
+sys.path.insert(0, os.path.abspath('../src/leap/services'))
+sys.path.insert(0, os.path.abspath('../src/leap/services/eip'))
+sys.path.insert(0, os.path.abspath('../src/leap/util'))
+
+sys.path.insert(0, os.path.abspath(
+    os.path.expanduser(
+        '~/Virtualenvs/leap-client/local/lib/python2.7/'
+        'site-packages/leap/common')))
+
+# TODO: should add all the virtualenv site-packages to the path
+# as a workaround, install all in your path.
 
 # -- General configuration -----------------------------------------------------
 
@@ -25,7 +39,11 @@ import sys, os
 
 # 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']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+
+intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None),
+                       'twisted': ('http://twistedsphinx.funsize.net/',
+                                   None)}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -48,9 +66,9 @@ copyright = u'2012, The LEAP Encryption Access Project'
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.0'
+version = '0.2.1-dev1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '0.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.