summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-24 07:04:26 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-24 07:04:26 (GMT)
commit0ec69a6a41387cda8eb52a1da1df4bc2e5311152 (patch)
tree32a6aaf08e11a6f9333cad73589d47f7ea019f37
parent1749ce75429fd06749aedb3e5548996df8285827 (diff)
parentbfd9767e0ff878704eed8672dddb970f12abe9c7 (diff)
downloadcpython-0ec69a6a41387cda8eb52a1da1df4bc2e5311152.zip
cpython-0ec69a6a41387cda8eb52a1da1df4bc2e5311152.tar.gz
cpython-0ec69a6a41387cda8eb52a1da1df4bc2e5311152.tar.bz2
Merge 3.4 (codecs, issue #24894)
-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 |