summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-31 16:19:55 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-31 16:19:55 -0700
commit619b24738a4aef12917c906b7773638b730ffaa5 (patch)
tree47269ff47eb3dac6e65923f68f92515370022d7a
parent4d76a909851e2cc55f5bfca74e07af2552f102c1 (diff)
parent9044860b41df3d89449fde3852df0298d911ce28 (diff)
downloadparamiko-619b24738a4aef12917c906b7773638b730ffaa5.tar.gz
Merge branch '1.11' into 1.12
-rw-r--r--sites/docs/conf.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/sites/docs/conf.py b/sites/docs/conf.py
index 619ff816..f9355715 100644
--- 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',
+}