Merge branch '1.17'

1 files changed, 14 insertions, 13 deletions

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 49066ff7..27ebf60d 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,9 +2,9 @@
 Changelog
 =========
 
-* :release:`1.17.0 <2016-04-25>`
-* :release:`1.16.1 <2016-04-25>`
-* :release:`1.15.5 <2016-04-25>`
+* :release:`1.17.0 <2016-04-28>`
+* :release:`1.16.1 <2016-04-28>`
+* :release:`1.15.5 <2016-04-28>`
 * :feature:`731` (working off the earlier :issue:`611`) Add support for 384-
   and 512-bit elliptic curve groups in ECDSA key types (aka
   ``ecdsa-sha2-nistp384`` / ``ecdsa-sha2-nistp521``). Thanks to Michiel Tiller
@@ -47,12 +47,12 @@ Changelog
   to Stephen C. Pope for the patch.
 * :bug:`716` Fix a Python 3 compatibility issue when handling two-factor
   authentication. Thanks to Mateusz Kowalski for the catch & original patch.
-* :support:`729 backported` Clean up ``setup.py`` to always use ``setuptools``,
+* :support:`729 (1.15+)` Clean up ``setup.py`` to always use ``setuptools``,
   not doing so was a historical artifact from bygone days. Thanks to Alex
   Gaynor.
-* :bug:`649 major` Update the module in charge of handling SSH moduli so it's
-  consistent with OpenSSH behavior re: prime number selection. Thanks to Damien
-  Tournoud for catch & patch.
+* :bug:`649 (==1.17)` Update the module in charge of handling SSH moduli so
+  it's consistent with OpenSSH behavior re: prime number selection. Thanks to
+  Damien Tournoud for catch & patch.
 * :bug:`617` (aka `fabric/fabric#1429
   <https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
   :issue:`678`, :issue:`685`, :issue:`615` & :issue:`616`) Fix up
@@ -61,16 +61,17 @@ Changelog
   for the report & Marius Gedminas for the patch.
 * :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some
   errors related to ``ctypes`` on Windows platforms. Credit to Jason R. Coombs.
-* :support:`621 backported` Annotate some public attributes on
+* :support:`621 (1.15+)` Annotate some public attributes on
   `~paramiko.channel.Channel` such as ``.closed``. Thanks to Sergey Vasilyev
   for the report.
 * :bug:`632` Fix logic bug in the SFTP client's callback-calling functionality;
   previously there was a chance the given callback would fire twice at the end
   of a transfer. Thanks to ``@ab9-er`` for catch & original patch.
-* :support:`612` Identify & work around a race condition in the test for
-  handshake timeouts, which was causing frequent test failures for a subset of
-  contributors as well as Travis-CI (usually, but not always, limited to Python
-  3.5). Props to Ed Kellett for assistance during some of the troubleshooting.
+* :support:`612 (1.15+)` Identify & work around a race condition in the test
+  for handshake timeouts, which was causing frequent test failures for a subset
+  of contributors as well as Travis-CI (usually, but not always, limited to
+  Python 3.5). Props to Ed Kellett for assistance during some of the
+  troubleshooting.
 * :support:`697` Remove whitespace in our ``setup.py``'s ``install_requires``
   as it triggers occasional bugs in some versions of ``setuptools``. Thanks to
   Justin Lecher for catch & original patch.
@@ -80,7 +81,7 @@ Changelog
 * :bug:`652` Fix behavior of ``gssapi-with-mic`` auth requests so they fail
   gracefully (allowing followup via other auth methods) instead of raising an
   exception. Patch courtesy of ``@jamercee``.
-* :feature:`588` Add missing file-like object methods for
+* :feature:`588 (==1.17)` Add missing file-like object methods for
   `~paramiko.file.BufferedFile` and `~paramiko.sftp_file.SFTPFile`. Thanks to
   Adam Meily for the patch.
 * :support:`636` Clean up and enhance the README (and rename it to