summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2015-02-25 12:07:03 (GMT)
committerGeorg Brandl <georg@python.org>2015-02-25 12:07:03 (GMT)
commit961dfa10a6f205dfee853a2e87680c78113f4be4 (patch)
tree4948968fd68306afc29bf878cb84ad651391d709
parentc55a316cff6723a22dbe57b2e9d0d25b5387226d (diff)
parent7e91af3a91ad6fee49c2ed75309552a6b5afea52 (diff)
downloadcpython-961dfa10a6f205dfee853a2e87680c78113f4be4.zip
cpython-961dfa10a6f205dfee853a2e87680c78113f4be4.tar.gz
cpython-961dfa10a6f205dfee853a2e87680c78113f4be4.tar.bz2
Merge with 3.4
-rw-r--r--Doc/library/codecs.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 048f0e9..0430cb9 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -403,7 +403,7 @@ functions:
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)