diff options
| author | holger krekel <holger@merlinux.eu> | 2011-05-26 17:24:32 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2011-05-26 17:24:32 +0200 |
| commit | a22088adb758343d28c10d3880cede6530e163d4 (patch) | |
| tree | 3e76ab386c1396bdeb422daf83aedc21a8651471 | |
| parent | 4818c38922f4f30af4c82d45eb4f2750dc2c03cb (diff) | |
| download | tox-a22088adb758343d28c10d3880cede6530e163d4.tar.gz | |
some doc fixes
| -rw-r--r-- | doc/config.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/config.txt b/doc/config.txt index 180c41b..09851e8 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -22,8 +22,8 @@ List of optional global options:: envlist=ENVLIST # defaults to the list of all environments -``tox`` autodetects if it is running in a Hudson_ context -(by checking for existence of the ``HUDSON_URL`` environment variable) +``tox`` autodetects if it is running in a Jenkins_ context +(by checking for existence of the ``JENKINS_URL`` environment variable) and will first lookup global tox settings in this section:: [tox:hudson] @@ -85,11 +85,11 @@ Complete list of settings that you can put into ``testenv*`` sections: package installation. Each line defines a dependency, which will be passed to easy_install/pip for processing. It can be a file, and URL or a package name. You can additionally specify - an :ref:`indexserver` to use for installing this dependency. + an :confval:`indexserver` to use for installing this dependency. All derived dependencies (deps required by the dep) will be loaded from the specified indexserver:: - deps = :myindex:pkg + deps = :myindexserver:pkg .. confval:: setenv=MULTI-LINE-LIST @@ -148,7 +148,7 @@ Complete list of settings that you can put into ``testenv*`` sections: Depedencies can specify using a specified index server through the ``:indexservername:depname`` pattern. The ``default`` indexserver definition determines where unscoped dependencies and the sdist install - comes from. Example:: + installs from. Example:: [tox] indexserver = |
