summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-13 01:23:39 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-13 01:23:39 (GMT)
commit97dd987ae2ed1b0e10697dd6b5ac31bab6d7bcba (patch)
tree30e10fb33cd09c430e3ce70725a2333c159fdbc7 /Doc/library/functions.rst
parentddf4b81ee79d8adc9b0e9de39d208d4548edf601 (diff)
downloadcpython-97dd987ae2ed1b0e10697dd6b5ac31bab6d7bcba.zip
cpython-97dd987ae2ed1b0e10697dd6b5ac31bab6d7bcba.tar.gz
cpython-97dd987ae2ed1b0e10697dd6b5ac31bab6d7bcba.tar.bz2
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/library/functions.rst')
-rw-r--r--Doc/library/functions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 6e380dd..6b14dff 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -973,7 +973,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`.