diff options
| author | Georg Brandl <georg@python.org> | 2013-04-06 14:39:49 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-04-06 14:39:49 (GMT) |
| commit | 2fd4abe6a1f54fe7a5409abf84060bae47a52044 (patch) | |
| tree | 3871af699874a89e1b687e9d1a106f880904d313 /Doc | |
| parent | 9a411ce9ea01017691ceb0c19ea1c8d1d1c34f4a (diff) | |
| parent | 11692acffa7adfa3856ef4cd58140a20905f5016 (diff) | |
| download | cpython-2fd4abe6a1f54fe7a5409abf84060bae47a52044.zip cpython-2fd4abe6a1f54fe7a5409abf84060bae47a52044.tar.gz cpython-2fd4abe6a1f54fe7a5409abf84060bae47a52044.tar.bz2 | |
merge with 3.2 branch
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/howto/logging-cookbook.rst | 2 | ||||
| -rw-r--r-- | Doc/license.rst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index 47406aa..cdd4b66 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -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 diff --git a/Doc/license.rst b/Doc/license.rst index 5b7fcbd..9e80f5d 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -120,6 +120,8 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.2.3 | 3.2.2 | 2012 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ +| 3.2.4 | 3.2.3 | 2013 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ | 3.3.0 | 3.2 | 2012 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ |