Merge 3.4 (codecs, issue #24894)

0ec69a6a · Victor Stinner · 1749ce75 · bfd9767e · 0ec69a6a
Commit 0ec69a6a authored Sep 24, 2015 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Doc/library/codecs.rst Doc/library/codecs.rst +2 -0

No files found.
--- 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               |