summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst3
-rw-r--r--sites/www/conf.py8
2 files changed, 7 insertions, 4 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9d41cb22..635e1713 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :support:`256` Convert API documentation to Sphinx, yielding a new API
+ docs website to replace the old Epydoc one. Thanks to Olle Lundberg for the
+ initial conversion work.
* :bug:`-` Use constant-time hash comparison operations where possible, to
protect against `timing-based attacks
<http://codahale.com/a-lesson-in-timing-attacks/>`_. Thanks to Alex Gaynor
diff --git a/sites/www/conf.py b/sites/www/conf.py
index 481acdff..1c6c9254 100644
--- a/sites/www/conf.py
+++ b/sites/www/conf.py
@@ -24,10 +24,10 @@ extensions.append('sphinx.ext.intersphinx')
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://paramiko-docs.readthedocs.org/en/latest/'
-#intersphinx_mapping = {
-# 'docs': (target, None),
-#}
+ target = 'http://docs.paramiko.org/en/latest/'
+intersphinx_mapping = {
+ 'docs': (target, None),
+}
# Sister-site links to API docs
html_theme_options['extra_nav_links'] = {