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

Wed Feb 25 13:07:53 CET 2015

https://hg.python.org/cpython/rev/3673cc0c1b8f
changeset: 94739:3673cc0c1b8f
parent: 94735:bb67b810aac1
parent: 94738:c113cdfef1e1
user: Georg Brandl <georg at python.org>
date: Wed Feb 25 13:07:03 2015 +0100
summary:
 Merge with 3.4
files:
 Doc/library/codecs.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -403,7 +403,7 @@
 Implements the ``'replace'`` error handling (for :term:`text encodings
 <text encoding>` only): substitutes ``'?'`` for encoding errors
 (to be encoded by the codec), and ``'\ufffd'`` (the Unicode replacement
- character, ``'�'``) for decoding errors.
+ character) for decoding errors.
 
 
 .. function:: ignore_errors(exception)
-- 
Repository URL: https://hg.python.org/cpython
