summaryrefslogtreecommitdiffstats
path: root/Doc/library/heapq.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-10-21 12:10:28 (GMT)
committerGeorg Brandl <georg@python.org>2007-10-21 12:10:28 (GMT)
commite7a0990113873e5f0cc5cac203f47a8dcbda9848 (patch)
treea19f8f84973bb222ee9564617004c926f41e6100 /Doc/library/heapq.rst
parentcf3fb259329eedfa9d2c802b2ea5ced287c21e78 (diff)
downloadcpython-e7a0990113873e5f0cc5cac203f47a8dcbda9848.zip
cpython-e7a0990113873e5f0cc5cac203f47a8dcbda9848.tar.gz
cpython-e7a0990113873e5f0cc5cac203f47a8dcbda9848.tar.bz2
Add :term:s for iterator.
Diffstat (limited to 'Doc/library/heapq.rst')
-rw-r--r--Doc/library/heapq.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/heapq.rst b/Doc/library/heapq.rst
index 2d38c26..bd4c79f 100644
--- a/Doc/library/heapq.rst
+++ b/Doc/library/heapq.rst
@@ -92,8 +92,8 @@ The module also offers three general purpose functions based on heaps.
.. function:: merge(*iterables)
Merge multiple sorted inputs into a single sorted output (for example, merge
- timestamped entries from multiple log files). Returns an iterator over over the
- sorted values.
+ timestamped entries from multiple log files). Returns an :term:`iterator`
+ over over the sorted values.
Similar to ``sorted(itertools.chain(*iterables))`` but returns an iterable, does
not pull the data into memory all at once, and assumes that each of the input