summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-11-10 03:12:02 (GMT)
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-11-10 03:12:02 (GMT)
commit67f089f8607167859e0cc28eb1865917df75fc63 (patch)
tree5224306094be0f6f659bc92d3e32c49f7bdad3b5 /Doc
parent8523db71d7cfeae297dea20d81107d17871cb41e (diff)
downloadcpython-67f089f8607167859e0cc28eb1865917df75fc63.zip
cpython-67f089f8607167859e0cc28eb1865917df75fc63.tar.gz
cpython-67f089f8607167859e0cc28eb1865917df75fc63.tar.bz2
Backport from 3.2: adjust set and frozenset function docs (issue #16436).
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/functions.rst20
1 files changed, 12 insertions, 8 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 936af52..0d4f912 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -533,11 +533,13 @@ available. They are listed here in alphabetical order.
.. function:: frozenset([iterable])
:noindex:
- Return a frozenset object, optionally with elements taken from *iterable*.
- The frozenset type is described in :ref:`types-set`.
+ Return a new :class:`frozenset` object, optionally with elements taken from
+ *iterable*. ``frozenset`` is a built-in class. See :class:`frozenset` and
+ :ref:`types-set` for documentation about this class.
- For other containers see the built in :class:`dict`, :class:`list`, and
- :class:`tuple` classes, and the :mod:`collections` module.
+ For other containers see the built-in :class:`set`, :class:`list`,
+ :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+ module.
.. versionadded:: 2.4
@@ -1225,11 +1227,13 @@ available. They are listed here in alphabetical order.
.. function:: set([iterable])
:noindex:
- Return a new set, optionally with elements taken from *iterable*.
- The set type is described in :ref:`types-set`.
+ Return a new :class:`set` object, optionally with elements taken from
+ *iterable*. ``set`` is a built-in class. See :class:`set` and
+ :ref:`types-set` for documentation about this class.
- For other containers see the built in :class:`dict`, :class:`list`, and
- :class:`tuple` classes, and the :mod:`collections` module.
+ For other containers see the built-in :class:`frozenset`, :class:`list`,
+ :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+ module.
.. versionadded:: 2.4