Merged revisions 84459 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84459 | daniel.stutzbach | 2010-09-03 13:31:07 -0500 (Fri, 03 Sep 2010) | 1 line

  Doc fix: unicode() is now str()
........

Doc/c-api/unicode.rst

@@ -420,7 +420,7 @@ these codecs are directly usable via the following functions.
 
 Many of the following APIs take two arguments encoding and errors. These
 parameters encoding and errors have the same semantics as the ones of the
-built-in :func:`unicode` Unicode object constructor.
+built-in :func:`str` string object constructor.
 
 Setting encoding to *NULL* causes the default encoding to be used
 which is ASCII.  The file system calls should use