calling it 'gallery'

choldgraf · choldgraf · commit b571c5196770 · 2017-04-09T22:50:14.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -32,7 +32,7 @@
 build
 # sphinx build directory
 doc/_build
-doc/examples_gallery
+doc/gallery
 # setup.py dist directory
 dist
 # Egg metadata
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -76,7 +76,7 @@ <h1>Introduction</h1>
   You can generate plots, histograms, power spectra, bar charts,
   errorcharts, scatterplots, etc., with just a few lines of code.
   For a sampling, see the <a href="{{ pathto('users/screenshots')
-  }}">screenshots</a>, <a href="{{ pathto('examples_gallery/index') }}">thumbnail</a> gallery,  and
+  }}">screenshots</a>, <a href="{{ pathto('gallery/index') }}">thumbnail</a> gallery,  and
     <a href="{{ pathto('examples/index') }}">examples</a> directory</p>
 
 <p>For simple plotting the <tt>pyplot</tt> module provides a
@@ -100,7 +100,7 @@ <h1>Documentation</h1>
   </script>
 
   <p>Trying to learn how to do a particular kind of plot?  Check out
-  the <a href="{{ pathto('examples_gallery/index') }}">gallery</a>, <a href="{{ pathto('examples/index') }}">examples</a>,
+  the <a href="{{ pathto('gallery/index') }}">gallery</a>, <a href="{{ pathto('examples/index') }}">examples</a>,
   or the <a href="{{ pathto('api/pyplot_summary') }}">list of plotting
   commands</a>.</p>
 
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -39,7 +39,7 @@ <h3>{{ _('Navigation') }}</h3>
 
         <li><a href="{{ pathto('index') }}">home</a>|&nbsp;</li>
         <li><a href="{{ pathto('examples/index') }}">examples</a>|&nbsp;</li>
-        <li><a href="{{ pathto('examples_gallery/index') }}">gallery</a>|&nbsp;</li>
+        <li><a href="{{ pathto('gallery/index') }}">gallery</a>|&nbsp;</li>
         <li><a href="{{ pathto('api/pyplot_summary') }}">pyplot</a>|&nbsp;</li>
         <li><a href="{{ pathto('contents') }}">docs</a> &raquo;</li>
 
diff --git a/doc/conf.py b/doc/conf.py
@@ -109,7 +109,7 @@
    # path to your examples scripts
     'examples_dirs' : '../examples',
     # path where to save gallery generated examples
-    'gallery_dirs'  : 'examples_gallery'}
+    'gallery_dirs'  : 'gallery'}
 
 plot_gallery = True
 
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -442,7 +442,7 @@ We have hundreds of examples in subdirectories of
 :file:`matplotlib/examples`, and these are automatically generated
 when the website is built to show up both in the `examples
 <../examples/index.html>`_ and `gallery
-<../examples_gallery/index.html>`_ sections of the website.
+<../gallery/index.html>`_ sections of the website.
 
 Any sample data that the example uses should be kept small and
 distributed with Matplotlib in the
diff --git a/doc/mpl_toolkits/index.rst b/doc/mpl_toolkits/index.rst
@@ -30,7 +30,7 @@ plotting (scatter, surf, line, mesh) tools.  Not the fastest or feature
 complete 3D library out there, but ships with Matplotlib and thus may be a
 lighter weight solution for some use cases.
 
-.. plot:: examples_gallery/mplot3d/plot_contourf3d_2.py
+.. plot:: gallery/mplot3d/plot_contourf3d_2.py
 
 .. _toolkit_axes_grid1:
 
diff --git a/doc/mpl_toolkits/mplot3d/tutorial.rst b/doc/mpl_toolkits/mplot3d/tutorial.rst
@@ -36,41 +36,41 @@ Line plots
 ====================
 .. automethod:: Axes3D.plot
 
-.. plot:: examples_gallery/mplot3d/plot_lines3d.py
+.. plot:: gallery/mplot3d/plot_lines3d.py
 
 .. _scatter3d:
 
 Scatter plots
 =============
 .. automethod:: Axes3D.scatter
 
-.. plot:: examples_gallery/mplot3d/plot_scatter3d.py
+.. plot:: gallery/mplot3d/plot_scatter3d.py
 
 .. _wireframe:
 
 Wireframe plots
 ===============
 .. automethod:: Axes3D.plot_wireframe
 
-.. plot:: examples_gallery/mplot3d/plot_wire3d.py
+.. plot:: gallery/mplot3d/plot_wire3d.py
 
 .. _surface:
 
 Surface plots
 =============
 .. automethod:: Axes3D.plot_surface
 
-.. plot:: examples_gallery/mplot3d/plot_surface3d.py
-.. plot:: examples_gallery/mplot3d/plot_surface3d_2.py
-.. plot:: examples_gallery/mplot3d/plot_surface3d_3.py
+.. plot:: gallery/mplot3d/plot_surface3d.py
+.. plot:: gallery/mplot3d/plot_surface3d_2.py
+.. plot:: gallery/mplot3d/plot_surface3d_3.py
 
 .. _trisurface:
 
 Tri-Surface plots
 =================
 .. automethod:: Axes3D.plot_trisurf
 
-.. plot:: examples_gallery/mplot3d/plot_trisurf3d.py
+.. plot:: gallery/mplot3d/plot_trisurf3d.py
 
 
 .. _contour3d:
@@ -79,18 +79,18 @@ Contour plots
 =============
 .. automethod:: Axes3D.contour
 
-.. plot:: examples_gallery/mplot3d/plot_contour3d.py
-.. plot:: examples_gallery/mplot3d/plot_contour3d_2.py
-.. plot:: examples_gallery/mplot3d/plot_contour3d_3.py
+.. plot:: gallery/mplot3d/plot_contour3d.py
+.. plot:: gallery/mplot3d/plot_contour3d_2.py
+.. plot:: gallery/mplot3d/plot_contour3d_3.py
 
 .. _contourf3d:
 
 Filled contour plots
 ====================
 .. automethod:: Axes3D.contourf
 
-.. plot:: examples_gallery/mplot3d/plot_contourf3d.py
-.. plot:: examples_gallery/mplot3d/plot_contourf3d_2.py
+.. plot:: gallery/mplot3d/plot_contourf3d.py
+.. plot:: gallery/mplot3d/plot_contourf3d_2.py
 
 .. versionadded:: 1.1.0
    The feature demoed in the second contourf3d example was enabled as a
@@ -102,37 +102,37 @@ Polygon plots
 ====================
 .. automethod:: Axes3D.add_collection3d
 
-.. plot:: examples_gallery/mplot3d/plot_polys3d.py
+.. plot:: gallery/mplot3d/plot_polys3d.py
 
 .. _bar3d:
 
 Bar plots
 ====================
 .. automethod:: Axes3D.bar
 
-.. plot:: examples_gallery/mplot3d/plot_bars3d.py
+.. plot:: gallery/mplot3d/plot_bars3d.py
 
 .. _quiver3d:
 
 Quiver
 ====================
 .. automethod:: Axes3D.quiver
 
-.. plot:: examples_gallery/mplot3d/plot_quiver3d.py
+.. plot:: gallery/mplot3d/plot_quiver3d.py
 
 .. _2dcollections3d:
 
 2D plots in 3D
 ====================
-.. plot:: examples_gallery/mplot3d/plot_2dcollections3d.py
+.. plot:: gallery/mplot3d/plot_2dcollections3d.py
 
 .. _text3d:
 
 Text
 ====================
 .. automethod:: Axes3D.text
 
-.. plot:: examples_gallery/mplot3d/plot_text3d.py
+.. plot:: gallery/mplot3d/plot_text3d.py
 
 .. _3dsubplots:
 
@@ -146,5 +146,5 @@ in the same figure.
    Subplotting 3D plots was added in v1.0.0.  Earlier version can not
    do this.
 
-.. plot:: examples_gallery/mplot3d/plot_subplot3d.py
-.. plot:: examples_gallery/mplot3d/plot_mixed_subplots.py
+.. plot:: gallery/mplot3d/plot_subplot3d.py
+.. plot:: gallery/mplot3d/plot_mixed_subplots.py
diff --git a/doc/users/prev_whats_new/whats_new_1.1.rst b/doc/users/prev_whats_new/whats_new_1.1.rst
@@ -20,7 +20,7 @@ Kevin Davies has extended Yannick Copin's original Sankey example into a module
 (:ref:`api-plot_sankey_basics`, :ref:`api-plot_sankey_links`,
 :ref:`api-plot_sankey_rankine`).
 
-.. plot:: examples_gallery/api/plot_sankey_rankine.py
+.. plot:: gallery/api/plot_sankey_rankine.py
 
 
 Animation
@@ -135,12 +135,12 @@ as 2D plotting, Ben Root has made several improvements to the
 
 * Ticker offset display added:
 
-.. plot:: examples_gallery/mplot3d/plot_offset.py
+.. plot:: gallery/mplot3d/plot_offset.py
 
 * :meth:`~mpl_toolkits.mplot3d.axes3d.Axes3D.contourf`
   gains *zdir* and *offset* kwargs. You can now do this:
 
-.. plot:: examples_gallery/mplot3d/plot_contourf3d_2.py
+.. plot:: gallery/mplot3d/plot_contourf3d_2.py
 
 Numerix support removed
 -----------------------
diff --git a/doc/users/prev_whats_new/whats_new_1.2.rst b/doc/users/prev_whats_new/whats_new_1.2.rst
@@ -7,6 +7,7 @@ New in matplotlib 1.2
 .. contents:: Table of Contents
    :depth: 2
 
+
 .. note::
 
    matplotlib 1.2 supports Python 2.6, 2.7, and 3.1
@@ -61,7 +62,7 @@ Damon McDougall added a new plotting method for the
 :mod:`~mpl_toolkits.mplot3d` toolkit called
 :meth:`~mpl_toolkits.mplot3d.axes3d.Axes3D.plot_trisurf`.
 
-.. plot:: examples_gallery/mplot3d/plot_trisurf3d.py
+.. plot:: gallery/mplot3d/plot_trisurf3d.py
 
 Control the lengths of colorbar extensions
 ------------------------------------------
@@ -152,7 +153,7 @@ In addition to simply plotting the streamlines of the vector field,
 line widths of the streamlines to a separate parameter, such as the speed or
 local intensity of the vector field.
 
-.. plot:: examples_gallery/images_contours_and_fields/plot_streamplot_features.py
+.. plot:: gallery/images_contours_and_fields/plot_streamplot_features.py
 
 
 New hist functionality
diff --git a/doc/users/prev_whats_new/whats_new_1.3.rst b/doc/users/prev_whats_new/whats_new_1.3.rst
@@ -91,7 +91,7 @@ before creating your plot. For really fine control, it is also possible
 to modify each artist's sketch parameters individually with
 :meth:`matplotlib.artist.Artist.set_sketch_params`.
 
-.. plot:: examples_gallery/showcase/plot_xkcd.py
+.. plot:: gallery/showcase/plot_xkcd.py
 
 Updated Axes3D.contour methods
 ------------------------------
@@ -100,7 +100,7 @@ Damon McDougall updated the
 :meth:`~mpl_toolkits.mplot3d.axes3d.Axes3D.tricontourf` methods to allow 3D
 contour plots on abitrary unstructured user-specified triangulations.
 
-.. plot:: examples_gallery/mplot3d/plot_tricontour3d.py
+.. plot:: gallery/mplot3d/plot_tricontour3d.py
 
 New eventplot plot type
 ```````````````````````
diff --git a/doc/users/prev_whats_new/whats_new_1.4.rst b/doc/users/prev_whats_new/whats_new_1.4.rst
@@ -160,7 +160,7 @@ matplotlib internals were cleaned up to support using such transforms in
 :class:`~matplotlib.Axes`. This transform is important for some plot types,
 specifically the Skew-T used in meteorology.
 
-.. plot:: examples_gallery/api/plot_skewt.py
+.. plot:: gallery/api/plot_skewt.py
 
 Support for specifying properties of wedge and text in pie charts.
 ``````````````````````````````````````````````````````````````````
@@ -243,7 +243,7 @@ term project. This feature is documented in :func:`~mpl_toolkits.mplot3d.Axes3D.
 The team members are: Ryan Steve D'Souza, Victor B, xbtsw, Yang Wang, David,
 Caradec Bisesar and Vlad Vassilovski.
 
-.. plot:: examples_gallery/mplot3d/plot_quiver3d.py
+.. plot:: gallery/mplot3d/plot_quiver3d.py
 
 polar-plot r-tick locations
 ```````````````````````````
diff --git a/doc/users/prev_whats_new/whats_new_1.5.rst b/doc/users/prev_whats_new/whats_new_1.5.rst
@@ -109,7 +109,7 @@ You can even multiply cyclers, which is like using `itertools.product()`
 on two or more property cycles. Remember to use parentheses if writing
 a multi-line `prop_cycle` parameter.
 
-.. plot:: examples_gallery/color/plot_color_cycle.py
+.. plot:: gallery/color/plot_color_cycle.py
 
 
 New Colormaps
@@ -367,7 +367,7 @@ kwargs names is not ideal, but `Axes.fill_between` already has a
 
 This is particularly useful for plotting pre-binned histograms.
 
-.. plot:: examples_gallery/api/plot_filled_step.py
+.. plot:: gallery/api/plot_filled_step.py
 
 
 Square Plot
diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
@@ -22,7 +22,7 @@ Subplot demo
 Multiple axes (i.e. subplots) are created with the
 :func:`~matplotlib.pyplot.subplot` command:
 
-.. plot:: examples_gallery/subplots_axes_and_figures/plot_subplot.py
+.. plot:: gallery/subplots_axes_and_figures/plot_subplot.py
 
 .. _screenshots_histogram_demo:
 
@@ -32,7 +32,7 @@ Histograms
 The :func:`~matplotlib.pyplot.hist` command automatically generates
 histograms and returns the bin counts or probabilities:
 
-.. plot:: examples_gallery/statistics/plot_histogram_features.py
+.. plot:: gallery/statistics/plot_histogram_features.py
 
 
 .. _screenshots_path_demo:
@@ -43,7 +43,7 @@ Path demo
 You can add arbitrary paths in matplotlib using the
 :mod:`matplotlib.path` module:
 
-.. plot:: examples_gallery/shapes_and_collections/plot_path_patch.py
+.. plot:: gallery/shapes_and_collections/plot_path_patch.py
 
 .. _screenshots_mplot3d_surface:
 
@@ -54,7 +54,7 @@ The mplot3d toolkit (see :ref:`toolkit_mplot3d-tutorial` and
 :ref:`mplot3d-examples-index`) has support for simple 3d graphs
 including surface, wireframe, scatter, and bar charts.
 
-.. plot:: examples_gallery/mplot3d/plot_surface3d.py
+.. plot:: gallery/mplot3d/plot_surface3d.py
 
 Thanks to John Porter, Jonathon Taylor, Reinier Heeres, and Ben Root for
 the `mplot3d` toolkit. This toolkit is included with all standard matplotlib
@@ -71,7 +71,7 @@ a vector field. In addition to simply plotting the streamlines, it allows you
 to map the colors and/or line widths of streamlines to a separate parameter,
 such as the speed or local intensity of the vector field.
 
-.. plot:: examples_gallery/images_contours_and_fields/plot_streamplot_features.py
+.. plot:: gallery/images_contours_and_fields/plot_streamplot_features.py
 
 This feature complements the :meth:`~matplotlib.pyplot.quiver` function for
 plotting vector fields. Thanks to Tom Flannaghan and Tony Yu for adding the
@@ -117,7 +117,7 @@ exploding one or more wedges from the center of the pie, and a shadow effect.
 Take a close look at the attached code, which generates this figure in just
 a few lines of code.
 
-.. plot:: examples_gallery/pie_and_polar_charts/plot_pie_features.py
+.. plot:: gallery/pie_and_polar_charts/plot_pie_features.py
 
 .. _screenshots_table_demo:
 
@@ -166,7 +166,7 @@ Fill demo
 The :func:`~matplotlib.pyplot.fill` command lets you
 plot filled curves and polygons:
 
-.. plot:: examples_gallery/lines_bars_and_markers/plot_fill.py
+.. plot:: gallery/lines_bars_and_markers/plot_fill.py
 
 Thanks to Andrew Straw for adding this function.
 
@@ -178,7 +178,7 @@ Date demo
 You can plot date data with major and minor ticks and custom tick formatters
 for both.
 
-.. plot:: examples_gallery/api/plot_date.py
+.. plot:: gallery/api/plot_date.py
 
 See :mod:`matplotlib.ticker` and :mod:`matplotlib.dates` for details and usage.
 
@@ -217,7 +217,7 @@ The :func:`~matplotlib.pyplot.legend` command automatically
 generates figure legends, with MATLAB-compatible legend placement
 commands.
 
-.. plot:: examples_gallery/api/plot_legend.py
+.. plot:: gallery/api/plot_legend.py
 
 Thanks to Charles Twardy for input on the legend command.
 
@@ -278,4 +278,4 @@ XKCD-style sketch plots
 matplotlib supports plotting in the style of `xkcd
 <http://www.xkcd.com/>`.
 
-.. plot:: examples_gallery/showcase/plot_xkcd.py
+.. plot:: gallery/showcase/plot_xkcd.py
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
diff --git a/lib/matplotlib/sankey.py b/lib/matplotlib/sankey.py
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
