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.
........

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 198dfa64fb6ef0cbedcef4da13853133d1bf1bf0..4a19de0a4bb8e42cb755ca4a51df57f32c82004e 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -18,10 +18,10 @@ are always available.  They are listed here in alphabetical order.
 :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`
 ===================  =================  ==================  ================  ====================

diff --git a/Misc/NEWS b/Misc/NEWS
index a4e727a7d46465fdb68d15610cd3891bdd72c152..e305fc341e403cc71c9cae3db0b8e7949143cf78 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,6 +48,11 @@ Tests
 
 - 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?
 ===============================================