Merge remote-tracking branch 'matplotlib/v2.1.0-doc' into v2.1.x

tacaswell · tacaswell · commit 2b783c3a1f15 · 2017-10-08T18:35:00.000-04:00
diff --git a/doc/conf.py b/doc/conf.py
@@ -135,7 +135,7 @@ def _check_deps():
     'subsection_order': ExplicitOrder(explicit_order_folders)
 }
 
-plot_gallery = True
+plot_gallery = 'True'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ def _check_deps():`
`135`	`135`	`'subsection_order': ExplicitOrder(explicit_order_folders)`
`136`	`136`	`}`
`137`	`137`
`138`		`-plot_gallery = True`
	`138`	`+plot_gallery = 'True'`
`139`	`139`
`140`	`140`	`# Add any paths that contain templates here, relative to this directory.`
`141`	`141`	`templates_path = ['_templates']`