summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-01-25 21:43:54 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-01-25 21:43:54 (GMT)
commit0a15103d793141e22489a3de612f44f6dbb63d29 (patch)
treea54bc147839a270312c9fa7a9ecf7c38a42f25ba
parentdcd37e81542418546255cdd451d0e5326d7dba35 (diff)
parente9401a0476d7e3e0e7dd89c54190c7f774ca49c1 (diff)
downloadcpython-0a15103d793141e22489a3de612f44f6dbb63d29.zip
cpython-0a15103d793141e22489a3de612f44f6dbb63d29.tar.gz
cpython-0a15103d793141e22489a3de612f44f6dbb63d29.tar.bz2
merge heads
-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 98a21e3..cc7ef34 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>
@@ -29,7 +29,7 @@ The :mod:`functools` module defines the following functions:
tool for programs being converted to Python 3 where comparison functions are
no longer supported.
- 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 that indicates the position in the desired