diff options
| author | Ian Lee <IanLee1521@gmail.com> | 2014-12-29 13:10:14 -0800 |
|---|---|---|
| committer | Ian Lee <IanLee1521@gmail.com> | 2014-12-29 13:10:14 -0800 |
| commit | 510003502b5e067b927e9a62b69937cd9b0eff6e (patch) | |
| tree | 55738a88d6a897bc1b5fa73d542178c55f4f08ee | |
| parent | bc43d49da514a43cfea7aa2be88abb078681bd55 (diff) | |
| download | pep8-510003502b5e067b927e9a62b69937cd9b0eff6e.tar.gz | |
Update docs for configuration
| -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 a5da86a..13a9553 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -183,9 +183,9 @@ Quick help is available on the command line:: Configuration ------------- -The behaviour may be configured at two levels. +The behaviour may be configured at two levels, the user and project levels. -The user settings are read from the following locations: +At the user level, settings are read from the following locations: If on Windows: ``~\.pep8`` @@ -202,7 +202,7 @@ Example:: ignore = E226,E302,E41 max-line-length = 160 -At the project level, a ``tox.ini`` file or a ``setup.cfg`` file is read if +At the project level, a ``setup.cfg`` file or a ``tox.ini`` 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. |