[Python-checkins] r67641 - in python/branches/py3k/Doc: library/functions.rst tutorial/datastructures.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Dec  7 16:17:53 2008
New Revision: 67641

Log:
Forward-port r67624 and r67627.


Modified:
   python/branches/py3k/Doc/library/functions.rst
   python/branches/py3k/Doc/tutorial/datastructures.rst

Modified: python/branches/py3k/Doc/library/functions.rst
==============================================================================
--- python/branches/py3k/Doc/library/functions.rst	(original)
+++ python/branches/py3k/Doc/library/functions.rst	Sun Dec  7 16:17:53 2008
@@ -137,13 +137,6 @@
    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

Modified: python/branches/py3k/Doc/tutorial/datastructures.rst
==============================================================================
--- python/branches/py3k/Doc/tutorial/datastructures.rst	(original)
+++ python/branches/py3k/Doc/tutorial/datastructures.rst	Sun Dec  7 16:17:53 2008
@@ -376,7 +376,7 @@
 
    >>> 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