Merge remote-tracking branch 'matplotlib/v2.0.x'

tacaswell · tacaswell · commit 413421da2127 · 2017-04-16T18:39:37.000-04:00
Conflicts:
	doc/README.txt
 	 - keepmaster version
	doc/devel/documenting_mpl.rst
	 - remove whitespace as in 2.0.x version
	lib/matplotlib/tests/test_axes.py
	 - keep master version
diff --git a/doc/README.txt b/doc/README.txt
@@ -71,4 +71,3 @@ python documentation system built on top of ReST.  This directory contains
 
 * mpl_examples - a link to the Matplotlib examples in case any
   documentation wants to literal include them
-
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -8,7 +8,6 @@ Getting started
 ===============
 
 The documentation for matplotlib is generated from ReStructured Text using the
-
 Sphinx_ documentation generation tool.
 The requirements are as follows (https://github.com/matplotlib/matplotlib/blob/master/doc-requirements.txt)
 

Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,3 @@ python documentation system built on top of ReST. This directory contains`
`71`	`71`
`72`	`72`	`* mpl_examples - a link to the Matplotlib examples in case any`
`73`	`73`	`documentation wants to literal include them`
`74`		`-`