diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-12-13 01:29:00 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-12-13 01:29:00 (GMT) |
commit | fc431270ac75235a1b5bfa6f5cac780e49199e68 (patch) | |
tree | 77bfa7d54557cf0aef45e0f0133cb354065eafec /Doc | |
parent | a5a5ce90a211a19e9b179d0f4ed408f9a83c933d (diff) | |
download | cpython-fc431270ac75235a1b5bfa6f5cac780e49199e68.zip cpython-fc431270ac75235a1b5bfa6f5cac780e49199e68.tar.gz cpython-fc431270ac75235a1b5bfa6f5cac780e49199e68.tar.bz2 |
Merged revisions 76776 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76776 | benjamin.peterson | 2009-12-12 19:23:39 -0600 (Sat, 12 Dec 2009) | 25 lines
Merged revisions 76534,76538,76628,76701,76774 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76534 | martin.v.loewis | 2009-11-26 02:42:05 -0600 (Thu, 26 Nov 2009) | 2 lines
Fix typo.
........
r76538 | georg.brandl | 2009-11-26 14:48:25 -0600 (Thu, 26 Nov 2009) | 1 line
#7400: typo.
........
r76628 | andrew.kuchling | 2009-12-02 08:27:11 -0600 (Wed, 02 Dec 2009) | 1 line
Markup fixes
........
r76701 | andrew.kuchling | 2009-12-07 20:37:05 -0600 (Mon, 07 Dec 2009) | 1 line
Typo fix; grammar fix
........
r76774 | benjamin.peterson | 2009-12-12 18:54:15 -0600 (Sat, 12 Dec 2009) | 1 line
account for PyObject_IsInstance's new ability to fail
........
................
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/functions.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index cdef34a..300a589 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -965,7 +965,7 @@ are always available. They are listed here in alphabetical order. .. function:: set([iterable]) :noindex: - Return a new set, optionally with elements are taken from *iterable*. + Return a new set, optionally with elements taken from *iterable*. The set type is described in :ref:`types-set`. |