Merge pull request #20394 from anntzer/3ds

jklymak · web-flow · commit e4670d08394c · 2021-06-09T16:03:16.000-07:00
Remove separate section for support of 3d subplots.
diff --git a/doc/users/prev_whats_new/whats_new_0.99.rst b/doc/users/prev_whats_new/whats_new_0.99.rst
@@ -26,7 +26,7 @@ Reinier Heeres has ported John Porter's mplot3d over to the new
 matplotlib transformations framework, and it is now available as a
 toolkit mpl_toolkits.mplot3d (which now comes standard with all mpl
 installs).  See :ref:`mplot3d-examples-index` and
-:ref:`toolkit_mplot3d-tutorial`
+:doc:`/tutorials/toolkits/mplot3d`.
 
 .. plot::
 
diff --git a/doc/users/prev_whats_new/whats_new_1.1.rst b/doc/users/prev_whats_new/whats_new_1.1.rst
@@ -138,7 +138,7 @@ as 2D plotting, Ben Root has made several improvements to the
   improved to bring the class towards feature-parity with regular
   Axes objects
 
-* Documentation for :ref:`toolkit_mplot3d-tutorial` was significantly expanded
+* Documentation for :doc:`/tutorials/toolkits/mplot3d` was significantly expanded
 
 * Axis labels and orientation improved
 
diff --git a/tutorials/introductory/sample_plots.py b/tutorials/introductory/sample_plots.py
@@ -106,7 +106,7 @@
 Three-dimensional plotting
 ==========================
 
-The mplot3d toolkit (see :ref:`toolkit_mplot3d-tutorial` and
+The mplot3d toolkit (see :doc:`/tutorials/toolkits/mplot3d` and
 :ref:`mplot3d-examples-index`) has support for simple 3D graphs
 including surface, wireframe, scatter, and bar charts.
 
diff --git a/tutorials/toolkits/mplot3d.py b/tutorials/toolkits/mplot3d.py
@@ -8,22 +8,25 @@
 .. currentmodule:: mpl_toolkits.mplot3d
 
 .. contents::
-      :backlinks: none
+   :backlinks: none
 
-.. _toolkit_mplot3d-tutorial:
-
-Getting started
----------------
 3D Axes (of class `.Axes3D`) are created by passing the ``projection="3d"``
 keyword argument to `.Figure.add_subplot`::
 
    import matplotlib.pyplot as plt
    fig = plt.figure()
    ax = fig.add_subplot(projection='3d')
 
+Multiple 3D subplots can be added on the same figure, as for 2D subplots.
+
+.. figure:: ../../gallery/mplot3d/images/sphx_glr_subplot3d_001.png
+   :target: ../../gallery/mplot3d/subplot3d.html
+   :align: center
+   :scale: 50
+
 .. versionchanged:: 1.0.0
-   Prior to Matplotlib 1.0.0, `.Axes3D` needed to be directly instantiated with
-   ``from mpl_toolkits.mplot3d import Axes3D; ax = Axes3D(fig)``.
+   Prior to Matplotlib 1.0.0, only a single `.Axes3D` could be created per
+   figure; it needed to be directly instantiated as ``ax = Axes3D(fig)``.
 
 .. versionchanged:: 3.2.0
    Prior to Matplotlib 3.2.0, it was necessary to explicitly import the
@@ -166,21 +169,4 @@
    :target: ../../gallery/mplot3d/text3d.html
    :align: center
    :scale: 50
-
-.. _3dsubplots:
-
-Subplotting
-====================
-Having multiple 3D plots in a single figure is the same
-as it is for 2D plots. Also, you can have both 2D and 3D plots
-in the same figure.
-
-.. versionadded:: 1.0.0
-   Subplotting 3D plots was added in v1.0.0.  Earlier version can not
-   do this.
-
-.. figure:: ../../gallery/mplot3d/images/sphx_glr_subplot3d_001.png
-   :target: ../../gallery/mplot3d/subplot3d.html
-   :align: center
-   :scale: 50
 """
