summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-12-02 19:25:47 +0100
committerholger krekel <holger@merlinux.eu>2015-12-02 19:25:47 +0100
commit0bfce6713d7f55e232345c6a6fe0fc17f57553c3 (patch)
tree0c8f11787ef5cb85853b16d5f6de95ca0f73caf2
parentb7823bfad66e0236ac161bdf3badc685c55e9683 (diff)
parent21c4f1be193eace2f7e941572dc5d8a8c725d969 (diff)
downloadtox-0bfce6713d7f55e232345c6a6fe0fc17f57553c3.tar.gz
Merged in pmoore/tox/document-py-env (pull request #181)
Document the 'py' environment
-rw-r--r--doc/example/basic.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/example/basic.txt b/doc/example/basic.txt
index d0ad004..64150f3 100644
--- a/doc/example/basic.txt
+++ b/doc/example/basic.txt
@@ -30,6 +30,7 @@ you can run restrict the test run to the python2.6 environment.
Available "default" test environments names are::
+ py
py24
py25
py26
@@ -43,6 +44,8 @@ Available "default" test environments names are::
pypy
pypy3
+The environment ``py`` uses the version of Python used to invoke tox.
+
However, you can also create your own test environment names,
see some of the examples in :doc:`examples <../examples>`.