summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-01-29 04:06:49 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-01-29 04:06:49 (GMT)
commit5da4e86bc0bb97c1abe4322890abd49ceabbde41 (patch)
treecf23730f2ac2f960e4cf0d38fd829b7ae53c0621 /Doc
parent0110dfc523076f6dee7e06332ce7a273acc03815 (diff)
parent4942870471541e84d796bc1bef6088c08abae5f6 (diff)
downloadcpython-5da4e86bc0bb97c1abe4322890abd49ceabbde41.zip
cpython-5da4e86bc0bb97c1abe4322890abd49ceabbde41.tar.gz
cpython-5da4e86bc0bb97c1abe4322890abd49ceabbde41.tar.bz2
Issue #26220: Merge Unicode how-to from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/unicode.rst3
1 files changed, 0 insertions, 3 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index ee31a9c..c16cac5 100644
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -297,9 +297,6 @@ The following examples show the differences::
>>> b'\x80abc'.decode("utf-8", "ignore")
'abc'
-(In this code example, the Unicode replacement character has been replaced by
-a question mark because it may not be displayed on some systems.)
-
Encodings are specified as strings containing the encoding's name. Python 3.2
comes with roughly 100 different encodings; see the Python Library Reference at
:ref:`standard-encodings` for a list. Some encodings have multiple names; for