From b2a2d9e687ecd24af3275f53435dc13a9e7157ad Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Sun, 24 Mar 2013 16:10:55 +0100 Subject: Read configuration from both tox.ini and setup.cfg; issue #182 --- docs/intro.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/intro.rst b/docs/intro.rst index c22df98..d73a3c8 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -163,9 +163,9 @@ Example:: ignore = E226,E302,E41 max-line-length = 160 -At the project level, a ``.pep8`` file, a ``tox.ini`` file or a ``setup.cfg`` -file is read if present. Only the first file is considered. If this file -does not have a ``[pep8]`` section, no project specific configuration is +At the project level, a ``tox.ini`` file or a ``setup.cfg`` file is read if +present (``.pep8`` file is also supported, but it is deprecated). If none of +these files have a ``[pep8]`` section, no project specific configuration is loaded. If the ``ignore`` option is not in the configuration and not in the arguments, -- cgit v1.2.1