Add changelog entry for issue #36 and adapt the help message.

3 files changed, 5 insertions, 3 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 7d00de3..d098ed5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,8 @@ Changelog
 0.6.2 UNRELEASED
 ----------------
 
+* Allow to specify ``--max-line-length``. (Issue #36)
+
 * Make the shebang more flexible. (Issue #26)
 
 * Add testsuite to the bundle. (Issue #25)
diff --git a/README.rst b/README.rst
index 0087d66..305547b 100644
--- a/README.rst
+++ b/README.rst
@@ -109,7 +109,7 @@ Quick help is available on the command line::
                          error and set exit code to 1 if total is not null
     --benchmark          measure processing speed
     --testsuite=dir      run regression tests from dir
-    --max-line-length=n  set to a higher value to relax pep8 line length
+    --max-line-length=n  set maximum allowed line length (default 79)
     --doctest            run doctest on myself
 
 Feedback
diff --git a/pep8.py b/pep8.py
index 1c09695..66fe848 100755
--- a/pep8.py
+++ b/pep8.py
@@ -1291,8 +1291,8 @@ def process_options(arglist=None):
                       help="run regression tests from dir")
     parser.add_option('--max-line-length', type='int', metavar='n',
                       default=MAX_LINE_LENGTH,
-                      help="set to a higher value to relax pep8 "
-                      "line length restictions")
+                      help="set maximum allowed line length (default: %d)" %
+                      MAX_LINE_LENGTH)
     parser.add_option('--doctest', action='store_true',
                       help="run doctest on myself")
     options, args = parser.parse_args(arglist)