diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2013-03-24 16:10:55 +0100 |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2013-03-24 16:10:55 +0100 |
| commit | b2a2d9e687ecd24af3275f53435dc13a9e7157ad (patch) | |
| tree | bec4d89d25f07865014b7645298d8857fe4fb4d2 /docs | |
| parent | f44612e508e1433c40e7f394d171451587425426 (diff) | |
| download | pep8-b2a2d9e687ecd24af3275f53435dc13a9e7157ad.tar.gz | |
Read configuration from both tox.ini and setup.cfg; issue #182
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/intro.rst | 6 |
1 files changed, 3 insertions, 3 deletions
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, |