Merge branch 'v2.x' into master

QuLogic · QuLogic · commit 76c730371279 · 2016-10-18T16:23:12.000-04:00
diff --git a/doc/users/customizing.rst b/doc/users/customizing.rst
@@ -8,7 +8,8 @@ Using style sheets
 ==================
 
 The ``style`` package adds support for easy-to-switch plotting "styles" with
-the same parameters as a matplotlibrc_ file.
+the same parameters as a matplotlibrc_ file (which is read at startup to
+configure matplotlib).
 
 There are a number of pre-defined styles provided by matplotlib. For
 example, there's a pre-defined style called "ggplot", which emulates the
diff --git a/doc/users/text_intro.rst b/doc/users/text_intro.rst
@@ -4,8 +4,8 @@ Text introduction
 =================
 
 matplotlib has extensive text support, including support for
-mathematical expressions, truetype support for raster and 
-vector outputs, newline separated text with arbitrary 
+mathematical expressions, truetype support for raster and
+vector outputs, newline separated text with arbitrary
 rotations, and unicode support.  Because it embeds
 fonts directly in output documents, e.g., for postscript
 or PDF, what you see on the screen is what you get in the hardcopy.
diff --git a/lib/mpl_toolkits/axes_grid1/anchored_artists.py b/lib/mpl_toolkits/axes_grid1/anchored_artists.py
@@ -1,11 +1,13 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 import six
+
 from matplotlib import docstring
 from matplotlib.offsetbox import (AnchoredOffsetbox, AuxTransformBox,
                                   DrawingArea, TextArea, VPacker)
 from matplotlib.patches import Rectangle, Ellipse
 
+
 __all__ = ['AnchoredDrawingArea', 'AnchoredAuxTransformBox',
            'AnchoredEllipse', 'AnchoredSizeBar']
 
