Merge pull request #3640 from emikulic/master

tacaswell · tacaswell · commit 4d83fa758daf · 2014-10-16T13:12:09.000-04:00
DOC : figure.max_num_figures was renamed to figure.max_open_warning. This was done in 8c8bc8f and 0433bd5
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -796,7 +796,7 @@ without closing them.
 matplotlib will now display a `RuntimeWarning` when too many figures
 have been opened at once.  By default, this is displayed for 20 or
 more figures, but the exact number may be controlled using the
-``figure.max_num_figures`` rcParam.
+``figure.max_open_warning`` rcParam.
 
 .. _whats-new-1-2-2:
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -420,7 +420,7 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
                 "(`matplotlib.pyplot.figure`) are retained until "
                 "explicitly closed and may consume too much memory. "
                 "(To control this warning, see the rcParam "
-                "`figure.max_num_figures`)." %
+                "`figure.max_open_warning`)." %
                 max_open_warning, RuntimeWarning)
 
         if get_backend().lower() == 'ps':
