summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-04 16:16:36 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-03-04 16:16:36 -0800
commit38785d9cd280244b77fc4aca96b61d693412f29c (patch)
treea5237c1e2b83d6d760815d7c8322253449d079cf /sites/www/changelog.rst
parent247ef7f6f7d14cd05b6bff742126b8235b59f270 (diff)
parentd5ed558c217170815a373604f30be2bb5cb86f1a (diff)
Merge branch '1.11' into 1.12
Diffstat (limited to 'sites/www/changelog.rst')
-rw-r--r--sites/www/changelog.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index fbb44da4..0c396c58 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,9 +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.
+* :support:`256 backported` 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