DOC: Move OO-examples from pyplot section

StefRe · StefRe · commit dcbb956f91ba · 2022-09-30T08:48:35.000+02:00
to corresponding sections for OO-style examples.

- remove pyplot/bpyplots/boxplot_demo_pyplot.py as it's the same as the
  boxplot demo in statistics
- remove pyplots/text_layout.py as it's a duplicate of text_alignment.py
  in Text, labels and annotations.
- merge very basic examples pyplots/fig_axes_labels_simple.py and
  pyplots/pyplot_formatstr.py into pyplots/pyplot_simple.py
diff --git a/doc/users/faq/howto_faq.rst b/doc/users/faq/howto_faq.rst
@@ -203,8 +203,8 @@ behavior by specifying the coordinates of the label.  The example
 below shows the default behavior in the left subplots, and the manual
 setting in the right subplots.
 
-.. figure:: ../../gallery/pyplots/images/sphx_glr_align_ylabels_001.png
-   :target: ../../gallery/pyplots/align_ylabels.html
+.. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_align_ylabels_001.png
+   :target: ../../gallery/text_labels_and_annotations/align_ylabels.html
    :align: center
    :scale: 50
 
diff --git a/examples/misc/fig_x.py b/examples/misc/fig_x.py
@@ -4,6 +4,8 @@
 =======================
 
 Adding lines to a figure without any axes.
+
+.. redirect-from:: /gallery/pyplots/fig_x
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/pyplots/boxplot_demo_pyplot.py b/examples/pyplots/boxplot_demo_pyplot.py
diff --git a/examples/pyplots/fig_axes_labels_simple.py b/examples/pyplots/fig_axes_labels_simple.py
diff --git a/examples/pyplots/pyplot_formatstr.py b/examples/pyplots/pyplot_formatstr.py
diff --git a/examples/pyplots/pyplot_simple.py b/examples/pyplots/pyplot_simple.py
@@ -5,10 +5,15 @@
 
 A very simple pyplot where a list of numbers are plotted against their
 index. Creates a straight line due to the rate of change being 1 for
-both the X and Y axis.
+both the X and Y axis. Use a format string (here, 'o-r') to set the
+markers (circles), linestyle (solid line) and color (red).
+
+.. redirect-from:: /gallery/pyplots/fig_axes_labels_simple
+.. redirect-from:: /gallery/pyplots/pyplot_formatstr
 """
 import matplotlib.pyplot as plt
-plt.plot([1, 2, 3, 4])
+
+plt.plot([1, 2, 3, 4], 'o-r')
 plt.ylabel('some numbers')
 plt.show()
 
diff --git a/examples/pyplots/text_layout.py b/examples/pyplots/text_layout.py
diff --git a/examples/statistics/boxplot_demo.py b/examples/statistics/boxplot_demo.py
@@ -8,6 +8,8 @@
 The following examples show off how to visualize boxplots with
 Matplotlib. There are many options to control their appearance and
 the statistics that they use to summarize the data.
+
+.. redirect-from:: /gallery/pyplots/boxplot_demo_pyplot
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/subplots_axes_and_figures/auto_subplots_adjust.py b/examples/subplots_axes_and_figures/auto_subplots_adjust.py
@@ -36,6 +36,8 @@
 This function is executed after the figure has been drawn. It can now check
 if the subplot leaves enough room for the text. If not, the subplot parameters
 are updated and second draw is triggered.
+
+.. redirect-from:: /gallery/pyplots/auto_subplots_adjust
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/text_labels_and_annotations/align_ylabels.py b/examples/text_labels_and_annotations/align_ylabels.py
@@ -6,6 +6,7 @@
 Two methods are shown here, one using a short call to `.Figure.align_ylabels`
 and the second a manual way to align the labels.
 
+.. redirect-from:: /gallery/pyplots/align_ylabels
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/text_labels_and_annotations/annotate_transform.py b/examples/text_labels_and_annotations/annotate_transform.py
@@ -6,6 +6,8 @@
 This example shows how to use different coordinate systems for annotations.
 For a complete overview of the annotation capabilities, also see the
 :doc:`annotation tutorial</tutorials/text/annotations>`.
+
+.. redirect-from:: /gallery/pyplots/annotate_transform
 """
 
 import numpy as np
diff --git a/examples/text_labels_and_annotations/annotation_basic.py b/examples/text_labels_and_annotations/annotation_basic.py
@@ -8,6 +8,8 @@
 
 For a complete overview of the annotation capabilities, also see the
 :doc:`annotation tutorial</tutorials/text/annotations>`.
+
+.. redirect-from:: /gallery/pyplots/annotation_basic
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/text_labels_and_annotations/annotation_polar.py b/examples/text_labels_and_annotations/annotation_polar.py
@@ -7,6 +7,8 @@
 
 For a complete overview of the annotation capabilities, also see the
 :doc:`annotation tutorial</tutorials/text/annotations>`.
+
+.. redirect-from:: /gallery/pyplots/annotation_polar
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/text_labels_and_annotations/text_alignment.py b/examples/text_labels_and_annotations/text_alignment.py
@@ -6,6 +6,8 @@
 Texts are aligned relative to their anchor point depending on the properties
 ``horizontalalignment`` and ``verticalalignment``.
 
+.. redirect-from:: /gallery/pyplots/text_layout
+
 .. plot::
 
     import matplotlib.pyplot as plt
diff --git a/examples/text_labels_and_annotations/text_commands.py b/examples/text_labels_and_annotations/text_commands.py
@@ -4,6 +4,8 @@
 =============
 
 Plotting text of many different kinds.
+
+.. redirect-from:: /gallery/pyplots/text_commands
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/ticks/dollar_ticks.py b/examples/ticks/dollar_ticks.py
@@ -4,6 +4,8 @@
 ============
 
 Use a `~.ticker.FormatStrFormatter` to prepend dollar signs on y axis labels.
+
+.. redirect-from:: /gallery/pyplots/dollar_ticks
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/ticks/fig_axes_customize_simple.py b/examples/ticks/fig_axes_customize_simple.py
@@ -4,6 +4,8 @@
 =========================
 
 Customize the background, labels and ticks of a simple plot.
+
+.. redirect-from:: /gallery/pyplots/fig_axes_customize_simple
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/ticks/tick-formatters.py b/examples/ticks/tick-formatters.py
@@ -7,6 +7,8 @@
 is formatted as a string.
 
 This example illustrates the usage and effect of the most common formatters.
+
+.. redirect-from:: /gallery/pyplots/dollar_ticks
 """
 
 import matplotlib.pyplot as plt
diff --git a/tutorials/intermediate/artists.py b/tutorials/intermediate/artists.py
@@ -719,6 +719,6 @@ class in the Matplotlib API, and the one you will be working with most
 # dollar signs and colors them green on the right side of the yaxis.
 #
 #
-# .. include:: ../../gallery/pyplots/dollar_ticks.rst
+# .. include:: ../../gallery/ticks/dollar_ticks.rst
 #    :start-after: y axis labels.
 #    :end-before: .. admonition:: References
diff --git a/tutorials/text/annotations.py b/tutorials/text/annotations.py
@@ -25,8 +25,8 @@
 # *xy* and the location of the text *xytext*.  Both of these
 # arguments are ``(x, y)`` tuples.
 #
-# .. figure:: ../../gallery/pyplots/images/sphx_glr_annotation_basic_001.png
-#    :target: ../../gallery/pyplots/annotation_basic.html
+# .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_annotation_basic_001.png
+#    :target: ../../gallery/text_labels_and_annotations/annotation_basic.html
 #    :align: center
 #
 # In this example, both the *xy* (arrow tip) and *xytext* locations
@@ -86,8 +86,8 @@
 # *fontsize* are passed from `~matplotlib.axes.Axes.annotate` to the
 # ``Text`` instance.
 #
-# .. figure:: ../../gallery/pyplots/images/sphx_glr_annotation_polar_001.png
-#    :target: ../../gallery/pyplots/annotation_polar.html
+# .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_annotation_polar_001.png
+#    :target: ../../gallery/text_labels_and_annotations/annotation_polar.html
 #    :align: center
 #
 # For more on all the wild and wonderful things you can do with

Original file line number	Diff line number	Diff line change
`@@ -719,6 +719,6 @@ class in the Matplotlib API, and the one you will be working with most`
`719`	`719`	`# dollar signs and colors them green on the right side of the yaxis.`
`720`	`720`	`#`
`721`	`721`	`#`
`722`		`-# .. include:: ../../gallery/pyplots/dollar_ticks.rst`
	`722`	`+# .. include:: ../../gallery/ticks/dollar_ticks.rst`
`723`	`723`	`# :start-after: y axis labels.`
`724`	`724`	`# :end-before: .. admonition:: References`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`# xy and the location of the text xytext. Both of these`
`26`	`26`	# arguments are ``(x, y)`` tuples.
`27`	`27`	`#`
`28`		`-# .. figure:: ../../gallery/pyplots/images/sphx_glr_annotation_basic_001.png`
`29`		`-# :target: ../../gallery/pyplots/annotation_basic.html`
	`28`	`+# .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_annotation_basic_001.png`
	`29`	`+# :target: ../../gallery/text_labels_and_annotations/annotation_basic.html`
`30`	`30`	`# :align: center`
`31`	`31`	`#`
`32`	`32`	`# In this example, both the xy (arrow tip) and xytext locations`
`@@ -86,8 +86,8 @@`
`86`	`86`	# fontsize are passed from `~matplotlib.axes.Axes.annotate` to the
`87`	`87`	# ``Text`` instance.
`88`	`88`	`#`
`89`		`-# .. figure:: ../../gallery/pyplots/images/sphx_glr_annotation_polar_001.png`
`90`		`-# :target: ../../gallery/pyplots/annotation_polar.html`
	`89`	`+# .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_annotation_polar_001.png`
	`90`	`+# :target: ../../gallery/text_labels_and_annotations/annotation_polar.html`
`91`	`91`	`# :align: center`
`92`	`92`	`#`
`93`	`93`	`# For more on all the wild and wonderful things you can do with`