Merge pull request matplotlib#26649 from timhoffm/remove-discouraged

[DOC] Remove "Discouraged" notices that have been superseded by deprecation

Author: QuLogic

lib/matplotlib/figure.py

@@ -2789,12 +2789,7 @@ def get_tight_layout(self):
                      pending=True)
     def set_tight_layout(self, tight):
         """
-        [*Discouraged*] Set whether and how `.tight_layout` is called when
-        drawing.
-
-        .. admonition:: Discouraged
-
-            This method is discouraged in favor of `~.set_layout_engine`.
+        Set whether and how `.tight_layout` is called when drawing.
 
         Parameters
         ----------
@@ -2823,8 +2818,7 @@ def get_constrained_layout(self):
                      pending=True)
     def set_constrained_layout(self, constrained):
         """
-        [*Discouraged*] Set whether ``constrained_layout`` is used upon
-        drawing.
+        Set whether ``constrained_layout`` is used upon drawing.
 
         If None, :rc:`figure.constrained_layout.use` value will be used.
 
@@ -2833,10 +2827,6 @@ def set_constrained_layout(self, constrained):
         overridden.  These pads are in inches and default to 3.0/72.0.
         ``w_pad`` is the width padding and ``h_pad`` is the height padding.
 
-        .. admonition:: Discouraged
-
-            This method is discouraged in favor of `~.set_layout_engine`.
-
         Parameters
         ----------
         constrained : bool or dict or None