From: Ezio Melotti Date: Sun, 20 Jan 2013 10:18:17 +0000 (+0200) Subject: #4153: merge with 3.2. X-Git-Tag: v3.3.1rc1~327 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81b46ec0e5382735778d7ede92992f7d70a54d94;p=python #4153: merge with 3.2. --- 81b46ec0e5382735778d7ede92992f7d70a54d94 diff --cc Doc/howto/unicode.rst index 5d9e027527,b309f601d0..7500dce937 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@@ -413,8 -421,8 +421,8 @@@ list of category codes References ---------- - The ``str`` type is described in the Python library reference at + The :class:`str` type is described in the Python library reference at -:ref:`typesseq`. +:ref:`textseq`. The documentation for the :mod:`unicodedata` module. @@@ -610,7 -618,7 +618,6 @@@ Marc-André Lemburg, Martin von Löwis and that the HOWTO only covers 2.x. .. comment Describe Python 3.x support (new section? new document?) --.. comment Additional topic: building Python w/ UCS2 or UCS4 support .. comment Describe use of codecs.StreamRecoder and StreamReaderWriter .. comment @@@ -640,5 -648,5 +647,3 @@@ - [ ] Writing Unicode programs - [ ] Do everything in Unicode - [ ] Declaring source code encodings (PEP 263) -- - [ ] Other issues -- - [ ] Building Python (UCS2, UCS4)