Merge branch 'matplotlib/v1.4.3-doc'

tacaswell · tacaswell · commit 69a1908f264c · 2015-07-21T22:46:33.000-04:00
To pick up documentation changes

 - resolved testing.rst conflicts in favor of master
 - resolved resources/index.rst in favor of master
 - resolved github_stats.rst in favor of master
diff --git a/doc/_templates/citing.html b/doc/_templates/citing.html
@@ -28,6 +28,7 @@ <h1>Citing matplotlib</h1>
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v1.4.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.15423"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.15423.svg" alt="10.5281/zenodo.15423"></a></dd>
   <dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>
   <dt>v1.4.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12287"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12287.png" alt="10.5281/zenodo.12287"></a></dd>
   <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>
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -174,6 +174,14 @@ <h3>{{ _('Navigation') }}</h3>
 
   </head>
   <body>
+    <div class="alert" style="background-color: #FEA46C; padding: 10px 0;
+">
+<h3>We're updating the default styles for Matplotlib 2.0</h3>
+
+<p>Learn what to expect in the <a href="/style_changes.html" style="font-weight: bold;
+color: #11557C;">new updates</a></p>
+
+</div>
 {%- block header %}{% endblock %}
 
 {% block relbar1 %}
diff --git a/doc/contents.rst b/doc/contents.rst
@@ -14,6 +14,7 @@ Overview
 .. toctree::
    :maxdepth: 2
 
+   style_changes.rst
    users/index.rst
    faq/index.rst
    resources/index.rst
diff --git a/doc/style_changes.rst b/doc/style_changes.rst
@@ -0,0 +1,37 @@
+Default Style Changes
+=====================
+
+Colormap
+--------
+
+``matplotlib`` is changing the default colormap and styles in the
+upcoming 2.0 release!
+
+The new default color map will be 'viridis' (aka `option
+D <http://bids.github.io/colormap/>`_).  For an introduction to color
+theory and how 'viridis' was generated watch Nathaniel Smith and
+Stéfan van der Walt's talk from SciPy2015
+
+.. raw:: html
+
+    <iframe width="560" height="315" src="https://www.youtube.com/embed/xAoljeRJ3lU" frameborder="0" allowfullscreen></iframe>
+
+All four color maps will be included in matplotlib 1.5.
+
+
+Everything Else
+---------------
+
+We are soliciting proposals to change any and all visual defaults
+(including adding new rcParams as needed).
+
+If you have a proposal please create an issue or PR on `github <https://github.com/matplotlib/matplotlib/issues/new>`_ with the
+changes to `rcsetup.py` and `matplotlibrc.template` by August 9, 2015.
+
+In the second week of August, Michael Droettboom and Thomas Caswell
+will decide on the new default styles, with the release of 2.0 by the
+beginning of September 2015.
+
+A 'classic' style sheet will be provided so reverting to the 1.x
+default values will be a single line of python
+(`mpl.style.use('classic')`).
