Merge branch 'doc_conf_priority' into 'master'

Document priority of configuration files and command line

Closes #560

See merge request pycqa/flake8!336
This commit is contained in:
Anthony Sottile 2019-08-07 13:00:58 +00:00
commit d43d498d41

View file

@ -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
--------------------