diff options
author | Georg Brandl <georg@python.org> | 2012-01-23 19:19:46 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2012-01-23 19:19:46 (GMT) |
commit | 5b45a013bcd0afcd3be46f994e2f5c29d5447d1a (patch) | |
tree | 2b5d52d817d1b5da3f83cf210f622237cb50a3e0 | |
parent | 20f6bc20bd3024b1b710d2833a74f2a7f2ba8571 (diff) | |
parent | 3b65fd7e9784967567e66bd67e9205cbb0d53d3a (diff) | |
download | cpython-5b45a013bcd0afcd3be46f994e2f5c29d5447d1a.zip cpython-5b45a013bcd0afcd3be46f994e2f5c29d5447d1a.tar.gz cpython-5b45a013bcd0afcd3be46f994e2f5c29d5447d1a.tar.bz2 |
merge from 3.2
-rw-r--r-- | Doc/library/functools.rst | 2 | ||||
-rw-r--r-- | Doc/library/stdtypes.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst index e5f95ec..aeb7f09 100644 --- a/Doc/library/functools.rst +++ b/Doc/library/functools.rst @@ -20,7 +20,7 @@ The :mod:`functools` module defines the following functions: .. function:: cmp_to_key(func) - Transform an old-style comparison function to a key-function. Used with + Transform an old-style comparison function to a key function. Used with tools that accept key functions (such as :func:`sorted`, :func:`min`, :func:`max`, :func:`heapq.nlargest`, :func:`heapq.nsmallest`, :func:`itertools.groupby`). This function is primarily used as a transition diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 36b9068..84666ee 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -877,7 +877,7 @@ are sequences of the same type; *n*, *i*, *j* and *k* are integers. | ``s * n, n * s`` | *n* shallow copies of *s* | \(2) | | | concatenated | | +------------------+--------------------------------+----------+ -| ``s[i]`` | *i*'th item of *s*, origin 0 | \(3) | +| ``s[i]`` | *i*\ th item of *s*, origin 0 | \(3) | +------------------+--------------------------------+----------+ | ``s[i:j]`` | slice of *s* from *i* to *j* | (3)(4) | +------------------+--------------------------------+----------+ |