summaryrefslogtreecommitdiff
path: root/doc/index.txt
diff options
context:
space:
mode:
Diffstat (limited to 'doc/index.txt')
-rw-r--r--doc/index.txt14
1 files changed, 5 insertions, 9 deletions
diff --git a/doc/index.txt b/doc/index.txt
index ed594cd..17d063d 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -5,7 +5,7 @@ vision: standardize testing in Python
---------------------------------------------
``tox`` aims to automate and standardize testing in Python. It is part
-of a larger vision of easing the packaging, testing and release process
+of a larger vision of easing the packaging, testing and release process
of Python software.
What is Tox?
@@ -21,7 +21,6 @@ Tox is a generic virtualenv_ management and test command line tool you can use f
* acting as a frontend to Continuous Integration servers, greatly
reducing boilerplate and merging CI and shell-based testing.
-
Basic example
-----------------
@@ -63,10 +62,10 @@ Current features
- test-tool agnostic: runs py.test, nose or unittests in a uniform manner
-* :doc:`(new in 2.0) plugin system <plugins>` to modify tox execution with simple hooks.
+* supports :ref:`using different / multiple PyPI index servers <multiindex>`
* uses pip_ and setuptools_ by default. Experimental
- support for configuring the installer command
+ support for configuring the installer command
through :confval:`install_command=ARGV`.
* **cross-Python compatible**: CPython-2.6, 2.7, 3.2 and higher,
@@ -75,11 +74,11 @@ Current features
* **cross-platform**: Windows and Unix style environments
* **integrates with continuous integration servers** like Jenkins_
- (formerly known as Hudson) and helps you to avoid boilerplatish
+ (formerly known as Hudson) and helps you to avoid boilerplatish
and platform-specific build-step hacks.
* **full interoperability with devpi**: is integrated with and
- is used for testing in the devpi_ system, a versatile pypi
+ is used for testing in the devpi_ system, a versatile pypi
index server and release managing tool.
* **driven by a simple ini-style config file**
@@ -90,9 +89,6 @@ Current features
* **professionally** :doc:`supported <support>`
-* supports :ref:`using different / multiple PyPI index servers <multiindex>`
-
-
.. _pypy: http://pypy.org
.. _`tox.ini`: :doc:configfile