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
commit9044860b41df3d89449fde3852df0298d911ce28 (patch)
tree771e0043a6d0df5caadf197a979ca1cf95e9d31f
parentbd81c94825747f082c9c066abab8136d9831a3f2 (diff)
parentc9aa83b63e2306f75ea8f76a6235ac99ca9bbf54 (diff)
downloadparamiko-9044860b41df3d89449fde3852df0298d911ce28.tar.gz
Merge branch '1.10' into 1.11
-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',
+}