Merge remote-tracking branch 'upstream/v1.1.x' into doc-build-fixes2

Conflicts:
	lib/mpl_toolkits/axes_grid1/axes_divider.py

Author: mdboom

doc/faq/howto_faq.rst

@@ -529,10 +529,12 @@ important for complex figures that take some time to draw.
 you're all done issuing commands and you want to draw the figure now.
 
 .. note::
-    :func:`~matplotlib.pyplot.show` should typically only be called
-    at most once per script and it should be the last line of your script.
-    At that point, the GUI takes control of the interpreter.  If you want
-    to force a figure draw, use :func:`~matplotlib.pyplot.draw` instead.
+
+    :func:`~matplotlib.pyplot.show` should typically only be called at
+    most once per script and it should be the last line of your
+    script.  At that point, the GUI takes control of the interpreter.
+    If you want to force a figure draw, use
+    :func:`~matplotlib.pyplot.draw` instead.
 
 Many users are frustrated by ``show`` because they want it to be a
 blocking call that raises the figure, pauses the script until they
@@ -778,4 +780,3 @@ Engineering, Vol. 9, No. 3. (2007), pp. 90-95 (see `citeulike <http://www.citeul
                       development, interactive scripting, and publication-quality image
                       generation across user interfaces and operating systems.},
 	  Bdsk-Url-1 = {http://gateway.isiknowledge.com/gateway/Gateway.cgi?GWVersion=2&SrcAuth=Alerting&SrcApp=Alerting&DestApp=WOS&DestLinkType=FullRecord;KeyUT=000245668100019}}
-

examples/api/logo2.py

@@ -45,7 +45,7 @@ def add_matplotlib_text(ax):
                ha='right', va='center', alpha=1.0, transform=ax.transAxes)
 
 def add_polar_bar():
-    ax = fig.add_axes([0.025, 0.075, 0.2, 0.85], polar=True, resolution=50)
+    ax = fig.add_axes([0.025, 0.075, 0.2, 0.85], polar=True)
 
 
     ax.axesPatch.set_alpha(axalpha)
@@ -77,5 +77,3 @@ def add_polar_bar():
     add_polar_bar()
     add_matplotlib_text(main_axes)
     plt.show()
-
-

examples/pylab_examples/mathtext_examples.py

@@ -40,7 +40,7 @@
     r"$\gamma = \frac{x=\frac{6}{8}}{y} \delta$",
     r'$\limsup_{x\to\infty}$',
     r'$\oint^\infty_0$',
-    r"$f^'$",
+    r"$f^\prime$",
     r'$\frac{x_2888}{y}$',
     r"$\sqrt[3]{\frac{X_2}{Y}}=5$",
     r"$\sqrt[5]{\prod^\frac{x}{2\pi^2}_\infty}$",

lib/matplotlib/axes.py

@@ -7575,11 +7575,13 @@ def hist(x, bins=10, range=None, normed=False, weights=None,
               pdf, bins, patches = ax.hist(...)
               print np.sum(pdf * np.diff(bins))
 
-            .. Note:: Until numpy release 1.5, the underlying numpy
-                      histogram function was incorrect with *normed*=*True*
-                      if bin sizes were unequal.  MPL inherited that
-                      error.  It is now corrected within MPL when using
-                      earlier numpy versions
+            .. note::
+
+                Until numpy release 1.5, the underlying numpy
+                histogram function was incorrect with *normed*=*True*
+                if bin sizes were unequal.  MPL inherited that
+                error.  It is now corrected within MPL when using
+                earlier numpy versions
 
           *weights*:
             An array of weights, of the same shape as *x*.  Each value in

lib/matplotlib/cbook.py

@@ -977,6 +977,7 @@ def get_split_ind(seq, N):
 
         len(' '.join(seq[:ind])<=N
 
+    .
     """
 
     sLen = 0

lib/matplotlib/transforms.py

@@ -1491,6 +1491,7 @@ def from_values(a, b, c, d, e, f):
           b d f
           0 0 1
 
+        .
         """
         return Affine2D(
             np.array([a, c, e, b, d, f, 0.0, 0.0, 1.0], np.float_)
@@ -1504,6 +1505,7 @@ def get_matrix(self):
           b d f
           0 0 1
 
+        .
         """
         self._invalid = 0
         return self._mtx
@@ -1516,6 +1518,7 @@ def set_matrix(self, mtx):
           b d f
           0 0 1
 
+        .
         """
         self._mtx = mtx
         self.invalidate()

lib/mpl_toolkits/axes_grid1/axes_divider.py

@@ -151,6 +151,8 @@ def set_horizontal(self, h):
         :param horizontal: list of sizes
                     (:mod:`~mpl_toolkits.axes_grid.axes_size`)
                     for horizontal division
+
+        .
         """
         self._horizontal = h
 
@@ -164,6 +166,8 @@ def set_vertical(self, v):
         :param horizontal: list of sizes
                     (:mod:`~mpl_toolkits.axes_grid.axes_size`)
                     for horizontal division
+
+        .
         """
         self._vertical = v
 
@@ -932,5 +936,3 @@ def make_axes_area_auto_adjustable(ax,
 #from matplotlib.axes import Axes
 from mpl_axes import Axes
 LocatableAxes = locatable_axes_factory(Axes)
-
-

lib/mpl_toolkits/mplot3d/axes3d.py

@@ -85,7 +85,7 @@ def __init__(self, fig, rect=None, *args, **kwargs):
 
         # func used to format z -- fall back on major formatters
         self.fmt_zdata = None
-        
+
         if zscale is not None :
             self.set_zscale(zscale)
 
@@ -609,10 +609,10 @@ def set_zticks(self, *args, **kwargs):
         .. versionadded:: 1.1.0
         """
         return self.zaxis.set_ticks(*args, **kwargs)
-        
+
     def get_zticks(self, minor=False):
         """
-        Return the z ticks as a list of locations  
+        Return the z ticks as a list of locations
         See :meth:`matplotlib.axes.Axes.get_yticks` for more details.
 
         .. note::
@@ -634,7 +634,7 @@ def get_zmajorticklabels(self) :
     def get_zminorticklabels(self) :
         """
         Get the ztick labels as a list of Text instances
-        
+
         .. note::
             Minor ticks are not supported. This function was added
             only for completeness.
@@ -1045,6 +1045,7 @@ def grid(self, b=True, **kwargs):
         Set / unset 3D grid.
 
         .. note::
+
             Currently, this function does not behave the same as
             :meth:`matplotlib.axes.Axes.grid`, but it is intended to
             eventually support that behavior.
@@ -1360,7 +1361,7 @@ def plot_surface(self, X, Y, Z, *args, **kwargs):
         # then an exception is automatically thrown.
         X.shape = (rows, cols)
         Y.shape = (rows, cols)
-        
+
         rstride = kwargs.pop('rstride', 10)
         cstride = kwargs.pop('cstride', 10)
 
@@ -1396,7 +1397,7 @@ def plot_surface(self, X, Y, Z, *args, **kwargs):
         #colset contains the data for coloring: either average z or the facecolor
         colset = []
         for rs in xrange(0, rows-1, rstride):
-            for cs in xrange(0, cols-1, cstride):  
+            for cs in xrange(0, cols-1, cstride):
                 ps = []
                 for a in (X, Y, Z) :
                     ztop = a[rs,cs:min(cols, cs+cstride+1)]
@@ -2167,7 +2168,7 @@ def get_test_data(delta=0.05):
 
 
 ########################################################
-# Register Axes3D as a 'projection' object available 
+# Register Axes3D as a 'projection' object available
 # for use just like any other axes
 ########################################################
 import matplotlib.projections as proj