diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-14 10:49:13 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-14 10:49:54 -0400 |
| commit | 59a696cef2639b65adbf47321171bbfea98f7df0 (patch) | |
| tree | af35c0e1234d2f61d3f606bc2799c7d6cc27b3ac /sites/www | |
| parent | d31373f0efac2976af80380e16136c1a7831b6a7 (diff) | |
| parent | 160e2c08e0b7652a92d879c0e481ce72cddafef7 (diff) | |
Merge branch '295-int'
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 2 | ||||
| -rw-r--r-- | sites/www/conf.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 4563877d..eff8c2e8 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :support:`295` Swap out a bunch of PyCrypto hash functions with use of + `hashlib` * :support:`290` (also :issue:`292`) Add support for building universal (Python 2+3 compatible) wheel files during the release process. Courtesy of Alex Gaynor. diff --git a/sites/www/conf.py b/sites/www/conf.py index 5047fa67..bdb5929a 100644 --- a/sites/www/conf.py +++ b/sites/www/conf.py @@ -20,9 +20,7 @@ target = join(dirname(__file__), '..', 'docs', '_build') if os.environ.get('READTHEDOCS') == 'True': # TODO: switch to docs.paramiko.org post go-live of sphinx API docs target = 'http://docs.paramiko.org/en/latest/' -intersphinx_mapping = { - 'docs': (target, None), -} +intersphinx_mapping['docs'] = (target, None) # Sister-site links to API docs html_theme_options['extra_nav_links'] = { |