#4153: merge with 3.2.

diff --cc Doc/howto/unicode.rst
index 5d9e0275274a056057733fb2b4177b20209d7143,b309f601d0598d27bcdadb92f55e0bdfb568c361..7500dce937c1d97722a4dff4078b7c1cf3ae5161
--- 1/Doc/howto/unicode.rst
--- 2/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)