From 17f9b3d289ec2ba64338a0d2322e7be10eb65096 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 24 Nov 2010 22:02:18 +0000
Subject: [PATCH] Add NEWS entry for r86732 and fix double function in the
 table.

---
 Doc/library/functions.rst | 8 ++++----
 Misc/NEWS                 | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index e9e54123b2a..1c3ee129ffb 100644
--- 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 6891d1ebec8..bd1e731533d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,11 @@ Build
 - Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and
   PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals.
 
+Documentation
+-------------
+
+- Issue #10299: List the built-in functions in a table in functions.rst.
+
 
 What's New in Python 3.2 Alpha 4?
 =================================