Merge branch '1.11' into 1.12

2014-03-31 16:19:55 -07:00 · 2014-03-31 16:19:55 -07:00 · 619b24738a
parent 4d76a90985 9044860b41
commit 619b24738a
1 changed files with 5 additions and 0 deletions
--- a/sites/docs/conf.py
+++ b/sites/docs/conf.py
@ -14,3 +14,8 @@ autodoc_default_flags = ['members', 'special-members']
 intersphinx_mapping = {
    'python': ('http://docs.python.org/2.6', None),
 }
+
+# Sister-site links to WWW
+html_theme_options['extra_nav_links'] = {
+    "Main website": 'http://www.paramiko.org',
+}