Recorded merge of revisions 74057 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
(Only selected revisions.)
................
r74057 | alexandre.vassalotti | 2009-07-17 12:42:05 +0200 (Fr, 17 Jul 2009) | 54 lines
Merged revisions 73930-73932,73937-73939,73945,73951,73954,73962-73963,73970 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73930 | amaury.forgeotdarc | 2009-07-10 12:47:42 -0400 (Fri, 10 Jul 2009) | 2 lines
#6447: typo in subprocess docstring
........
r73937 | georg.brandl | 2009-07-11 06:12:36 -0400 (Sat, 11 Jul 2009) | 1 line
Fix style.
........
r73938 | georg.brandl | 2009-07-11 06:14:54 -0400 (Sat, 11 Jul 2009) | 1 line
#6446: fix import_spam() function to use correct error and reference handling.
........
r73939 | georg.brandl | 2009-07-11 06:18:10 -0400 (Sat, 11 Jul 2009) | 1 line
#6448: clarify docs for find_module().
........
r73945 | georg.brandl | 2009-07-11 06:51:31 -0400 (Sat, 11 Jul 2009) | 1 line
#6456: clarify the meaning of constants used as arguments to nl_langinfo().
........
r73951 | georg.brandl | 2009-07-11 10:23:38 -0400 (Sat, 11 Jul 2009) | 2 lines
array.array is actually a class.
................
diff --git a/Doc/library/array.rst b/Doc/library/array.rst
index 78c433d..2235f08 100644
--- a/Doc/library/array.rst
+++ b/Doc/library/array.rst
@@ -52,9 +52,9 @@
The module defines the following type:
-.. function:: array(typecode[, initializer])
+.. class:: array(typecode[, initializer])
- Return a new array whose items are restricted by *typecode*, and initialized
+ A new array whose items are restricted by *typecode*, and initialized
from the optional *initializer* value, which must be a list, object
supporting the buffer interface, or iterable over elements of the
appropriate type.
@@ -67,7 +67,7 @@
.. data:: ArrayType
- Obsolete alias for :func:`array`.
+ Obsolete alias for :class:`array`.
.. data:: typecodes
@@ -81,7 +81,6 @@
The following data items and methods are also supported:
-
.. attribute:: array.typecode
The typecode character used to create the array.