Forward-port r67624 and r67627.

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 364d9de76bdc29330a4502cbffa2b9b9f7bf9344..2fcf027f887467c76d92af993f41f1fe4b57f69d 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -137,13 +137,6 @@ are always available.  They are listed here in alphabetical order.
    type hierarchy in :ref:`types`.
 
 
-.. function:: cmp(x, y)
-
-   Compare the two objects *x* and *y* and return an integer according to the
-   outcome.  The return value is negative if ``x < y``, zero if ``x == y`` and
-   strictly positive if ``x > y``.
-
-
 .. function:: compile(source, filename, mode[, flags[, dont_inherit]])
 
    Compile the *source* into a code or AST object.  Code objects can be executed

diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
index e8509ebe93cc3249dd93d6ebbc69114daa2da893..84e731d90b2899f0466cae3206d4e3b351b3c0c2 100644 (file)
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -376,7 +376,7 @@ Here is a brief demonstration::
 
    >>> basket = {'apple', 'orange', 'apple', 'pear', 'orange', 'banana'}
    >>> print(basket)
-   {'orange', 'bananna', 'pear', 'apple'}
+   {'orange', 'banana', 'pear', 'apple'}
    >>> fruit = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
    >>> fruit = set(basket)               # create a set without duplicates
    >>> fruit