Merge branch 'v1.5.x' into v2.x

jenshnielsen · jenshnielsen · commit d8ebc39a90e4 · 2016-01-24T16:41:38.000Z
diff --git a/doc/_static/boxplot_explanation.png b/doc/_static/boxplot_explanation.png
diff --git a/doc/users/image_tutorial.rst b/doc/users/image_tutorial.rst
@@ -340,7 +340,7 @@ the image.
 
     In [16]: from PIL import Image
     In [17]: img = Image.open('../_static/stinkbug.png')
-    In [18]: resized = img.thumbnail((64, 64), Image.ANTIALIAS) # resizes image in-place
+    In [18]: img.thumbnail((64, 64), Image.ANTIALIAS) # resizes image in-place
     In [19]: imgplot = plt.imshow(img)
 
 .. plot::
@@ -358,7 +358,7 @@ Let's try some others:
 
 .. sourcecode:: ipython
 
-    In [20]: imgplot = plt.imshow(resized, interpolation="nearest")
+    In [20]: imgplot = plt.imshow(img, interpolation="nearest")
 
 .. plot::
 
@@ -370,7 +370,7 @@ Let's try some others:
 
 .. sourcecode:: ipython
 
-    In [21]: imgplot = plt.imshow(resized, interpolation="bicubic")
+    In [21]: imgplot = plt.imshow(img, interpolation="bicubic")
 
 .. plot::
 
diff --git a/examples/axes_grid/parasite_simple2.py b/examples/axes_grid/parasite_simple2.py
@@ -30,7 +30,7 @@
 
 ax_kms.axis["bottom"].set_label("Linear velocity at 2.3 kpc [km/s]")
 ax_kms.axis["left"].set_label("FWHM [km/s]")
-ax_pm.axis["top"].set_label("Proper Motion [$^{''}$/yr]")
+ax_pm.axis["top"].set_label(r"Proper Motion [$''$/yr]")
 ax_pm.axis["top"].label.set_visible(True)
 ax_pm.axis["right"].major_ticklabels.set_visible(False)
 
diff --git a/lib/matplotlib/_cm.py b/lib/matplotlib/_cm.py
@@ -1751,7 +1751,7 @@ def gfunc32(x):
 
 # This bipolar color map was generated from CoolWarmFloat33.csv of
 # "Diverging Color Maps for Scientific Visualization" by Kenneth Moreland.
-# <http://www.cs.unm.edu/~kmorel/documents/ColorMaps/>
+# <http://www.kennethmoreland.com/color-maps/>
 _coolwarm_data = {
     'red': [
         (0.0, 0.2298057, 0.2298057),
diff --git a/lib/matplotlib/backends/qt_editor/formlayout.py b/lib/matplotlib/backends/qt_editor/formlayout.py
@@ -296,6 +296,7 @@ def setup(self):
                     field.setCheckState(QtCore.Qt.Unchecked)
             elif isinstance(value, float):
                 field = QtWidgets.QLineEdit(repr(value), self)
+                field.setCursorPosition(0)
                 field.setValidator(QtGui.QDoubleValidator(field))
                 dialog = self.get_dialog()
                 dialog.register_float_field(field)
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2153,8 +2153,7 @@ def colormaps():
       <http://www.ncl.ucar.edu/Document/Graphics/color_table_gallery.shtml>`_
 
     .. [#] See `Diverging Color Maps for Scientific Visualization
-      <http://www.cs.unm.edu/~kmorel/documents/ColorMaps/>`_ by Kenneth
-      Moreland.
+      <http://www.kennethmoreland.com/color-maps/>`_ by Kenneth Moreland.
 
     .. [#] See `A Color Map for Effective Black-and-White Rendering of
       Color-Scale Images
