[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/0d9222f32510
changeset:   78530:0d9222f32510
parent:      78528:f3e5545cf40c
parent:      78529:5617c4a0c035
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sun Aug 12 15:35:43 2012 +0200
summary:
  merge with 3.2

files:
  Doc/library/smtpd.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -116,7 +116,7 @@
    .. attribute:: received_lines
 
       Holds a list of the line strings (decoded using UTF-8) received from
-      the client. The lines have their "\r\n" line ending translated to "\n".
+      the client. The lines have their "\\r\\n" line ending translated to "\\n".
 
    .. attribute:: smtp_state
 

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