summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2014-06-18 12:11:01 +0200
committerholger krekel <holger@merlinux.eu>2014-06-18 12:11:01 +0200
commitbfb9423685f02a98801981a60720e21dce694b67 (patch)
tree7c97f4857bfe6a9e33e430c9433492fd036316b9
parenta806881459a7b33dcee496ac079e172b3d2ccbc0 (diff)
downloadtox-bfb9423685f02a98801981a60720e21dce694b67.tar.gz
also put "envlist" into its own section.
-rw-r--r--doc/config.txt13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/config.txt b/doc/config.txt
index 23bf128..9288ee2 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -45,15 +45,14 @@ and will first lookup global tox settings in this section::
always overrides this setting if passed on the invokation.
**Default:** ``False``
-envlist setting
-+++++++++++++++
+.. confval:: envlist=CSV
-Determining the environment list that ``tox`` is to operate on
-happens in this order:
+ Determining the environment list that ``tox`` is to operate on
+ happens in this order (if any is found, no further lookups are made):
-* command line option ``-eENVLIST``
-* environment variable ``TOXENV``
-* ``tox.ini`` file's ``envlist``
+ * command line option ``-eENVLIST``
+ * environment variable ``TOXENV``
+ * ``tox.ini`` file's ``envlist``
Virtualenv test environment settings