summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorThomas Kluyver <thomas@kluyver.me.uk>2016-08-21 21:10:04 +0100
committerThomas Kluyver <thomas@kluyver.me.uk>2016-08-21 21:10:04 +0100
commitb4fb7c414aca7c0bf59fefe23508574b366fb4ed (patch)
treef4da2d898e4e8f2b0d3fe15b9fd4f5c1d1f05ab3 /doc
parent9b25aaaf1fa8534be555f0a86d5fd0f118178439 (diff)
downloadpexpect-git-b4fb7c414aca7c0bf59fefe23508574b366fb4ed.tar.gz
Prepare to release 4.2.14.2.1
Diffstat (limited to 'doc')
-rw-r--r--doc/conf.py2
-rw-r--r--doc/history.rst7
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py
index f3de534..cda9f5d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -54,7 +54,7 @@ copyright = u'2013, Noah Spurrier and contributors'
# The short X.Y version.
version = '4.2'
# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/doc/history.rst b/doc/history.rst
index f90d515..bf38894 100644
--- a/doc/history.rst
+++ b/doc/history.rst
@@ -4,6 +4,13 @@ History
Releases
--------
+Version 4.2.1
+`````````````
+
+* Fix to allow running ``env`` in replwrap-ed bash.
+* Raise more informative exception from pxssh if it fails to connect.
+* Change ``passmass`` example to not log passwords entered.
+
Version 4.2
```````````