From 21c4f1be193eace2f7e941572dc5d8a8c725d969 Mon Sep 17 00:00:00 2001
From: Paul Moore <p.f.moore@gmail.com>
Date: Wed, 2 Dec 2015 15:01:38 +0000
Subject: Document the 'py' environment

---
 doc/example/basic.txt | 3 +++
 1 file changed, 3 insertions(+)

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>`.
 
-- 
cgit v1.2.1

-- 
cgit v1.2.1


From ca1df001bdbe8f41e2110a330c8ccd7f8088c107 Mon Sep 17 00:00:00 2001
From: Colin Dunklau <colin.dunklau@gmail.com>
Date: Fri, 4 Dec 2015 06:35:43 -0600
Subject: Fix two minor typos in config doc

---
 doc/config.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/config.txt b/doc/config.txt
index 8bfa57d..22f3dc7 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -441,7 +441,7 @@ Values from other sections can be refered to via::
    {[sectionname]valuename}
 
 which you can use to avoid repetition of config values.
-You can put default values in one section and reference them in others to avoid repeting the same values::
+You can put default values in one section and reference them in others to avoid repeating the same values::
 
     [base]
     deps =
@@ -455,7 +455,7 @@ You can put default values in one section and reference them in others to avoid
         {[base]deps}
 
     [testenv:mercurial]
-    dep =
+    deps =
         mercurial
         {[base]deps}
 
-- 
cgit v1.2.1


From 46f4845a6756e1eb483e322aff5b38718b36e916 Mon Sep 17 00:00:00 2001
From: Patrick Mezard <patrick@mezard.eu>
Date: Sat, 5 Dec 2015 14:35:26 +0100
Subject: Fix minor typo in --help message

---
 tox/session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox/session.py b/tox/session.py
index f4214cf..6b82ccd 100644
--- a/tox/session.py
+++ b/tox/session.py
@@ -51,7 +51,7 @@ def show_help(config):
             "(overridable by '-e')")
     tw.line("TOX_TESTENV_PASSENV: space-separated list of extra "
             "environment variables to be passed into test command "
-            "environemnts")
+            "environments")
 
 
 def show_help_ini(config):
-- 
cgit v1.2.1