Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@ v1.0
for test commands (thanks Chris Rose)
- fix `#22 <https://github.com/tox-dev/tox/issues/22>`_: require virtualenv-1.6.1, obsoleting virtualenv5 (thanks Jannis Leidel)
and making things work with pypy-1.5 and python3 more seamlessly
- toxbootstrap.py (used by jenkins build slaves) now follows the latest release of virtualenv
- toxbootstrap.py (used by jenkins build agents) now follows the latest release of virtualenv
- fix `#20 <https://github.com/tox-dev/tox/issues/20>`_: document format of URLs for specifying dependencies
- fix `#19 <https://github.com/tox-dev/tox/issues/19>`_: substitute Hudson for Jenkins everywhere following the renaming
of the project. NOTE: if you used the special [tox:hudson]
Expand Down
6 changes: 3 additions & 3 deletions docs/example/jenkins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Using Jenkins multi-configuration jobs

The Jenkins_ continuous integration server allows to define "jobs" with
"build steps" which can be test invocations. If you :doc:`install <../install>` ``tox`` on your
default Python installation on each Jenkins slave, you can easily create
default Python installation on each Jenkins agent, you can easily create
a Jenkins multi-configuration job that will drive your tox runs from the CI-server side,
using these steps:

Expand Down Expand Up @@ -42,7 +42,7 @@ for example with ``pytest`` it is done like this:



**zero-installation** for slaves
**zero-installation** for agents
-------------------------------------------------------------

.. note::
Expand All @@ -51,7 +51,7 @@ for example with ``pytest`` it is done like this:
has been removed. Please file an issue if you'd like to
see it back.

If you manage many Jenkins slaves and want to use the latest officially
If you manage many Jenkins agents and want to use the latest officially
released tox (or latest development version) and want to skip manually
installing ``tox`` then substitute the above **Python build step** code
with this:
Expand Down