summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeterjc <p.j.a.cock@googlemail.com>2019-08-07 10:31:14 +0100
committerpeterjc <p.j.a.cock@googlemail.com>2019-08-07 10:31:14 +0100
commit9e97143e49687e0e1fb4e5eec8930aa0107d9c2b (patch)
tree66abe8c66a9d1fe5592bbbaf8111fa26e60dc0eb
parentd9a45474873f73938e0c2186c69733a74abd8d2b (diff)
downloadflake8-9e97143e49687e0e1fb4e5eec8930aa0107d9c2b.tar.gz
Document priority of configuration files and command line
Closes issue 560.
-rw-r--r--docs/source/user/configuration.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/source/user/configuration.rst b/docs/source/user/configuration.rst
index e6b3de8..108dd98 100644
--- a/docs/source/user/configuration.rst
+++ b/docs/source/user/configuration.rst
@@ -30,6 +30,11 @@ Configuration Locations
- In your project in one of ``setup.cfg``, ``tox.ini``, or ``.flake8``.
+Values set at the command line have highest priority, then those in the
+project configuration file, then those in your user directory, and finally
+there are the defaults. However, there are additional command line options
+which can alter this.
+
"User" Configuration
--------------------