diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-06-27 22:41:29 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-06-27 22:41:29 (GMT) |
commit | 5a6214afe2e454a9d1247c53db643c28114d5d1e (patch) | |
tree | cac88df40e576f800df0a556b86c60424ade97de /Doc | |
parent | 556d8001dfaf5c7d6b45d5d1e6d09ed7a410c8b3 (diff) | |
download | cpython-5a6214afe2e454a9d1247c53db643c28114d5d1e.zip cpython-5a6214afe2e454a9d1247c53db643c28114d5d1e.tar.gz cpython-5a6214afe2e454a9d1247c53db643c28114d5d1e.tar.bz2 |
Merged revisions 81499,81506 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81499 | georg.brandl | 2010-05-24 16:29:07 -0500 (Mon, 24 May 2010) | 1 line
#8016: add the CP858 codec (approved by Benjamin). (Also add CP720 to the tests, it was missing there.)
........
r81506 | benjamin.peterson | 2010-05-24 17:04:53 -0500 (Mon, 24 May 2010) | 1 line
set svn:eol-style
........
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/codecs.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 853cc78..31e0424 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -953,6 +953,8 @@ particular, the following variants typically exist: +-----------------+--------------------------------+--------------------------------+ | cp857 | 857, IBM857 | Turkish | +-----------------+--------------------------------+--------------------------------+ +| cp858 | 858, IBM858 | Western Europe | ++-----------------+--------------------------------+--------------------------------+ | cp860 | 860, IBM860 | Portuguese | +-----------------+--------------------------------+--------------------------------+ | cp861 | 861, CP-IS, IBM861 | Icelandic | |