DOC Set up sphinx-gallery in parallel of our own gallery

NelleV · NelleV · commit b110b1f715e0 · 2017-04-06T16:35:41.000-07:00
diff --git a/doc/conf.py b/doc/conf.py
@@ -32,6 +32,7 @@
               'sphinx.ext.inheritance_diagram',
               'sphinx_gallery.gen_gallery',
               'sphinxext.gen_rst',
+              'sphinxext.gen_gallery',
               'matplotlib.sphinxext.plot_directive',
               'sphinxext.github',
               'numpydoc']
@@ -105,6 +106,7 @@
     # path where to save gallery generated examples
     'gallery_dirs'  : 'auto_examples'}
 
+plot_gallery = True
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
diff --git a/doc/users/image_tutorial.rst b/doc/users/image_tutorial.rst
@@ -226,7 +226,7 @@ Note that you can also change colormaps on existing plot objects using the
 
 There are many other colormap schemes available.  See the `list and
 images of the colormaps
-<../examples/color/colormaps_reference.html>`_.
+<../examples/color/plot_colormaps_reference.html>`_.
 
 .. _`Color Bars`:
 
diff --git a/doc/users/prev_whats_new/whats_new_1.1.rst b/doc/users/prev_whats_new/whats_new_1.1.rst
@@ -205,6 +205,6 @@ Other improvements
 
 * Pim Schellart added a new colormap called "cubehelix".
   Sameer Grover also added a colormap called "coolwarm". See it and all
-  other colormaps :ref:`here <color-colormaps_reference>`.
+  other colormaps :ref:`here <color-plot_colormaps_reference>`.
 
 * Many bug fixes and documentation improvements.
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:: mpl_examples/color/color_cycle_demo.py
+.. plot:: mpl_examples/color/plot_color_cycle.py
 
 
 New Colormaps
diff --git a/examples/color/README.txt b/examples/color/README.txt
@@ -0,0 +1,4 @@
+.. _color_examples:
+
+Color
+=====
diff --git a/examples/color/plot_color_cycle.py b/examples/color/plot_color_cycle.py
diff --git a/examples/color/plot_color_cycle_default.py b/examples/color/plot_color_cycle_default.py
diff --git a/examples/color/plot_colormaps_reference.py b/examples/color/plot_colormaps_reference.py
diff --git a/examples/lines_bars_and_markers/README.txt b/examples/lines_bars_and_markers/README.txt
@@ -0,0 +1,4 @@
+.. _lines_bars_and_markers_example:
+
+Lines, bars and markers
+=======================
diff --git a/examples/lines_bars_and_markers/scatter_with_legend.py b/examples/lines_bars_and_markers/scatter_with_legend.py
@@ -1,5 +1,7 @@
 '''
-Demo of a scatter plot (scatter) with a legend.
+===========================
+Scatter plots with a legend
+===========================
 
 Also demonstrates how transparency of the markers
 can be adjusted by giving ``alpha`` a value between
diff --git a/examples/pie_and_polar_charts/README.txt b/examples/pie_and_polar_charts/README.txt
@@ -0,0 +1,4 @@
+.. _pie_and_polar_charts:
+
+Pie and polar charts
+====================

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +.. _color_examples:
++
 +Color
 +=====