From 83f09e634f4e57707c8423423f5cb8ad74d731bd Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 3 Mar 2014 17:30:15 -0800
Subject: Changelog re #256

---
 sites/www/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index fa58c5f6..fa43a379 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
-- 
cgit v1.2.3


From 056323979d7a2a5623bc2c3845fde9888093b4f2 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 3 Mar 2014 18:22:33 -0800
Subject: Re-enable Intersphinx from www -> docs

---
 sites/www/conf.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sites/www')

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'] = {
-- 
cgit v1.2.3