summaryrefslogtreecommitdiffstats
path: root/Objects/listsort.txt
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-02-21 20:59:32 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-02-21 20:59:32 (GMT)
commit934896dc0977ea25dc37c13117525f2394625cee (patch)
treef4671cebdd730ba732dcae5185548dd35b9ffa72 /Objects/listsort.txt
parent91cf882b367644ece7f121cd22fc43c2f439a2d5 (diff)
downloadcpython-934896dc0977ea25dc37c13117525f2394625cee.zip
cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.gz
cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.bz2
Merged revisions 69846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines Issue #5341: Fix a variety of spelling errors. ........
Diffstat (limited to 'Objects/listsort.txt')
-rw-r--r--Objects/listsort.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/listsort.txt b/Objects/listsort.txt
index 9226984..31a5445 100644
--- a/Objects/listsort.txt
+++ b/Objects/listsort.txt
@@ -309,7 +309,7 @@ Stability constrains permissible merging patterns. For example, if we have
A:10000 B:20000 C:10000
we dare not merge A with C first, because if A, B and C happen to contain
-a common element, it would get out of order wrt its occurence(s) in B. The
+a common element, it would get out of order wrt its occurrence(s) in B. The
merging must be done as (A+B)+C or A+(B+C) instead.
So merging is always done on two consecutive runs at a time, and in-place,