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

Wed Jan 25 22:36:55 CET 2012

http://hg.python.org/cpython/rev/e68ddfc193d5
changeset: 74624:e68ddfc193d5
parent: 74621:2701a2bb19c5
parent: 74623:5b8800012e88
user: Georg Brandl <georg at python.org>
date: Wed Jan 25 22:36:43 2012 +0100
summary:
 merge with 3.2
files:
 Doc/library/functools.rst | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
--- a/Doc/library/functools.rst
+++ b/Doc/library/functools.rst
@@ -1,8 +1,8 @@
-:mod:`functools` --- Higher order functions and operations on callable objects
+:mod:`functools` --- Higher-order functions and operations on callable objects
 ==============================================================================
 
 .. module:: functools
- :synopsis: Higher order functions and operations on callable objects.
+ :synopsis: Higher-order functions and operations on callable objects.
 .. moduleauthor:: Peter Harris <scav at blueyonder.co.uk>
 .. moduleauthor:: Raymond Hettinger <python at rcn.com>
 .. moduleauthor:: Nick Coghlan <ncoghlan at gmail.com>
@@ -27,7 +27,7 @@
 tool for programs being converted from Python 2 which supported the use of
 comparison functions.
 
- A compare function is any callable that accept two arguments, compares them,
+ A comparison function is any callable that accept two arguments, compares them,
 and returns a negative number for less-than, zero for equality, or a positive
 number for greater-than. A key function is a callable that accepts one
 argument and returns another value indicating the position in the desired
-- 
Repository URL: http://hg.python.org/cpython
