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

[georg.brandl]

http://hg.python.org/cpython/rev/a378922691e5
changeset:   74583:a378922691e5
parent:      74580:f13af83967a0
parent:      74582:a72ca8b23cdf
user:        Georg Brandl <georg at python.org>
date:        Mon Jan 23 20:19:46 2012 +0100
summary:
  merge from 3.2

files:
  Doc/library/functools.rst |  2 +-
  Doc/library/stdtypes.rst  |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
--- a/Doc/library/functools.rst
+++ b/Doc/library/functools.rst
@@ -20,7 +20,7 @@
 
 .. 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
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -877,7 +877,7 @@
 | ``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)   |
 +------------------+--------------------------------+----------+

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