[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (codecs, issue #24894)

[victor.stinner]

https://hg.python.org/cpython/rev/97842831c635
changeset:   98237:97842831c635
parent:      98234:d20deb8601c1
parent:      98236:84a918335fe5
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Sep 24 09:04:44 2015 +0200
summary:
  Merge 3.5 (codecs, issue #24894)

files:
  Doc/library/codecs.rst |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1148,6 +1148,8 @@
 +-----------------+--------------------------------+--------------------------------+
 | 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               |

-- 
Repository URL: https://hg.python.org/cpython