summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2014-04-29 23:57:27 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2014-04-29 23:57:27 +0200
commit047b7fdb07ebde0a54661bf5d2aa9a9831c83d6f (patch)
tree674933e1c639e2c0bb362e051b55743b5e1f238d
parentae9fc22fd154ea7d16606cdf2880ed86c2eab1b1 (diff)
parentede69f7a3775b0830439abc19662d4ee23b0ce0a (diff)
downloadpep8-047b7fdb07ebde0a54661bf5d2aa9a9831c83d6f.tar.gz
Merge pull request #283 from HFulcher/master
Add path of the user configuration on Windows to the documentation; issue #281
-rw-r--r--docs/intro.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/intro.rst b/docs/intro.rst
index 018521d..fd2644e 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -158,7 +158,8 @@ Configuration
The behaviour may be configured at two levels.
-The user settings are read from the ``~/.config/pep8`` file.
+The user settings are read from the ``~/.config/pep8`` file and
+for Windows from the ``~\.pep8`` file.
Example::
[pep8]