summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAndrew Widdersheim <amwiddersheim@gmail.com>2015-12-09 08:54:51 -0500
committerAndrew Widdersheim <amwiddersheim@gmail.com>2015-12-09 08:54:51 -0500
commit828c69ea27491cbf540d7e326d4d5946ad3000f8 (patch)
tree741a080b9d3049894a221e55d7d8e4b20c692e6a /docs
parent4fb7d6a9a751f7cab1e8ead268b7c7864ef80827 (diff)
downloadflake8-828c69ea27491cbf540d7e326d4d5946ad3000f8.tar.gz
Fix per-project configuration file list
Diffstat (limited to 'docs')
-rw-r--r--docs/config.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/config.rst b/docs/config.rst
index 9d7d2ad..59ba3ec 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -18,9 +18,10 @@ Example::
Per-Project
-----------
-At the project level, 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 ``[flake8]`` section, no project specific configuration is loaded.
+At the project level, the ``tox.ini``, ``setup.cfg``, ``.pep8`` or ``.flake8``
+files are read if present. Only the first file is considered. If this file
+does not have a ``[flake8]`` section, no project specific configuration is
+loaded.
Default
-------