From: Georg Brandl <georg@python.org>
Date: Sun, 7 Dec 2008 15:17:53 +0000 (+0000)
Subject: Forward-port r67624 and r67627.
X-Git-Tag: v3.1a1~727
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2080ea5f4b7ab8bd9ab0385c7ac925731d78405e;p=thirdparty%2FPython%2Fcpython.git

Forward-port r67624 and r67627.
---

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 364d9de76bdc..2fcf027f8874 100644
--- 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 e8509ebe93cc..84e731d90b28 100644
--- 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