Merge pull request #9515 from anntzer/jdh-intro

tacaswell · web-flow · commit 82b65c2c2146 · 2017-10-29T14:29:11.000-07:00
Attribute users/intro to JDH and rename to history.
diff --git a/doc/users/history.rst b/doc/users/history.rst
@@ -1,17 +1,19 @@
-Introduction
-============
+History
+=======
+
+.. note::
+
+   The following introductory text was written in 2008 by John D. Hunter
+   (1968-2012), the original author of Matplotlib.
 
 Matplotlib is a library for making 2D plots of arrays in `Python
 <https://www.python.org>`_.  Although it has its origins in emulating
-the MATLAB |reg| [#]_ graphics commands, it is
+the MATLAB graphics commands, it is
 independent of MATLAB, and can be used in a Pythonic, object oriented
 way.  Although Matplotlib is written primarily in pure Python, it
 makes heavy use of `NumPy <http://www.numpy.org>`_ and other extension
 code to provide good performance even for large arrays.
 
-.. |reg| unicode:: 0xAE
-   :ltrim:
-
 Matplotlib is designed with the philosophy that you should be able to
 create simple plots with just a few commands, or just one!  If you
 want to see a histogram of your data, you shouldn't need to
@@ -62,10 +64,10 @@ The Matplotlib code is conceptually divided into three parts: the
 *pylab interface* is the set of functions provided by
 :mod:`matplotlib.pylab` which allow the user to create plots with code
 quite similar to MATLAB figure generating code
-(:ref:`sphx_glr_tutorials_introductory_pyplot.py`).  The *Matplotlib frontend* or *Matplotlib
+(:doc:`/tutorials/introductory/pyplot`).  The *Matplotlib frontend* or *Matplotlib
 API* is the set of classes that do the heavy lifting, creating and
 managing figures, text, lines, plots and so on
-(:ref:`sphx_glr_tutorials_intermediate_artists.py`).  This is an abstract interface that knows
+(:doc:`/tutorials/intermediate/artists`).  This is an abstract interface that knows
 nothing about output.  The *backends* are device-dependent drawing
 devices, aka renderers, that transform the frontend representation to
 hardcopy or a display device (:ref:`what-is-a-backend`).  Example
@@ -87,8 +89,6 @@ people want to automatically generate PostScript files to send
 to a printer or publishers.  Others deploy Matplotlib on a web
 application server to generate PNG output for inclusion in
 dynamically-generated web pages.  Some use Matplotlib interactively
-from the Python shell in Tkinter on Windows™. My primary use is to
+from the Python shell in Tkinter on Windows. My primary use is to
 embed Matplotlib in a Gtk+ EEG application that runs on Windows, Linux
 and Macintosh OS X.
-
-.. [#] MATLAB is a registered trademark of The MathWorks, Inc.
diff --git a/doc/users/index.rst b/doc/users/index.rst
@@ -12,7 +12,7 @@ User's Guide
 .. toctree::
     :maxdepth: 2
 
-    intro.rst
+    history.rst
     installing.rst
     ../tutorials/index.rst
     interactive.rst
