fix a test, fix docs

4 files changed, 10 insertions, 9 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7e0592d..e19fd7c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,13 +3,12 @@
 
 - fix pip-installation mixups by always unsetting PIP_RESPECT_VIRTUALENV
   (thanks Armin Ronacher)
-- issue1: Add a toxbootstrap.py script for tox
+- issue1: Add a toxbootstrap.py script for tox, thanks to Sridhar
+  Ratnakumar
 - added support for working with different and multiple PYPI indexservers.
 - new option: -r|--recreate to force recreation of virtualenv
-- depend on new 'pylib' distribution instead of the whole "py" package
-  which also installed py.test etc. (which is contained in py)
-- always install sdist files with "--upgrade" to be more resilient
-  against version/upgrade refusals from installation tools
+- depend on py>=1.4.0 which does not contain or install the py.test
+  anymore which is now a separate distribution "pytest".
 - show logfile content if there is an error (makes CI output
   more readable)
 
diff --git a/doc/example/pytest.txt b/doc/example/pytest.txt
index bca12ac..c4e3fc9 100644
--- a/doc/example/pytest.txt
+++ b/doc/example/pytest.txt
@@ -20,7 +20,7 @@ and the following ``tox.ini`` content::
     envlist = py26,py31
 
     [testenv]
-    deps=py           # PYPI package providing py.test
+    deps=pytest       # PYPI package providing py.test
     commands=
       py.test \
             []        # substitute with tox' positional arguments
@@ -45,7 +45,7 @@ and the following ``tox.ini`` content::
     envlist = py26,py31
     [testenv]
     changedir=tests
-    deps=py
+    deps=pytest
     commands=
       py.test \
         --basetemp={envtmpdir}  \ # py.test tempdir setting
diff --git a/doc/index.txt b/doc/index.txt
index edbc771..f3305fa 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -68,7 +68,7 @@ Current features
 * uses pip_ (for Python2 environments) and distribute_ (for all environments) by default
 
 * **cross-Python compatible**: Python2.4 up to Python2.7, Jython and experimental
-  Python3 support as well as for pypy-c (which needs patches)
+  Python3 support as well as for pypy_
 
 * **cross-platform**: Windows and Unix style environments
 
@@ -86,6 +86,8 @@ Current features
 
 * **professionally** :doc:`supported <support>`
 
+.. _pypy: http://pypy.org
+
 Notes and known limitations
 ----------------------------------
 
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index 8572567..37816c8 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -244,7 +244,7 @@ def test_test_simple(cmd, initproj):
     initproj("example123-0.5", filedefs={
         'tests': {'test_hello.py': """
             def test_hello(pytestconfig):
-                pytestconfig.mktemp("hello")
+                pass
             """,
         },
         'tox.ini': '''