summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-01-25 21:36:43 (GMT)
committerGeorg Brandl <georg@python.org>2012-01-25 21:36:43 (GMT)
commitb0f30c9891a3ef45d616bf3ae73d764fd539946b (patch)
treee09f1e9e9f97f5ab69c347c44e267cb19ae9b52f /Doc
parent4f99ce94703da719989e5cc47fe47b464f5c7514 (diff)
parent6c89a79d555a8d72b74fad5f533d36cfb645c808 (diff)
downloadcpython-b0f30c9891a3ef45d616bf3ae73d764fd539946b.zip
cpython-b0f30c9891a3ef45d616bf3ae73d764fd539946b.tar.gz
cpython-b0f30c9891a3ef45d616bf3ae73d764fd539946b.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/functools.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
index aeb7f09..05f97b1 100644
--- 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@blueyonder.co.uk>
.. moduleauthor:: Raymond Hettinger <python@rcn.com>
.. moduleauthor:: Nick Coghlan <ncoghlan@gmail.com>
@@ -27,7 +27,7 @@ The :mod:`functools` module defines the following functions:
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