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

tacaswell · tacaswell · commit 77ad3effd19f · 2016-05-22T19:05:00.000-04:00
diff --git a/INSTALL b/INSTALL
@@ -233,8 +233,11 @@ matplotlib with a user interface toolkit. See
 :ref:`what-is-a-backend` for more details on the optional matplotlib
 backends and the capabilities they provide.
 
-:term:`tk` 8.3 or later
-    The TCL/Tk widgets library used by the TkAgg backend
+:term:`tk` 8.3 or later, not 8.6.0 or 8.6.1
+    The TCL/Tk widgets library used by the TkAgg backend.
+
+    Versions 8.6.0 and 8.6.1 are known to have issues that may result
+    in segfaults when closing multiple windows in the wrong order.
 
 :term:`pyqt` 4.0 or later
     The Qt4 widgets library python wrappers for the Qt4Agg backend
diff --git a/doc/_static/numfocus_badge.png b/doc/_static/numfocus_badge.png
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -189,7 +189,8 @@ <h1>Citing matplotlib</h1>
 </p>
 
   <h1>Open source</h1>
-
+  <img src="_static/numfocus_badge.png" alt="A Fiscally Sponsored Project of NUMFocus"
+       style="float:right; margin-left:20px" />
 <p>
 Please
 consider <a href="https://www.flipcause.com/widget/MjI1OA==">donating
diff --git a/examples/specialty_plots/advanced_hillshading.py b/examples/specialty_plots/advanced_hillshading.py
@@ -16,7 +16,7 @@ def display_colorbar():
     rgb = ls.shade(z, cmap)
 
     fig, ax = plt.subplots()
-    ax.imshow(rgb)
+    ax.imshow(rgb, interpolation='bilinear')
 
     # Use a proxy artist for the colorbar...
     im = ax.imshow(z, cmap=cmap)
@@ -39,11 +39,11 @@ def avoid_outliers():
     fig, (ax1, ax2) = plt.subplots(ncols=2, figsize=(8, 4.5))
 
     rgb = ls.shade(z, plt.cm.copper)
-    ax1.imshow(rgb)
+    ax1.imshow(rgb, interpolation='bilinear')
     ax1.set_title('Full range of data')
 
     rgb = ls.shade(z, plt.cm.copper, vmin=-10, vmax=10)
-    ax2.imshow(rgb)
+    ax2.imshow(rgb, interpolation='bilinear')
     ax2.set_title('Manually set range')
 
     fig.suptitle('Avoiding Outliers in Shaded Plots', size='x-large')
@@ -62,7 +62,7 @@ def shade_other_data():
     rgb = ls.shade_rgb(cmap(norm(z2)), z1)
 
     fig, ax = plt.subplots()
-    ax.imshow(rgb)
+    ax.imshow(rgb, interpolation='bilinear')
     ax.set_title('Shade by one variable, color by another', size='x-large')
 
 display_colorbar()
