Merge branch 'matplotlib:main' into documentation_1

Higgs32584 · web-flow · commit a89ef1fad34f · 2023-04-13T19:15:48.000-04:00
diff --git a/doc/users/next_whats_new/mathtext_supports_text.rst b/doc/users/next_whats_new/mathtext_supports_text.rst
@@ -1,12 +1,13 @@
 ``mathtext`` now supports ``\text``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``\text`` can be used to obtain upright text within an equation.
+``\text`` can be used to obtain upright text within an equation and to get a plain dash
+(-).
 
 .. plot::
     :include-source: true
     :alt: Illustration of the newly added \text command, showing that it renders as normal text, including spaces, despite being part of an equation. Also show that a dash is not rendered as a minus when part of a \text command.
 
-import matplotlib.pyplot as plt
-plt.text(0.1, 0.5, r"$a = \sin(\phi) \text{ such that } \phi = \frac{x}{y}$")
-plt.text(0.1, 0.3, r"$\text{dashes (-) are retained}$")
+    import matplotlib.pyplot as plt
+    plt.text(0.1, 0.5, r"$a = \sin(\phi) \text{ such that } \phi = \frac{x}{y}$")
+    plt.text(0.1, 0.3, r"$\text{dashes (-) are retained}$")
diff --git a/galleries/users_explain/axes/autoscale.py b/galleries/users_explain/axes/autoscale.py
@@ -29,12 +29,15 @@
 # %%
 # Margins
 # -------
-# The default margin around the data limits is 5%:
+# The default margin around the data limits is 5%, which is based on the
+# default configuration setting of :rc:`axes.xmargin`, :rc:`axes.ymargin`,
+# and :rc:`axes.zmargin`:
 
 print(ax.margins())
 
 # %%
-# The margins can be made larger using `~matplotlib.axes.Axes.margins`:
+# The margin size can be overridden to make them smaller or larger using
+# `~matplotlib.axes.Axes.margins`:
 
 fig, ax = plt.subplots()
 ax.plot(x, y)
