Merge remote-tracking branch 'upstream/v1.1.x'

mdboom · mdboom · commit 74793c9a7613 · 2012-09-05T13:09:47.000-04:00
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -38,6 +38,31 @@
   <!-- The "Fork me on github" ribbon -->
   <a href="https://github.com/matplotlib/matplotlib"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" alt="Fork me on GitHub"></a>
 
+  <h1>John Hunter (1968-2012)</h1>
+
+  <table>
+    <tr>
+      <td>
+        <img src="John-hunter-crop-2.jpg"/>
+        </td>
+      <td>
+  <p>
+  On August 28 2012, John D. Hunter, the creator of matplotlib, died
+  from complications arising from cancer treatment, after a brief but
+  intense battle with this terrible illness.  John is survived by his
+  wife Miriam, his three daughters Rahel, Ava and Clara, his sisters
+  Layne and Mary, and his mother Sarah.</p>
+
+  <p>
+  If you have benefited from John's many contributions, please say
+  thanks in the way that would matter most to him.  Please consider
+  making a donation to
+  the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
+  Fund</a>.</p>
+  </td>
+</tr>
+</table>
+
   <h1>Introduction</h1>
 
   <p>matplotlib is a python 2D plotting library which produces
@@ -118,6 +143,8 @@ <h4>Need help?</h4>
 <a href="http://sourceforge.net/mailarchive/forum.php?forum_name=matplotlib-users">mailing
 list archives</a>, and join the matplotlib
 mailing <a href="http://sourceforge.net/mail/?group_id=80706">lists</a>.
+Check out the matplotlib questions
+on <a href="http://stackoverflow.com/questions/tagged/matplotlib">stackoverflow</a>.
 The <a href="{{ pathto('search') }}">search</a> tool searches all of
 the documentation, including full text search of over 350 complete
 examples which exercise almost every corner of matplotlib.</p>
