Merge branch 'master' into 234-int

1 files changed, 16 insertions, 0 deletions

diff --git a/sites/docs/conf.py b/sites/docs/conf.py
new file mode 100644
index 00000000..5674fed1
--- /dev/null
+++ b/sites/docs/conf.py
@@ -0,0 +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'])
+
+# Autodoc settings
+autodoc_default_flags = ['members', 'special-members']
+
+# Sister-site links to WWW
+html_theme_options['extra_nav_links'] = {
+    "Main website": 'http://www.paramiko.org',
+}