Merge branch '1.10' into 1.11

Conflicts:
	fabfile.py
	paramiko/__init__.py

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),
+}