matplotlib
diff --git a/‎doc/_templates/index.html
Lines changed: 23 additions & 56 deletions b/‎doc/_templates/index.html
Lines changed: 23 additions & 56 deletions
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% set title = 'matplotlib: python plotting' %}
+{% set title = 'Matplotlib: Python plotting' %}
 
 {% block extrahead %}
 <script>
@@ -41,16 +41,13 @@
 
   <h1>Introduction</h1>
 
-  <p>matplotlib is a python 2D plotting library which produces
+  <p>Matplotlib is a Python 2D plotting library which produces
   publication quality figures in a variety of hardcopy formats and
-  interactive environments across platforms.  matplotlib can be used
-  in python scripts, the python and <a
-  href="http://ipython.org">ipython</a> shell (ala
-  MATLAB<sup>&reg;<a name="matlab" href="#ftn.matlab">*</a></sup>
-  or
-  Mathematica<sup>&reg;<a name="mathematica"
-  href="#ftn.mathematica">&#8224;</a></sup>),
-  web application servers, and six graphical user
+  interactive environments across platforms.  Matplotlib can be used
+  in Python scripts, the Python and <a
+  href="http://ipython.org">IPython</a> shell,
+  the <a href="http://jupyter.org/index.html">jupyter</a> notebook,
+  web application servers, and four graphical user
   interface toolkits.</p>
 
   <div class="responsive_screenshots">
@@ -71,52 +68,26 @@ <h1>Introduction</h1>
   </div>
   <span class="clear_screenshots"></span>
 
-  <p>matplotlib tries to make easy things easy and hard things possible.
+  <p>Matplotlib tries to make easy things easy and hard things possible.
   You can generate plots, histograms, power spectra, bar charts,
-  errorcharts, scatterplots, etc, with just a few lines of code.
+  errorcharts, scatterplots, etc., with just a few lines of code.
   For a sampling, see the <a href="{{ pathto('users/screenshots') }}">screenshots</a>, <a href="{{ pathto('gallery') }}">thumbnail</a> gallery,  and
     <a href="{{ pathto('examples/index') }}">examples</a> directory</p>
 
-<p>For simple plotting the <tt>pyplot</tt> interface provides a
+<p>For simple plotting the <tt>pyplot</tt> module provides a
   MATLAB-like interface, particularly when combined
   with <tt>IPython</tt>.  For the power user, you have full control
   of line styles, font properties, axes properties, etc, via an object
   oriented interface or via a set of functions familiar to MATLAB
   users.</p>
 
-<div style="float: right; min-width: 450px; width: 50%; padding-left: 5%;">
-  <h1>John Hunter (1968-2012)</h1>
-  <table bgcolor="#ddddff">
-   <tr>
-    <td>
-      <img src="_static/John-hunter-crop-2.jpg" align="left" />
-    </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 Technology
-      Fellowship</a>.</p>
-    </td>
-   </tr>
-  </table>
-</div>
-
   <h1>Installation</h1>
 
-  Visit the <a href="{{ pathto('users/installing') }}">matplotlib installation instructions</a>.
+  Visit the <a href="{{ pathto('users/installing') }}">Matplotlib installation instructions</a>.
 
   <h1>Documentation</h1>
 
-  This is the documentation for matplotlib version {{ version }}.
+  This is the documentation for Matplotlib version {{ version }}.
 
   <p id="other_versions"></p>
   <script>
@@ -135,28 +106,28 @@ <h4>Other learning resources</h4>
 
   <h4>Need help?</h4>
 
-<p>matplotlib is a welcoming, inclusive project, and we try to follow
+<p>Matplotlib is a welcoming, inclusive project, and we try to follow
 the <a href="http://www.python.org/psf/codeofconduct/">Python Software
 Foundation Code of Conduct</a> in everything we do.</p>
 
 <p>Check the <a href="{{ pathto('faq/index') }}">faq</a>,
-the <a href="{{ pathto('api/index') }}">api</a> docs and 
+the <a href="{{ pathto('api/index') }}">api</a> docs and
 <a href="http://matplotlib.1069221.n5.nabble.com/matplotlib-users-f3.html">mailing list archives</a> for resources.
 Join the <a href="https://gitter.im/matplotlib/matplotlib">gitter</a> and the mailing lists: <a href="https://mail.python.org/mailman/listinfo/matplotlib-users">Users</a>,
 <a href="https://mail.python.org/mailman/listinfo/matplotlib-announce">Announce</a> and
 <a href="https://mail.python.org/mailman/listinfo/matplotlib-devel">Devel</a>.
-Check out the matplotlib questions
+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>
+examples which exercise almost every corner of Matplotlib.</p>
 
 <p>You can file bugs, patches and feature requests on the
 github
 <a href="https://github.com/matplotlib/matplotlib/issues?sort=created&direction=desc&state=open">tracker</a>,
 but it is a good idea to ping us on the mailing list too.</p>
 
-<p>To keep up to date with what's going on in matplotlib, see
+<p>To keep up to date with what's going on in Matplotlib, see
 the <a href="{{ pathto('users/whats_new.html', 1) }}">what's new
 page</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source
 code</a>.  Anything that could require changes to your existing code
@@ -165,7 +136,7 @@ <h4>Need help?</h4>
 
 <h1>Toolkits</h1>
 
-<p>There are several matplotlib add-on <a href="{{ pathto('mpl_toolkits/index') }}">toolkits</a>,
+<p>There are several Matplotlib add-on <a href="{{ pathto('mpl_toolkits/index') }}">toolkits</a>,
 including a choice of two projection and mapping toolkits <a href="http://matplotlib.org/basemap">basemap</a> and
 <a href="http://scitools.org.uk/cartopy/docs/latest">cartopy</a>,
 3d plotting with <a href="{{ pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>,
@@ -176,14 +147,14 @@ <h1>Toolkits</h1>
     <a href="http://ggplot.yhathq.com">ggplot</a>, and more.
  </p>
 
-<h1>Citing matplotlib</h1>
+<h1>Citing Matplotlib</h1>
 
 <p>
-  matplotlib is the brainchild of John Hunter (1968-2012), who, along with its many
+  Matplotlib is the brainchild of John Hunter (1968-2012), who, along with its many
   contributors, have put an immeasurable amount of time and effort into producing a
   piece of software utilized by thousands of scientists worldwide.
 
-  If matplotlib contributes to a project that leads to a scientific publication,
+  If Matplotlib contributes to a project that leads to a scientific publication,
   please acknowledge this work by citing the project. You can use this
   <a href="{{ pathto('citing') }}">ready-made citation entry</a>.
 </p>
@@ -194,12 +165,12 @@ <h1>Open source</h1>
 <p>
 Please
 consider <a href="https://www.flipcause.com/widget/MjI1OA==">donating
-to the matplotlib project</a> through the Numfocus organization or to
+to the Matplotlib project</a> through the Numfocus organization or to
 the <a href="http://numfocus.org/johnhunter/">John Hunter Technology Fellowship</a>.
 </p>
 
 <p>
-The matplotlib <a href="{{ pathto('users/license') }}">license</a> is based on the Python Software Foundation
+The Matplotlib <a href="{{ pathto('users/license') }}">license</a> is based on the Python Software Foundation
 <a href="http://www.python.org/psf/license">(PSF)</a> license.
 </p>
 
@@ -220,9 +191,5 @@ <h1>Open source</h1>
 <sup><a name="ftn.matlab" href="#matlab">*</a></sup>
 MATLAB is a registered trademark of The MathWorks, Inc.
 </p>
-<p>
-<sup><a name="ftn.mathematica" href="#mathematica">&#8224;</a></sup>
-Mathematica is a registered trademark of Wolfram Research, Inc.
-</p>
 
 {% endblock %}