#13695: merge with 3.2.

ezio-melotti · ezio-melotti · commit 37c7a065ceee · 2012-01-16T08:29:42.000+02:00
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
@@ -24,7 +24,7 @@ The :mod:`functools` module defines the following functions:
    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
-   tool for programs being converted from Py2.x which supported the use of
+   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,
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
@@ -873,13 +873,13 @@ Test cases
 
       In addition, if *first* and *second* are the exact same type and one of
       list, tuple, dict, set, frozenset or str or any type that a subclass
-      registers with :meth:`addTypeEqualityFunc` the type specific equality
+      registers with :meth:`addTypeEqualityFunc` the type-specific equality
       function will be called in order to generate a more useful default
       error message (see also the :ref:`list of type-specific methods
       <type-specific-methods>`).
 
       .. versionchanged:: 3.1
-         Added the automatic calling of type specific equality function.
+         Added the automatic calling of type-specific equality function.
 
       .. versionchanged:: 3.2
          :meth:`assertMultiLineEqual` added as the default type equality
