Reverted a comment from 'option_combine_images' to 'option_image_nocomposite'. Also moved the whats_new addition into a separate file.

breedlun · breedlun · commit ec7672479062 · 2015-03-04T20:41:13.000-07:00
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -75,16 +75,6 @@ directive - ``close-figs`` - that closes any previous figure windows before
 creating the plots.  This can help avoid some surprising duplicates of plots
 when using ``plot_directive``.
 
-Configuration (rcParams)
-------------------------
-
-``image.composite_image`` added
-```````````````````````````````
-Controls whether vector graphics backends (i.e. PDF, PS, and SVG) combine
-multiple images on a set of axes into a single composite image.  Saving each
-image individually can be useful if you generate vector graphics files in 
-matplotlib and then edit the files further in Inkscape or other programs.
-
 .. _whats-new-1-4:
 
 new in matplotlib-1.4
diff --git a/doc/users/whats_new/rcparams.rst b/doc/users/whats_new/rcparams.rst
@@ -1,20 +1,21 @@
 Added "legend.framealpha" key to rcParams
 `````````````````````````````````````````
-
 Added a key and the corresponding logic to control the default transparency of
 legend frames. This feature was written into the docstring of axes.legend(),
 but not yet implemented.
 
-
 Added "figure.titlesize" and "figure.titleweight" keys to rcParams
 ``````````````````````````````````````````````````````````````````
-
 Two new keys were added to rcParams to control the default font size and weight
 used by the figure title (as emitted by ``pyplot.suptitle()``).
 
-
-
 Added "legend.facecolor" and "legend.edgecolor" keys to rcParams
 ````````````````````````````````````````````````````````````````
-
 The new keys control colors (background and edge) of legend patches.
+
+``image.composite_image`` added to rcParams
+```````````````````````````````````````````
+Controls whether vector graphics backends (i.e. PDF, PS, and SVG) combine
+multiple images on a set of axes into a single composite image.  Saving each
+image individually can be useful if you generate vector graphics files in 
+matplotlib and then edit the files further in Inkscape or other programs.
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -249,7 +249,7 @@ class Figure(Artist):
 
     *suppressComposite*
        For multiple figure images, the figure will make composite
-       images depending on the renderer option_combine_images
+       images depending on the renderer option_image_nocomposite
        function.  If suppressComposite is True|False, this will
        override the renderer.
     """
