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

[benjamin.peterson]

http://hg.python.org/cpython/rev/dbd3013c2685
changeset:   74205:dbd3013c2685
parent:      74202:656fa057aa28
parent:      74204:ce349e1f923e
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Dec 30 23:09:20 2011 -0600
summary:
  merge 3.2

files:
  Doc/library/smtplib.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -323,10 +323,10 @@
       envelope used by the transport agents.  ``sendmail`` does not modify the
       message headers in any way.
 
-   msg may be a string containing characters in the ASCII range, or a byte
+   *msg* may be a string containing characters in the ASCII range, or a byte
    string.  A string is encoded to bytes using the ascii codec, and lone ``\r``
-   and ``\n`` characters are converted to ``\r\n`` characters.  A byte string
-   is not modified.
+   and ``\n`` characters are converted to ``\r\n`` characters.  A byte string is
+   not modified.
 
    If there has been no previous ``EHLO`` or ``HELO`` command this session, this
    method tries ESMTP ``EHLO`` first. If the server does ESMTP, message size and

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