diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 11:44:57 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 11:44:57 -0800 |
commit | fac6cde8743d73bfce200062da1bbf5e05a74742 (patch) | |
tree | 7fcc75d1f8ed456660c2d954b268f27e0354974f /sites/www/changelog.rst | |
parent | 0965eaa65d194244b594f7098eb5192a2bbf8484 (diff) | |
parent | 72a73f55fae697fe3b940f378664a7c58214647f (diff) |
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
Diffstat (limited to 'sites/www/changelog.rst')
-rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 8c28bebf..fbb44da4 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 |