summaryrefslogtreecommitdiffhomepage
path: root/sites/docs/conf.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-04 11:44:57 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-03-04 11:44:57 -0800
commitfac6cde8743d73bfce200062da1bbf5e05a74742 (patch)
tree7fcc75d1f8ed456660c2d954b268f27e0354974f /sites/docs/conf.py
parent0965eaa65d194244b594f7098eb5192a2bbf8484 (diff)
parent72a73f55fae697fe3b940f378664a7c58214647f (diff)
Merge branch '1.11' into 1.12
Conflicts: paramiko/hostkeys.py
Diffstat (limited to 'sites/docs/conf.py')
-rw-r--r--sites/docs/conf.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/sites/docs/conf.py b/sites/docs/conf.py
index 0c7ffe55..619ff816 100644
--- a/sites/docs/conf.py
+++ b/sites/docs/conf.py
@@ -1,4 +1,16 @@
# Obtain shared config values
import os, sys
sys.path.append(os.path.abspath('..'))
+sys.path.append(os.path.abspath('../..'))
from shared_conf import *
+
+# Enable autodoc, intersphinx
+extensions.extend(['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'])
+
+# Autodoc settings
+autodoc_default_flags = ['members', 'special-members']
+
+# Intersphinx connection to stdlib
+intersphinx_mapping = {
+ 'python': ('http://docs.python.org/2.6', None),
+}