From b070b3f502cd778fd262be2c8b46d536dafdfebd Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 22 Feb 2014 15:05:08 -0500
Subject: [PATCH] whatsnew: frozen package __path__; and min/max versionadded.

---
 Doc/library/functions.rst |  6 ++++++
 Doc/whatsnew/3.4.rst      | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 57f015b014..307ff51caf 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -781,6 +781,9 @@ are always available.  They are listed here in alphabetical order.
    such as ``sorted(iterable, key=keyfunc, reverse=True)[0]`` and
    ``heapq.nlargest(1, iterable, key=keyfunc)``.
 
+   .. versionadded:: 3.4
+      The *default* keyword-only argument.
+
 
 .. _func-memoryview:
 .. function:: memoryview(obj)
@@ -812,6 +815,9 @@ are always available.  They are listed here in alphabetical order.
    such as ``sorted(iterable, key=keyfunc)[0]`` and ``heapq.nsmallest(1,
    iterable, key=keyfunc)``.
 
+   .. versionadded:: 3.4
+      The *default* keyword-only argument.
+
 .. function:: next(iterator[, default])
 
    Retrieve the next item from the *iterator* by calling its
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index de9e72b0d6..4c4852d064 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -346,9 +346,10 @@ Some smaller changes made to the core Python language are:
 
 * Unicode database updated to UCD version 6.3.
 
-* :func:`min` and :func:`max` now accept a *default* argument that can be used
-  to specify the value they return if the iterable they are evaluating has no
-  elements.  Contributed by Julian Berman in :issue:`18111`.
+* :func:`min` and :func:`max` now accept a *default* keyword-only argument that
+  can be used to specify the value they return if the iterable they are
+  evaluating has no elements.  (Contributed by Julian Berman in
+  :issue:`18111`.)
 
 * Module objects are now :mod:`weakref`'able.
 
@@ -1805,6 +1806,12 @@ Changes in the Python API
   similarly to ``__kwdefaults__``. (Contributed by Yury Selivanov in
   :issue:`20625`).
 
+* Frozen packages used to have their ``__path__`` set to the package name,
+  but this could cause the import system to do the wrong thing on submodule
+  imports if there was also a directory with the same name as the frozen
+  package.  The ``__path__`` for frozen packages is now set to ``[]``
+  (:issue:`18065`).
+
 
 Changes in the C API
 --------------------
-- 
2.49.0