merge with 3.2 branch

This commit is contained in:
Georg Brandl 2013-04-06 16:39:49 +02:00
commit 2fd4abe6a1
7 changed files with 11 additions and 8 deletions

View file

@ -1633,7 +1633,7 @@ UTF-8, then you need to do the following:
'ASCII section\ufeffUnicode section'
The Unicode code point ``'\ufeff'``, when encoded using UTF-8, will be
The Unicode code point U+FEFF, when encoded using UTF-8, will be
encoded as a UTF-8 BOM -- the byte-string ``b'\xef\xbb\xbf'``.
#. Replace the ASCII section with whatever placeholders you like, but make sure