Merge 2x to master

doc/_templates/index.html

@@ -151,9 +151,7 @@ <h4>Need help?</h4>
 
 <p>To keep up to date with what's going on in matplotlib, see
 the <a href="{{ pathto('users/whats_new.html', 1) }}">what's new
-page</a>, the more detailed <a href="{{ pathto('_static/CHANGELOG', 1)
-}}">changelog</a> or browse
-the <a href="https://github.com/matplotlib/matplotlib">source
+page</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source
 code</a>.  Anything that could require changes to your existing code
 is logged in the <a href="{{ pathto('api/api_changes.html', 1) }}">api
 changes</a> file.</p>

lib/matplotlib/artist.py

@@ -214,7 +214,8 @@ def set_axes(self, axes):
 
         ACCEPTS: an :class:`~matplotlib.axes.Axes` instance
         """
-        warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
+        warnings.warn(_get_axes_msg.format('set_axes'), mplDeprecation,
+                      stacklevel=1)
         self.axes = axes
 
     def get_axes(self):
@@ -225,7 +226,8 @@ def get_axes(self):
         This has been deprecated in mpl 1.5, please use the
         axes property.  Will be removed in 1.7 or 2.0.
         """
-        warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
+        warnings.warn(_get_axes_msg.format('get_axes'), mplDeprecation,
+                      stacklevel=1)
         return self.axes
 
     @property
@@ -1581,5 +1583,5 @@ def kwdoc(a):
 
 docstring.interpd.update(Artist=kwdoc(Artist))
 
-_get_axes_msg = """This has been deprecated in mpl 1.5, please use the
+_get_axes_msg = """{} has been deprecated in mpl 1.5, please use the
 axes property.  A removal date has not been set."""

lib/matplotlib/testing/decorators.py

@@ -290,7 +290,7 @@ def image_comparison(baseline_images=None, extensions=None, tol=0,
 
         Otherwise, a list of extensions to test. For example ['png','pdf'].
 
-      *tol*: (default 13)
+      *tol*: (default 0)
         The RMS threshold above which the test is considered failed.
 
       *freetype_version*: str or tuple