diff options
| author | Anthony Sottile <asottile@umich.edu> | 2019-08-07 13:00:58 +0000 |
|---|---|---|
| committer | Anthony Sottile <asottile@umich.edu> | 2019-08-07 13:00:58 +0000 |
| commit | d43d498d419fa1a0ec1489301d29d50fdd5be3f9 (patch) | |
| tree | 66abe8c66a9d1fe5592bbbaf8111fa26e60dc0eb | |
| parent | d9a45474873f73938e0c2186c69733a74abd8d2b (diff) | |
| parent | 9e97143e49687e0e1fb4e5eec8930aa0107d9c2b (diff) | |
| download | flake8-d43d498d419fa1a0ec1489301d29d50fdd5be3f9.tar.gz | |
Merge branch 'doc_conf_priority' into 'master'
Document priority of configuration files and command line
Closes #560
See merge request pycqa/flake8!336
| -rw-r--r-- | docs/source/user/configuration.rst | 5 |
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 -------------------- |