Changeset 391 for python/trunk/Doc/library/email.charset.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/email.charset.rst (modified) (2 diffs)

python/trunk/Doc/library/email.charset.rst

@@ -1 @@
-:mod:`email`: Representing character sets
------------------------------------------
+:mod:`email.charset`: Representing character sets
+-------------------------------------------------
 
 .. module:: email.charset
@@ -250 +250 @@
    *charset* is the canonical name of a character set. *codecname* is the name of a
    Python codec, as appropriate for the second argument to the :func:`unicode`
-   built-in, or to the :meth:`encode` method of a Unicode string.
-
+   built-in, or to the :meth:`~unicode.encode` method of a Unicode string.
+