Merge branch 'v1.4.x' into master

Conflicts:
	INSTALL

Author: tacaswell

.mailmap

@@ -5,3 +5,32 @@ Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
 Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@michiel-de-hoons-computer.local>
 Kevin Davies <kdavies4@gmail.com> Kevin Davies <daviesk24@yahoo.com>
 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
+Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
+anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
+Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
+Daniel Hyams <dhyams@gmail.com> dhyams <dhyams@gmail.com>
+Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
+James R. Evans <jrevans1@earthlink.net> James Evans <jrevans1@earthlink.net>
+Jeffrey Bingham <bingjeff@gmail.com> Jeff Bingham <bingjeff@gmail.com>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H Nielsen <jenshnielsen@gmail.com>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jenshnielsen@gmail.com>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jens.nielsen@ucl.ac.uk>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
+Julien Schueller <julien.schueller@gmail.com> jschueller <schueller@porsche-l64.phimeca.lan>
+Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@bx-l64.phimeca.lan>
+Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@porsche-l64.phimeca.lan>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@gmail.com>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
+MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
+Nelle Varoquaux <nelle.varoquaux@gmail.com> Varoquaux <nelle.varoquaux@gmail.com>
+Nicolas P. Rougier <Nicolas.Rougier@inria.fr> Nicolas Rougier <Nicolas.Rougier@inria.fr>
+Per Parker <wisalam@live.com> Per <wisalam@live.com>
+Per Parker <wisalam@live.com> solvents <wisalam@live.com>
+Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@gmail.com>
+Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@googlemail.com>
+Peter Würtz <pwuertz@gmail.com> Peter Würtz <pwuertz@googlemail.com>
+Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@gmail.com>
+Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@hotmail.com>
+Phil Elson <pelson.pub@gmail.com> pelson <philipelson@hotmail.com>
+Phil Elson <pelson.pub@gmail.com> pelson <pelson.pub@gmail.com>
+Scott Lasley <selasley@me.com> selasley <selasley@me.com>

INSTALL

@@ -66,7 +66,7 @@ you will also need to install compatible versions of
 `pyparsing <https://pypi.python.org/pypi/pyparsing/>`_ and
 `six <https://pypi.python.org/pypi/six>`_
 in addition to
-`matplotlib <https://pypi.python.org/pypi/matplotlib>`_.
+`matplotlib <http://matplotlib.org/downloads.html>`_.
 
 In case Python is not installed for all users (not the default), the
 Microsoft Visual C++ 2008 (
@@ -106,14 +106,15 @@ standard Python shell or IPython. It is enabled as the default backend
 for the official binaries.  GTK3 is not supported on Windows.
 
 The Windows installers (:file:`*.exe`) and wheels (:file:`*.whl`) on
-the download page do not contain test data or example code.
+the `download page <http://matplotlib.org/downloads.html>`_ do not
+contain test data or example code.
 If you want to try the many demos that come in the matplotlib source
-distribution, download the zip file and look in the :file:`examples`
-subdirectory.
-To run the test suite, copy the lib\matplotlib\tests and
-lib\mpl_toolkits\tests directories from the source distribution to
-sys.prefix\Lib\site-packages\matplotlib and
-sys.prefix\Lib\site-packages\mpl_toolkits respectively, and install
+distribution, download the :file:`*.tar.gz` file and look in the
+:file:`examples` subdirectory.
+To run the test suite, copy the :file:`lib\matplotlib\tests` and
+:file:`lib\mpl_toolkits\tests` directories from the source distribution to
+:file:`sys.prefix\Lib\site-packages\matplotlib` and
+:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and install
 `nose <https://pypi.python.org/pypi/nose>`_,
 `mock <https://pypi.python.org/pypi/mock>`_,
 Pillow, MiKTeX, GhostScript, ffmpeg, avconv, mencoder, ImageMagick, and
@@ -163,9 +164,11 @@ Build requirements
 
 These are external packages which you will need to install before
 installing matplotlib.  If you are building on OSX, see
-:ref:`build_osx`. If you are installing dependencies with a package
-manager on Linux, you may need to install the development packages
-(look for a "-dev" postfix) in addition to the libraries themselves.
+:ref:`build_osx`. If you are building on Windows, see
+:ref:`build_windows`. If you are installing dependencies with a
+package manager on Linux, you may need to install the development
+packages (look for a "-dev" postfix) in addition to the libraries
+themselves.
 
 
 Required Dependencies
@@ -197,9 +200,7 @@ six 1.3 or later
 libpng 1.2 (or later)
     library for loading and saving :term:`PNG` files (`download
     <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
-    zlib. If you are a Windows user, you can ignore this because we
-    build support into the matplotlib single-click installer
-
+    zlib.
 
 Optional GUI framework
 ^^^^^^^^^^^^^^^^^^^^^^
@@ -235,13 +236,23 @@ ImageMagick
 Optional dependencies
 ^^^^^^^^^^^^^^^^^^^^^
 
-`Pillow http://python-imaging.github.io/`__
+`Pillow <http://python-imaging.github.io/>`_
     If Pillow is installed, matplotlib can read and write a larger
     selection of image file formats.
 
+:term:`freetype` 2.4 or later
+    library for reading true type font files.  Matplotlib in known
+    to work with freetype 2.3, and the required version will be reduced
+    in 1.4.1.  If you need to build from source on a system which only has
+    freetype 2.3 available, please edit L945 of `setupext.py` to reduce
+    `min_version` to 2.3.
+
+`pytz`
+    Required if you want to manipulate datetime objects which are time-zone
+    aware.  An exception will be raised if you try to make time-zone aware
+    plots with out `pytz` installed.  It will become a required dependency
+    in 1.4.1.
 
-:term:`freetype` 1.4 (or later)
-    library for reading true type font files.
 
 
 Required libraries that ship with matplotlib
@@ -295,12 +306,20 @@ the different OSX version (e.g., 10.4 and 10.5). We recommend that you build
 the way we do for the OSX release: get the source from the tarball or the
 git repository and follow the instruction in :file:`README.osx`.
 
-.. _build_osx:
+
+.. _build_windows:
+
 
 Building on Windows
 -------------------
 
-Building for source on windows can be difficult.  Please see
-`matplotlib-windbuild
-<https://github.com/jbmohler/matplotlib-winbuild>`_ for detailed
-instructions, dependency source blobs, and helper scripts.
+The Python shipped from http://www.python.org is compiled with Visual Studio
+2008 for versions before 3.3 and Visual Studio 2010 for 3.3 and later.  Python
+extensions are recommended to be compiled with the same compiler.  The .NET
+Framework 4.0 is required for MSBuild (you'll likely have the requisite
+Framework with Visual Studio).  In addition to Visual Studio `CMake
+<http://www.cmake.org>`_ is required for building libpng.
+
+Since there is no canonical Windows package manager the build methods for
+freetype, zlib, libpng, tcl, & tk source code are documented as a build script
+at `matplotlib-winbuild <https://github.com/jbmohler/matplotlib-winbuild>`.

doc/_templates/citing.html

@@ -24,4 +24,11 @@ <h1>Citing matplotlib</h1>
   year      = 2007
 }
 </pre>
+
+
+<h2>DOIs</h2>
+<dl>
+  <dt>v1.4.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.11451"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.11451.png" alt="10.5281/zenodo.11451"></a></dd>
+</dl>
+
 {% endblock %}

doc/_templates/layout.html

@@ -178,25 +178,6 @@ <h3>{{ _('Navigation') }}</h3>
 
 {% block relbar1 %}
 
-<!-- Piwik -->
-<script type="text/javascript">
-if ("matplotlib.sourceforge.net" == document.location.hostname ||
-    "matplotlib.sf.net" == document.location.hostname) {
-  var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/matplotlib/" : "http://apps.sourceforge.net/piwik/matplotlib/");
-  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-}
-</script>
-<script type="text/javascript">
-if ("matplotlib.sourceforge.net" == document.location.hostname ||
-    "matplotlib.sf.net" == document.location.hostname) {
-  piwik_action_name = '';
-  piwik_idsite = 1;
-  piwik_url = pkBaseURL + "piwik.php";
-  piwik_log(piwik_action_name, piwik_idsite, piwik_url);
-  document.write(unescape('%3Cobject%3E%3Cnoscript%3E%3Cp%3E%3Cimg src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/%3E%3C/p%3E%3C/noscript%3E%3C/object%3E'));
-}
-</script>
-<!-- End Piwik Tag -->
 <link rel="shortcut icon" href="/_static/favicon.ico">
 
 <!-- The "Fork me on github" ribbon -->

doc/faq/installing_faq.rst

@@ -145,6 +145,8 @@ line script to the appropriate places.
 .. note::
    Mac OSX users please see the :ref:`build_osx` guide.
 
+   Windows users please see the :ref:`build_windows` guide.
+
 Then, if you want to update your matplotlib at any time, just do::
 
   > git pull