Fix old api references

dstansby · dstansby · commit d72aff32f579 · 2018-05-07T15:54:15.000+01:00
diff --git a/doc/conf.py b/doc/conf.py
@@ -96,7 +96,6 @@ def _check_deps():
 }
 
 explicit_order_folders = [
-                          '../examples/api',
                           '../examples/pyplots',
                           '../examples/subplots_axes_and_figures',
                           '../examples/color',
diff --git a/doc/devel/add_new_projection.rst b/doc/devel/add_new_projection.rst
@@ -62,7 +62,7 @@ Once the class is defined, it must be registered with matplotlib so
 that the user can select it.
 
 A full-fledged and heavily annotated example is in
-:file:`examples/api/custom_scale_example.py`.  There are also some classes
+:file:`examples/scales/custom_scale.py`.  There are also some classes
 in :mod:`matplotlib.scale` that may be used as starting points.
 
 
@@ -123,7 +123,7 @@ Once the projection axes is defined, it can be used in one of two ways:
 
 
 A full-fledged and heavily annotated example is in
-:file:`examples/api/custom_projection_example.py`.  The polar plot
+:file:`examples/scales/custom_projection.py`.  The polar plot
 functionality in :mod:`matplotlib.projections.polar` may also be of
 interest.
 
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -566,7 +566,7 @@ Adding figures
 As above (see :ref:`rst-figures-and-includes`), figures in the examples gallery
 can be referenced with a `:plot:` directive pointing to the python script that
 created the figure.  For instance the `~.Axes.legend` docstring references
-the file :file:`examples/api/legend.py`:
+the file :file:`examples/text_labels_and_annotations/legend.py`:
 
 .. code-block:: python
 
@@ -579,9 +579,9 @@ the file :file:`examples/api/legend.py`:
     .. plot:: gallery/api/legend.py
     """
 
-Note that ``examples/api/legend.py`` has been mapped to
-``gallery/api/legend.py``, a redirection that may be fixed in future
-re-organization of the docs.
+Note that ``examples/text_labels_and_annotations/legend.py`` has been mapped to
+``gallery/text_labels_and_annotations/legend.py``, a redirection that may
+be fixed in future re-organization of the docs.
 
 Plots can also be directly placed inside docstrings.  Details are in
 :doc:`/devel/plot_directive`.  A short example is:
diff --git a/doc/users/prev_whats_new/changelog.rst b/doc/users/prev_whats_new/changelog.rst
@@ -1782,7 +1782,8 @@ the `API changes <../../api/api_changes.html>`_.
            return bitmap arrays or write pngs to make it easier to use
            mathtext outside the context of an mpl figure.  modified
            the mathpng sphinxext to use the mathtext png save
-           functionality - see examples/api/mathtext_asarray.py - JDH
+           functionality - see
+           examples/text_labels_and_annotations/mathtext_asarray.py - JDH
 
 2008-06-11 Use matplotlib.mathtext to render math expressions in
            online docs - MGD
diff --git a/examples/user_interfaces/README.txt b/examples/user_interfaces/README.txt
@@ -8,6 +8,4 @@ following the embedding_in_SOMEGUI.py examples here. Currently
 matplotlib supports wxpython, pygtk, tkinter and pyqt4/5.
 
 When embedding Matplotlib in a GUI, you must use the Matplotlib API
-directly rather than the pylab/pyplot proceedural interface, so take a
-look at the examples/api directory for some example code working with
-the API.
+directly rather than the pylab/pyplot proceedural interface.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -368,7 +368,7 @@ def legend(self, *args, **kwargs):
         Examples
         --------
 
-        .. plot:: gallery/api/legend.py
+        .. plot:: gallery/text_labels_and_annotations/legend.py
 
         """
         handles, labels, extra_args, kwargs = mlegend._parse_legend_args(
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1184,7 +1184,7 @@ def twinx(ax=None):
 
     .. seealso::
 
-       :file:`examples/api_examples/two_scales.py`
+       :file:`examples/subplots_axes_and_figures/two_scales.py`
           For an example
     """
     if ax is None:

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ def _check_deps():`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`explicit_order_folders = [`
`99`		`- '../examples/api',`
`100`	`99`	`'../examples/pyplots',`
`101`	`100`	`'../examples/subplots_axes_and_figures',`
`102`	`101`	`'../examples/color',`