diff --git a/Doc/lib/libdifflib.tex b/Doc/lib/libdifflib.tex index 4256e877e35..c4a3f121269 100644 --- a/Doc/lib/libdifflib.tex +++ b/Doc/lib/libdifflib.tex @@ -55,7 +55,7 @@ \begin{classdesc*}{HtmlDiff} This class can be used to create an HTML table (or a complete HTML file - containing the table) showing a side by side, line by line comparision + containing the table) showing a side by side, line by line comparison of text with inter-line and intra-line change highlights. The table can be generated in either full or contextual difference mode. diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex index b531b61cc2b..83d3c0352d6 100644 --- a/Doc/lib/libstdtypes.tex +++ b/Doc/lib/libstdtypes.tex @@ -1092,7 +1092,7 @@ Notes: the sorted or reversed list. \item[(8)] The \method{sort()} method takes optional arguments for - controlling the comparisions. + controlling the comparisons. \var{cmp} specifies a custom comparison function of two arguments (list items) which should return a negative, zero or positive number diff --git a/Lib/difflib.py b/Lib/difflib.py index f855d46a828..124ae9061ad 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1603,7 +1603,7 @@ class HtmlDiff(object): """For producing HTML side by side comparison with change highlights. This class can be used to create an HTML table (or a complete HTML file - containing the table) showing a side by side, line by line comparision + containing the table) showing a side by side, line by line comparison of text with inter-line and intra-line change highlights. The table can be generated in either full or contextual difference mode. diff --git a/Misc/cheatsheet b/Misc/cheatsheet index 525772d7c3b..071f13d3116 100644 --- a/Misc/cheatsheet +++ b/Misc/cheatsheet @@ -248,7 +248,7 @@ is not negated object identity (2) Notes : Comparison behavior can be overridden for a given class by defining special method __cmp__. - The above comparisions return True or False which are of type bool + The above comparisons return True or False which are of type bool (a subclass of int) and behave exactly as 1 or 0 except for their type and that they print as True or False instead of 1 or 0. (1) X < Y < Z < W has expected meaning, unlike C diff --git a/Objects/listobject.c b/Objects/listobject.c index 89cedc9bfa5..996ddb95b1d 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1759,7 +1759,7 @@ merge_compute_minrun(int n) } /* Special wrapper to support stable sorting using the decorate-sort-undecorate - pattern. Holds a key which is used for comparisions and the original record + pattern. Holds a key which is used for comparisons and the original record which is returned during the undecorate phase. By exposing only the key during comparisons, the underlying sort stability characteristics are left unchanged. Also, if a custom comparison function is used, it will only see