[Python-checkins] r84463 - in python/branches/release31-maint: Doc/c-api/unicode.rst

[daniel.stutzbach]

Author: daniel.stutzbach
Date: Fri Sep  3 20:37:34 2010
New Revision: 84463

Log:
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()
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/c-api/unicode.rst

Modified: python/branches/release31-maint/Doc/c-api/unicode.rst
==============================================================================
--- python/branches/release31-maint/Doc/c-api/unicode.rst	(original)
+++ python/branches/release31-maint/Doc/c-api/unicode.rst	Fri Sep  3 20:37:34 2010
@@ -420,7 +420,7 @@
 
 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