Merge branch '1.11' into 1.12
This commit is contained in:
commit
619b24738a
|
@ -14,3 +14,8 @@ autodoc_default_flags = ['members', 'special-members']
|
||||||
intersphinx_mapping = {
|
intersphinx_mapping = {
|
||||||
'python': ('http://docs.python.org/2.6', None),
|
'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',
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue