diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:56:05 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:56:05 -0400 |
| commit | 191fd465f166588922ccbf08b65d4479d8520d6a (patch) | |
| tree | 673a3ad36d919009d2621b6e1d3b102cf7988aa9 /sites/shared_conf.py | |
| parent | 6c6969c1882e62d6249264d2df46ff452eb53e7e (diff) | |
| parent | fa86d655dc8f08eb9171930c41b508e2bee08b08 (diff) | |
Merge branch 'master' into use-urandom
Conflicts:
paramiko/dsskey.py
paramiko/ecdsakey.py
paramiko/hostkeys.py
paramiko/kex_gex.py
paramiko/kex_group1.py
paramiko/pkey.py
paramiko/primes.py
paramiko/rsakey.py
tests/test_pkey.py
Diffstat (limited to 'sites/shared_conf.py')
| -rw-r--r-- | sites/shared_conf.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sites/shared_conf.py b/sites/shared_conf.py index 52cec938..e0afe92e 100644 --- a/sites/shared_conf.py +++ b/sites/shared_conf.py @@ -1,15 +1,12 @@ from datetime import datetime -import os -import sys import alabaster # Alabaster theme + mini-extension html_theme_path = [alabaster.get_path()] -extensions = ['alabaster'] +extensions = ['alabaster', 'sphinx.ext.intersphinx'] # Paths relative to invoking conf.py - not this shared file -html_static_path = ['../_shared_static'] html_theme = 'alabaster' html_theme_options = { 'description': "A Python implementation of SSHv2.", @@ -17,9 +14,6 @@ html_theme_options = { 'github_repo': 'paramiko', 'gittip_user': 'bitprophet', 'analytics_id': 'UA-18486793-2', - - 'link': '#3782BE', - 'link_hover': '#3782BE', } html_sidebars = { '**': [ @@ -30,6 +24,11 @@ html_sidebars = { ] } +# Everything intersphinx's to Python +intersphinx_mapping = { + 'python': ('http://docs.python.org/2.6', None), +} + # Regular settings project = 'Paramiko' year = datetime.now().year |