Merge branch '2.0' into 2.1

1 files changed, 25 insertions, 24 deletions

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 7b1f3693..19909725 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -7,12 +7,13 @@ Changelog
   newer PyCrypto versions throw an exception otherwise (older ones simply
   ignored this parameter altogether). Thanks to ``@jmh045000`` for report &
   patches.
-* :bug:`895` Fix a bug in server-mode concerning multiple interactive auth
-  steps (which were incorrectly responded to). Thanks to Dennis Kaarsemaker for
-  catch & patch.
-* :support:`866 backported` (also :issue:`838`) Remove an old test-related file
-  we don't support, and add PyPy to Travis-CI config. Thanks to Pierce Lopez
-  for the final patch and Pedro Rodrigues for an earlier edition.
+* :bug:`895 (1.17+)` Fix a bug in server-mode concerning multiple interactive
+  auth steps (which were incorrectly responded to). Thanks to Dennis
+  Kaarsemaker for catch & patch.
+* :support:`866 backported (1.17+)` (also :issue:`838`) Remove an old
+  test-related file we don't support, and add PyPy to Travis-CI config. Thanks
+  to Pierce Lopez for the final patch and Pedro Rodrigues for an earlier
+  edition.
 * :release:`2.1.1 <2016-12-12>`
 * :release:`2.0.4 <2016-12-12>`
 * :release:`1.18.1 <2016-12-12>`
@@ -36,15 +37,15 @@ Changelog
 * :bug:`802 (1.17+)` (via :issue:`804`) Update our vendored Windows API module
   to address errors of the form ``AttributeError: 'module' object has no
   attribute 'c_ssize_t'``. Credit to Jason R. Coombs.
-* :bug:`824` Fix the implementation of ``PKey.write_private_key_file`` (this
-  method is only publicly defined on subclasses; the fix was in the private
-  real implementation) so it passes the correct params to ``open()``. This bug
-  apparently went unnoticed and unfixed for 12 entire years. Congrats to John
-  Villalovos for noticing & submitting the patch!
-* :support:`801 (1.17+)` Skip a Unix-only test when on Windows; thanks to
-  Gabi Davar.
-* :support:`792 (1.17+)` Minor updates to the README and demos; thanks to Alan
-  Yee.
+* :bug:`824 (1.17+)` Fix the implementation of ``PKey.write_private_key_file``
+  (this method is only publicly defined on subclasses; the fix was in the
+  private real implementation) so it passes the correct params to ``open()``.
+  This bug apparently went unnoticed and unfixed for 12 entire years. Congrats
+  to John Villalovos for noticing & submitting the patch!
+* :support:`801 backported (1.17+)` Skip a Unix-only test when on Windows;
+  thanks to Gabi Davar.
+* :support:`792 backported (1.17+)` Minor updates to the README and demos;
+  thanks to Alan Yee.
 * :feature:`780 (1.18+)` (also :issue:`779`, and may help users affected by
   :issue:`520`) Add an optional ``timeout`` parameter to
   `Transport.start_client <paramiko.transport.Transport.start_client>` (and
@@ -58,21 +59,21 @@ Changelog
   ``SSHException``. This moves the behavior in line with other "bad keys"
   situations, re: Paramiko's main auth loop. Thanks to MengHuan Yu for the
   patch.
-* :bug:`789` Add a missing ``.closed`` attribute (plus ``._closed`` because
-  reasons) to `ProxyCommand <paramiko.proxy.ProxyCommand>` so the earlier
-  partial fix for :issue:`520` works in situations where one is gatewaying via
-  ``ProxyCommand``.
-* :bug:`334` Make the ``subprocess`` import in ``proxy.py`` lazy so users on
-  platforms without it (such as Google App Engine) can import Paramiko
+* :bug:`789 (1.17+)` Add a missing ``.closed`` attribute (plus ``._closed``
+  because reasons) to `ProxyCommand <paramiko.proxy.ProxyCommand>` so the
+  earlier partial fix for :issue:`520` works in situations where one is
+  gatewaying via ``ProxyCommand``.
+* :bug:`334 (1.17+)` Make the ``subprocess`` import in ``proxy.py`` lazy so
+  users on platforms without it (such as Google App Engine) can import Paramiko
   successfully. (Relatedly, make it easier to tweak an active socket check
   timeout  [in `Transport <paramko.transport.Transport>`] which was previously
   hardcoded.) Credit: Shinya Okano.
-* :support:`854 backported` Fix incorrect docstring/param-list for
+* :support:`854 backported (1.17+)` Fix incorrect docstring/param-list for
   `Transport.auth_gssapi_keyex
   <paramiko.transport.Transport.auth_gssapi_keyex>` so it matches the real
   signature. Caught by ``@Score_Under``.
-* :bug:`681` Fix a Python3-specific bug re: the handling of read buffers when
-  using ``ProxyCommand``. Thanks to Paul Kapp for catch & patch.
+* :bug:`681 (1.17+)` Fix a Python3-specific bug re: the handling of read
+  buffers when using ``ProxyCommand``. Thanks to Paul Kapp for catch & patch.
 * :feature:`398 (1.18+)` Add an ``environment`` dict argument to
   `Client.exec_command <paramiko.client.SSHClient.exec_command>` (plus the
   lower level `Channel.update_environment