summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-01-18 10:42:35 (GMT)
committerGeorg Brandl <georg@python.org>2009-01-18 10:42:35 (GMT)
commit6c81b54cc4b9490dc54a2d3cf72873f49f0c6eba (patch)
tree21b01c402ff5db9ba8de098ab326693ef7dc9935
parent6ab22154ddabdb67bd510a1f2e0aa9c7e0ee607d (diff)
downloadcpython-6c81b54cc4b9490dc54a2d3cf72873f49f0c6eba.zip
cpython-6c81b54cc4b9490dc54a2d3cf72873f49f0c6eba.tar.gz
cpython-6c81b54cc4b9490dc54a2d3cf72873f49f0c6eba.tar.bz2
#4976: union() and intersection() take multiple args, but talk about "the other".
-rw-r--r--Doc/library/stdtypes.rst4
-rwxr-xr-xDoc/tools/rstlint.py3
2 files changed, 5 insertions, 2 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 0e8276d..a9c85c2 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1679,7 +1679,7 @@ The constructors for both classes work the same:
.. method:: union(other, ...)
set | other | ...
- Return a new set with elements from both sets.
+ Return a new set with elements from the set and all others.
.. versionchanged:: 2.6
Accepts multiple input iterables.
@@ -1687,7 +1687,7 @@ The constructors for both classes work the same:
.. method:: intersection(other, ...)
set & other & ...
- Return a new set with elements common to both sets.
+ Return a new set with elements common to the set and all others.
.. versionchanged:: 2.6
Accepts multiple input iterables.
diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py
index 3ea04bd..0c19003 100755
--- a/Doc/tools/rstlint.py
+++ b/Doc/tools/rstlint.py
@@ -6,6 +6,9 @@
#
# 01/2009, Georg Brandl
+# TODO: - wrong versions in versionadded/changed
+# - wrong markup after versionchanged directive
+
from __future__ import with_statement
import os