DOC: remove experimental tag from CL

jklymak · jklymak · commit bd740ce04193 · 2021-12-16T12:58:23.000+01:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2172,31 +2172,26 @@ def __init__(self,
         """
         Parameters
         ----------
-        figsize : 2-tuple of floats, default: :rc:`figure.figsize`
-            Figure dimension ``(width, height)`` in inches.
+        figsize : 2-tuple of floats, default: :rc:`figure.figsize` Figure
+            dimension ``(width, height)`` in inches.
 
-        dpi : float, default: :rc:`figure.dpi`
-            Dots per inch.
+        dpi : float, default: :rc:`figure.dpi` Dots per inch.
 
-        facecolor : default: :rc:`figure.facecolor`
-            The figure patch facecolor.
+        facecolor : default: :rc:`figure.facecolor` The figure patch facecolor.
 
-        edgecolor : default: :rc:`figure.edgecolor`
-            The figure patch edge color.
+        edgecolor : default: :rc:`figure.edgecolor` The figure patch edge color.
 
-        linewidth : float
-            The linewidth of the frame (i.e. the edge linewidth of the figure
-            patch).
+        linewidth : float The linewidth of the frame (i.e. the edge linewidth of
+            the figure patch).
 
-        frameon : bool, default: :rc:`figure.frameon`
-            If ``False``, suppress drawing the figure background patch.
+        frameon : bool, default: :rc:`figure.frameon` If ``False``, suppress
+            drawing the figure background patch.
 
-        subplotpars : `SubplotParams`
-            Subplot parameters. If not given, the default subplot
-            parameters :rc:`figure.subplot.*` are used.
+        subplotpars : `SubplotParams` Subplot parameters. If not given, the
+            default subplot parameters :rc:`figure.subplot.*` are used.
 
-        tight_layout : bool or dict, default: :rc:`figure.autolayout`
-            Whether to use the tight layout mechanism. See `.set_tight_layout`.
+        tight_layout : bool or dict, default: :rc:`figure.autolayout` Whether to
+            use the tight layout mechanism. See `.set_tight_layout`.
 
             .. admonition:: Discouraged
 
@@ -2212,22 +2207,25 @@ def __init__(self,
                 The use of this parameter is discouraged. Please use
                 ``layout='constrained'`` instead.
 
-        layout : {'constrained', 'tight'}, optional
-            The layout mechanism for positioning of plot elements.
+        layout : {'constrained', 'tight'}, optional, default: None
+            The layout mechanism for positioning of plot elements to avoid
+            overlapping Axes decorations (labels, ticks, etc). Note that
+            layout managers can have significant performance penalties as
+            they require an extra draw and solve an inverse problem.
+
             Supported values:
 
-            - 'constrained': The constrained layout solver usually gives the
-              best layout results and is thus recommended. However, it is
-              computationally expensive and can be slow for complex figures
-              with many elements.
+            - 'constrained': The constrained layout solver adjusts axes sizes
+              to avoid overlapping axes decorations.  Can handle complex plot
+              layouts and colorbars, and is thus recommended.
 
               See :doc:`/tutorials/intermediate/constrainedlayout_guide`
               for examples.
 
             - 'tight': Use the tight layout mechanism. This is a relatively
-              simple algorithm, that adjusts the subplot parameters so that
-              decorations like tick labels, axis labels and titles have enough
-              space. See `.Figure.set_tight_layout` for further details.
+              simple algorithm that adjusts the subplot parameters so that
+              decorations do not overlap. See `.Figure.set_tight_layout` for
+              further details.
 
             If not given, fall back to using the parameters *tight_layout* and
             *constrained_layout*, including their config defaults
diff --git a/tutorials/intermediate/constrainedlayout_guide.py b/tutorials/intermediate/constrainedlayout_guide.py
@@ -29,15 +29,6 @@
 
 Those are described in detail throughout the following sections.
 
-.. warning::
-
-    Currently Constrained Layout is **experimental**.  The
-    behaviour and API are subject to change, or the whole functionality
-    may be removed without a deprecation period.  If you *require* your
-    plots to be absolutely reproducible, get the Axes positions after
-    running Constrained Layout and use ``ax.set_position()`` in your code
-    with ``constrained_layout=False``.
-
 Simple Example
 ==============
 
