Merged revisions 86603 via svnmerge from

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

........
  r86603 | antoine.pitrou | 2010-11-20 20:36:05 +0100 (sam., 20 nov. 2010) | 3 lines

  In 3.x, bytearray is akin to bytes, not str.
........

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 8e07673fef21e98cfead473b69c4ebec0240f82e..764fd8fb86ddbf58f589a612edea25306af3cd40 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -70,7 +70,7 @@ are always available.  They are listed here in alphabetical order.
    Return a new array of bytes.  The :class:`bytearray` type is a mutable
    sequence of integers in the range 0 <= x < 256.  It has most of the usual
    methods of mutable sequences, described in :ref:`typesseq-mutable`, as well
-   as most methods that the :class:`str` type has, see :ref:`bytes-methods`.
+   as most methods that the :class:`bytes` type has, see :ref:`bytes-methods`.
 
    The optional *source* parameter can be used to initialize the array in a few
    different ways: