Merge branch 'origin/proposed/3.0' into master3.0.0b1

1 files changed, 12 insertions, 0 deletions

diff --git a/src/flake8/options/__init__.py b/src/flake8/options/__init__.py
new file mode 100644
index 0000000..cc20daa
--- /dev/null
+++ b/src/flake8/options/__init__.py
@@ -0,0 +1,12 @@
+"""Package containing the option manager and config management logic.
+
+- :mod:`flake8.options.config` contains the logic for finding, parsing, and
+  merging configuration files.
+
+- :mod:`flake8.options.manager` contains the logic for managing customized
+  Flake8 command-line and configuration options.
+
+- :mod:`flake8.options.aggregator` uses objects from both of the above modules
+  to aggregate configuration into one object used by plugins and Flake8.
+
+"""