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

[brett.cannon]

http://hg.python.org/cpython/rev/534cbebd7a71
changeset:   76634:534cbebd7a71
parent:      76633:eb5c5c23ca9b
parent:      76632:16635c81b329
user:        Brett Cannon <brett at python.org>
date:        Sun Apr 29 12:50:32 2012 -0400
summary:
  merge

files:
  Doc/howto/sorting.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/howto/sorting.rst b/Doc/howto/sorting.rst
--- a/Doc/howto/sorting.rst
+++ b/Doc/howto/sorting.rst
@@ -42,7 +42,7 @@
 Key Functions
 =============
 
-Both :meth:`list.sort` and :func:`sorted` have *key* parameter to specify a
+Both :meth:`list.sort` and :func:`sorted` have a *key* parameter to specify a
 function to be called on each list element prior to making comparisons.
 
 For example, here's a case-insensitive string comparison:
@@ -89,7 +89,7 @@
 The key-function patterns shown above are very common, so Python provides
 convenience functions to make accessor functions easier and faster. The
 :mod:`operator` module has :func:`~operator.itemgetter`,
-:func:`~operator.attrgetter`, and an :func:`~operator.methodcaller` function.
+:func:`~operator.attrgetter`, and a :func:`~operator.methodcaller` function.
 
 Using those functions, the above examples become simpler and faster:
 
@@ -114,7 +114,7 @@
 ========================
 
 Both :meth:`list.sort` and :func:`sorted` accept a *reverse* parameter with a
-boolean value. This is using to flag descending sorts. For example, to get the
+boolean value. This is used to flag descending sorts. For example, to get the
 student data in reverse *age* order:
 
     >>> sorted(student_tuples, key=itemgetter(2), reverse=True)

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