From 0dc729537789f87e049879303528bd9e1068a108 Mon Sep 17 00:00:00 2001
From: anykraus <anykraus@users.noreply.github.com>
Date: Wed, 7 May 2014 14:48:11 +0200
Subject: [PATCH 1/2] Updated CHANGELOG and whats_new.rst: with (re-)generate
 auto-legend in Qt4Agg backend. As requested in
 https://github.com/matplotlib/matplotlib/pull/2947#issuecomment-41059777

(Fix of Issue #2934)
---
 CHANGELOG               | 3 +++
 doc/users/whats_new.rst | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9f1b2c86ca5b..e8ac1c6f2ea0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@
 2014-04-27 Improved input clean up in Axes.{h|v}lines
            Coerce input into a 1D ndarrays (after dealing with units).
 
+2014-04-22 Added (re-)generate a simple automatic legend to "Figure Options"
+           dialog of the Qt4Agg backend.
+
 2014-04-22 Added an example showing the difference between
            interpolation = 'none' and interpolation = 'nearest' in
            `imshow()` when saving vector graphics files.
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
index 3b46a2f8376d..14e284424e9c 100644
--- a/doc/users/whats_new.rst
+++ b/doc/users/whats_new.rst
@@ -226,6 +226,10 @@ added. Furthermore, the the subplottool is now implemented as a modal
 dialog. It was previously a QMainWindow, leaving the SPT open if one closed the
 plotwindow.
 
+In the figureoptions dialog one can now choose to (re-)generate a simple
+automatic legend. Any fancyness of a customized legend will be lost. But changes
+to the curves' label, linestyle, et cetera will now be updated in the legend.
+
 Interactive performance of the Qt4 backend has been dramatically improved
 under windows.
 

From 9c758680e09027c812319ef477aca681ca2cc5fa Mon Sep 17 00:00:00 2001
From: anykraus <anykraus@users.noreply.github.com>
Date: Wed, 7 May 2014 15:19:43 +0200
Subject: [PATCH 2/2] Updated whats_new.rst: Wording of figureoptions doc

---
 doc/users/whats_new.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
index 14e284424e9c..944127fdce86 100644
--- a/doc/users/whats_new.rst
+++ b/doc/users/whats_new.rst
@@ -227,8 +227,8 @@ dialog. It was previously a QMainWindow, leaving the SPT open if one closed the
 plotwindow.
 
 In the figureoptions dialog one can now choose to (re-)generate a simple
-automatic legend. Any fancyness of a customized legend will be lost. But changes
-to the curves' label, linestyle, et cetera will now be updated in the legend.
+automatic legend. Any explicitly set legend entries will be lost, but changes to
+the curves' label, linestyle, et cetera will now be updated in the legend.
 
 Interactive performance of the Qt4 backend has been dramatically improved
 under windows.