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

Changes from doc/mpl_toolkits/index.rst needed to be moved to
doc/thirdpartypackages/index.rst by hand.

Conflicts:
	doc/_templates/index.html
	doc/mpl_toolkits/index.rst

Author: tacaswell

doc/_static/ggplot.png

@@ -167,8 +167,11 @@ <h1>Toolkits</h1>
 <h1>Third party packages</h1>
 
 <p>A large number of third party <a href="{{ pathto('mpl_toolkits/index') }}">packages</a>
-    extend and build on Matplotlib functionality,
-    including a choice of two projection and mapping toolkits
+    extend and build on Matplotlib functionality.  This includes several higher-level plotting interfaces;
+    <a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
+    <a href="http://holoviews.org">holoviews</a>,
+    <a href="http://ggplot.yhathq.com">ggplot</a>, and
+    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>.
 </p>

doc/_static/holoviews.png

@@ -161,8 +161,6 @@ <h3>{{ _('Navigation') }}</h3>
 
 {% block relbar1 %}
 
-<link rel="shortcut icon" href="/_static/favicon.ico">
-
 <!-- The "Fork me on github" ribbon -->
 <img style="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
 <map name="ribbonmap">

doc/_static/seaborn.png

@@ -214,6 +214,8 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Matplotlibdoc'
 
+# Path to favicon
+html_favicon = '_static/favicon.ico'
 
 # Options for LaTeX output
 # ------------------------

doc/_templates/index.html

@@ -51,7 +51,7 @@ axisartist
 ==========
 
 
-The :ref:`mpl_toolkits.axisartist <toolkit_axisartist-index>` toolkit contains 
+The :ref:`mpl_toolkits.axisartist <toolkit_axisartist-index>` toolkit contains
 a custom Axes class that is meant to support for curvilinear grids.
 
 

doc/_templates/layout.html

@@ -67,6 +67,9 @@ level interface for drawing statistical graphics with matplotlib. It
 aims to make visualization a central part of exploring and
 understanding complex datasets.
 
+.. image:: /_static/seaborn.png
+    :height: 157px
+
 .. _toolkit_ggplot:
 
 ggplot
@@ -75,6 +78,25 @@ ggplot
 `ggplot <https://github.com/yhat/ggplot>`_ is a port of the R ggplot2
 to python based on matplotlib.
 
+.. image:: /_static/ggplot.png
+    :height: 195px
+
+.. _toolkit_holoviews:
+
+holoviews
+=========
+
+
+`holoviews <http://holoviews.org>`_ makes it easier to visualize data
+interactively, especially in a `Jupyter notebook
+<http://jupyter.org>`_, by providing a set of declarative
+plotting objects that store your data and associated metadata.  Your
+data is then immediately visualizable alongside or overlaid with other
+data, either statically or with automatically provided widgets for
+parameter exploration.
+
+.. image:: /_static/holoviews.png
+    :height: 354px
 
 .. _toolkit_prettyplotlib: