diff options
| author | holger krekel <holger@merlinux.eu> | 2014-04-27 08:07:43 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2014-04-27 08:07:43 +0200 |
| commit | 86ec06305c40f6a29247446ea6feb696216a8178 (patch) | |
| tree | b4d9d4c225bb2484dfcacb4575838c322eeda53f | |
| parent | 598b1e18592590eb57f4df2e6b614c79bdb2e2c1 (diff) | |
| parent | 9e558d2074ba184facaaa081c7129ac2b0a73b59 (diff) | |
| download | tox-86ec06305c40f6a29247446ea6feb696216a8178.tar.gz | |
Merged in msabramo/tox/doc_fix_broken_links (pull request #96)
doc: Fix broken links
| -rw-r--r-- | doc/example/jenkins.txt | 4 | ||||
| -rw-r--r-- | tox/_quickstart.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/example/jenkins.txt b/doc/example/jenkins.txt index 57b71ab..2d8dc25 100644 --- a/doc/example/jenkins.txt +++ b/doc/example/jenkins.txt @@ -32,7 +32,9 @@ using these steps: The last point requires that your test command creates JunitXML files, for example with ``py.test`` it is done like this: - commands=py.test --junitxml=junit-{envname}.xml +.. code-block:: ini + + commands = py.test --junitxml=junit-{envname}.xml diff --git a/tox/_quickstart.py b/tox/_quickstart.py index f66f1e2..098eb61 100644 --- a/tox/_quickstart.py +++ b/tox/_quickstart.py @@ -56,7 +56,7 @@ except NameError: term_input = input -all_envs = ['py26', 'py27', 'py32', 'py33', 'pypy', 'jython'] +all_envs = ['py26', 'py27', 'py32', 'py33', 'py34', 'pypy', 'jython'] PROMPT_PREFIX = '> ' |