From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 1 Sep 2011 05:11:28 +0000 (+0300)
Subject: From RFC 3629 5- and 6-bytes UTF-8 sequences are invalid, so remove them from the... 
X-Git-Tag: v3.2.3rc1~597
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=222b20844f28f37dbe5431eb293ef2b35df71ae7;p=thirdparty%2FPython%2Fcpython.git

From RFC 3629 5- and 6-bytes UTF-8 sequences are invalid, so remove them from the doc.
---

diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 922bcf488afb..9477133794f2 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -839,7 +839,7 @@ There's another encoding that is able to encoding the full range of Unicode
 characters: UTF-8. UTF-8 is an 8-bit encoding, which means there are no issues
 with byte order in UTF-8. Each byte in a UTF-8 byte sequence consists of two
 parts: Marker bits (the most significant bits) and payload bits. The marker bits
-are a sequence of zero to six 1 bits followed by a 0 bit. Unicode characters are
+are a sequence of zero to four ``1`` bits followed by a ``0`` bit. Unicode characters are
 encoded like this (with x being payload bits, which when concatenated give the
 Unicode character):
 
@@ -852,12 +852,7 @@ Unicode character):
 +-----------------------------------+----------------------------------------------+
 | ``U-00000800`` ... ``U-0000FFFF`` | 1110xxxx 10xxxxxx 10xxxxxx                   |
 +-----------------------------------+----------------------------------------------+
-| ``U-00010000`` ... ``U-001FFFFF`` | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx          |
-+-----------------------------------+----------------------------------------------+
-| ``U-00200000`` ... ``U-03FFFFFF`` | 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx |
-+-----------------------------------+----------------------------------------------+
-| ``U-04000000`` ... ``U-7FFFFFFF`` | 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx |
-|                                   | 10xxxxxx                                     |
+| ``U-00010000`` ... ``U-0010FFFF`` | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx          |
 +-----------------------------------+----------------------------------------------+
 
 The least significant bit of the Unicode character is the rightmost x bit.