summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lee <IanLee1521@gmail.com>2014-12-18 00:00:36 -0800
committerIan Lee <IanLee1521@gmail.com>2014-12-18 00:00:36 -0800
commitfe6a8a813d616c9fa397b2fd5b967bf72378b09a (patch)
treeccf379531edf194e9f1a176be5edb5fa19269d94
parent974748fd9a0ecdd494cdc51aeb16c54d38256d58 (diff)
downloadpep8-fe6a8a813d616c9fa397b2fd5b967bf72378b09a.tar.gz
Update documentation to reflect changes to default; issues #356 #316
-rw-r--r--docs/intro.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/intro.rst b/docs/intro.rst
index 1bcafe8..63a1fe6 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -228,7 +228,7 @@ This is the current list of error and warning codes:
| E116 | unexpected indentation (comment) |
+----------+----------------------------------------------------------------------+
+----------+----------------------------------------------------------------------+
-| E121 (^) | continuation line under-indented for hanging indent |
+| E121 (*^)| continuation line under-indented for hanging indent |
+----------+----------------------------------------------------------------------+
| E122 (^) | continuation line missing indentation or outdented |
+----------+----------------------------------------------------------------------+
@@ -238,7 +238,7 @@ This is the current list of error and warning codes:
+----------+----------------------------------------------------------------------+
| E125 (^) | continuation line with same indent as next logical line |
+----------+----------------------------------------------------------------------+
-| E126 (^) | continuation line over-indented for hanging indent |
+| E126 (*^)| continuation line over-indented for hanging indent |
+----------+----------------------------------------------------------------------+
| E127 (^) | continuation line over-indented for visual indent |
+----------+----------------------------------------------------------------------+
@@ -395,11 +395,11 @@ This is the current list of error and warning codes:
+----------+----------------------------------------------------------------------+
-**(*)** In the default configuration, the checks **E123**, **E133**, **E226**,
-**E241**, **E242** and **E704** are ignored because they are not rules unanimously
-accepted, and `PEP 8`_ does not enforce them. The check **E133** is mutually
-exclusive with check **E123**. Use switch ``--hang-closing`` to report **E133**
-instead of **E123**.
+**(*)** In the default configuration, the checks **E121**, **E123**, **E126**,
+**E133**, **E226**, **E241**, **E242** and **E704** are ignored because they
+are not rules unanimously accepted, and `PEP 8`_ does not enforce them. The
+check **E133** is mutually exclusive with check **E123**. Use switch ``--hang-
+closing`` to report **E133** instead of **E123**.
**(^)** These checks can be disabled at the line level using the ``# noqa``
special comment. This possibility should be reserved for special cases.
@@ -420,7 +420,7 @@ Related tools
The `flake8 checker <https://flake8.readthedocs.org>`_ is a wrapper around
``pep8`` and similar tools. It supports plugins.
-Other tools which use ``pep8`` are referenced in the Wiki: `list of related tools
-<https://github.com/jcrocholl/pep8/wiki/RelatedTools>`_.
+Other tools which use ``pep8`` are referenced in the Wiki: `list of related
+tools <https://github.com/jcrocholl/pep8/wiki/RelatedTools>`_.
.. _PEP 8: http://www.python.org/dev/peps/pep-0008/