Merge branch '2.0'

1 files changed, 5 insertions, 4 deletions

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index f739c9fa..fe837bdd 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -18,10 +18,11 @@ Changelog
   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.
-* :feature:`398` Add an ``environment`` dict argument to `Client.exec_command
-  <paramiko.client.SSHClient.exec_command>` (plus the lower level
-  `Channel.update_environment <paramiko.channel.Channel.update_environment>`
-  and `Channel.set_environment_variable
+* :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
+  <paramiko.channel.Channel.update_environment>` and
+  `Channel.set_environment_variable
   <paramiko.channel.Channel.set_environment_variable>` methods) which
   implements the ``env`` SSH message type. This means the remote shell
   environment can be set without the use of ``VARNAME=value`` shell tricks,