[Python-checkins] r86738 - in python/branches/release31-maint: Doc/library/functions.rst Misc/NEWS

[ezio.melotti]

Author: ezio.melotti
Date: Wed Nov 24 23:04:22 2010
New Revision: 86738

Log:
Merged revisions 86737 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86737 | ezio.melotti | 2010-11-25 00:02:18 +0200 (Thu, 25 Nov 2010) | 1 line
  
  Add NEWS entry for r86732 and fix double function in the table.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/functions.rst
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Doc/library/functions.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/functions.rst	(original)
+++ python/branches/release31-maint/Doc/library/functions.rst	Wed Nov 24 23:04:22 2010
@@ -18,10 +18,10 @@
 :func:`bool`         :func:`filter`     :func:`issubclass`  :func:`pow`       :func:`super`
 :func:`bytearray`    :func:`float`      :func:`iter`        :func:`print`     :func:`tuple`
 :func:`bytes`        :func:`format`     :func:`len`         :func:`property`  :func:`type`
-:func:`chr`          :func:`frozenset`  :func:`list`        :func:`range`     :func:`type`
-:func:`classmethod`  :func:`getattr`    :func:`locals`      :func:`repr`      :func:`vars`
-:func:`compile`      :func:`globals`    :func:`map`         :func:`reversed`  :func:`zip`
-:func:`complex`      :func:`hasattr`    :func:`max`         :func:`round`     :func:`__import__`
+:func:`chr`          :func:`frozenset`  :func:`list`        :func:`range`     :func:`vars`
+:func:`classmethod`  :func:`getattr`    :func:`locals`      :func:`repr`      :func:`zip`
+:func:`compile`      :func:`globals`    :func:`map`         :func:`reversed`  :func:`__import__`
+:func:`complex`      :func:`hasattr`    :func:`max`         :func:`round`
 :func:`delattr`      :func:`hash`       :func:`memoryview`  :func:`set`
 :func:`dict`         :func:`help`       :func:`min`         :func:`setattr`
 ===================  =================  ==================  ================  ====================

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Wed Nov 24 23:04:22 2010
@@ -48,6 +48,11 @@
 
 - Issue #9424: Replace deprecated assert* methods in the Python test suite.
 
+Documentation
+-------------
+
+- Issue #10299: List the built-in functions in a table in functions.rst.
+
 
 What's New in Python 3.1.3 release candidate 1?
 ===============================================