summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-24 07:04:44 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-24 07:04:44 (GMT)
commit63c8907498c2a1e9fccf32e2cfd0f8e9a5896f53 (patch)
tree01f2a9a9c5cbf46c65664b3a32528cabc9012e4f /Doc
parent51c0f3e451a0cde2d7c22bff3c3554957518b50f (diff)
parent0ec69a6a41387cda8eb52a1da1df4bc2e5311152 (diff)
downloadcpython-63c8907498c2a1e9fccf32e2cfd0f8e9a5896f53.zip
cpython-63c8907498c2a1e9fccf32e2cfd0f8e9a5896f53.tar.gz
cpython-63c8907498c2a1e9fccf32e2cfd0f8e9a5896f53.tar.bz2
Merge 3.5 (codecs, issue #24894)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/codecs.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 7438aec..46d72b5 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1148,6 +1148,8 @@ particular, the following variants typically exist:
+-----------------+--------------------------------+--------------------------------+
| iso8859_10 | iso-8859-10, latin6, L6 | Nordic languages |
+-----------------+--------------------------------+--------------------------------+
+| iso8859_11 | iso-8859-11, thai | Thai languages |
++-----------------+--------------------------------+--------------------------------+
| iso8859_13 | iso-8859-13, latin7, L7 | Baltic languages |
+-----------------+--------------------------------+--------------------------------+
| iso8859_14 | iso-8859-14, latin8, L8 | Celtic languages |