summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorThomas Kluyver <takowl@gmail.com>2015-09-22 10:03:35 +0100
committerThomas Kluyver <takowl@gmail.com>2015-09-22 10:03:35 +0100
commit5523026eeeb477965de55e59f26eb3c50fb11775 (patch)
tree955494e96948230590e9d27391e54593719a9b57 /doc
parent1d1f3daea99d432d0cef45a410ffbcc18e064619 (diff)
parent1105bda164299315a698b7b1a8c2fc8f27310949 (diff)
downloadpexpect-git-5523026eeeb477965de55e59f26eb3c50fb11775.tar.gz
Merge pull request #257 from pexpect/3.4-never-released-sadly
remove version 3.4 from history
Diffstat (limited to 'doc')
-rw-r--r--doc/conf.py4
-rw-r--r--doc/history.rst3
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/conf.py b/doc/conf.py
index 3dd5d3e..305ad6a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -52,9 +52,9 @@ copyright = u'2013, Noah Spurrier and contributors'
# built documents.
#
# The short X.Y version.
-version = '3.3'
+version = '4.0'
# The full version, including alpha/beta/rc tags.
-release = '3.3'
+release = '4.0.dev'
# 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 8186b47..8ebe458 100644
--- a/doc/history.rst
+++ b/doc/history.rst
@@ -22,9 +22,6 @@ Version 4.0
* Removed the independent top-level modules (``pxssh fdpexpect FSM screen ANSI``)
which were installed alongside Pexpect. These were moved into the Pexpect
package in 3.0, but the old names were left as aliases.
-
-Version 3.4
-```````````
* Fix regression that prevented executable, but unreadable files from
being found when not specified by absolute path -- such as
/usr/bin/sudo (:ghissue:`104`).