[Python-checkins] cpython (merge 3.4 -> default): merge

[raymond.hettinger]

https://hg.python.org/cpython/rev/6d52dddbabcf
changeset:   93843:6d52dddbabcf
parent:      93840:ebe2072e5472
parent:      93842:7f2cf63cf95a
user:        Raymond Hettinger <python at rcn.com>
date:        Thu Dec 11 23:56:53 2014 -0800
summary:
  merge

files:
  Doc/library/heapq.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/heapq.rst b/Doc/library/heapq.rst
--- a/Doc/library/heapq.rst
+++ b/Doc/library/heapq.rst
@@ -272,11 +272,11 @@
 the worst cases might be terrible.
 
 Heaps are also very useful in big disk sorts.  You most probably all know that a
-big sort implies producing "runs" (which are pre-sorted sequences, which size is
+big sort implies producing "runs" (which are pre-sorted sequences, whose size is
 usually related to the amount of CPU memory), followed by a merging passes for
 these runs, which merging is often very cleverly organised [#]_. It is very
 important that the initial sort produces the longest runs possible.  Tournaments
-are a good way to that.  If, using all the memory available to hold a
+are a good way to achieve that.  If, using all the memory available to hold a
 tournament, you replace and percolate items that happen to fit the current run,
 you'll produce runs which are twice the size of the memory for random input, and
 much better for input fuzzily ordered.

-- 
Repository URL: https://hg.python.org/cpython