[Python-checkins] cpython (merge 3.1 -> 3.2): Merge with 3.1.

[ezio.melotti]

http://hg.python.org/cpython/rev/0eaa8b38e18b
changeset:   69324:0eaa8b38e18b
branch:      3.2
parent:      69320:b279611146d7
parent:      69323:bbed01a7d0d1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Apr 13 16:44:18 2011 +0300
summary:
  Merge with 3.1.

files:
  Lib/email/header.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/email/header.py b/Lib/email/header.py
--- a/Lib/email/header.py
+++ b/Lib/email/header.py
@@ -292,7 +292,7 @@
         75-character length limit on any given encoded header field, so
         line-wrapping must be performed, even with double-byte character sets.
 
-        Optional maxlinelen specifies the maxiumum length of each generated
+        Optional maxlinelen specifies the maximum length of each generated
         line, exclusive of the linesep string.  Individual lines may be longer
         than maxlinelen if a folding point cannot be found.  The first line
         will be shorter by the length of the header name plus ": " if a header

-- 
Repository URL: http://hg.python.org/cpython