Merge remote-tracking branch 'matplotlib/v1.5.2-doc' into v2.x

jenshnielsen · jenshnielsen · commit 1ea17e1b6e25 · 2016-08-06T11:09:42.000+01:00
diff --git a/.mailmap b/.mailmap
@@ -1,3 +1,4 @@
+Adrien F. Vincent <vincent.adrien@gmail.com>
 Andrew Dawson <ajdawson@acm.org> Andrew Dawson <dawson@atm.ox.ac.uk>
 anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
 Ben Cohen <bj.cohen19@gmail.com> Ben Cohen <ben@cohen-family.org>
diff --git a/doc/_templates/citing.html b/doc/_templates/citing.html
@@ -21,13 +21,15 @@ <h1>Citing matplotlib</h1>
   publication-quality image generation across user
   interfaces and operating systems.},
   publisher = {IEEE COMPUTER SOC},
+  doi = {10.1109/MCSE.2007.55},
   year      = 2007
 }
 </pre>
 
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v1.5.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.56926"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.56926.svg" alt="10.5281/zenodo.56926"></a></dd>
   <dt>v1.5.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.44579"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.44579.svg" alt="10.5281/zenodo.44579"></a></dd>
   <dt>v1.5.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.32914"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.32914.svg" alt="10.5281/zenodo.32914"></a></dd>
   <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>
diff --git a/doc/faq/virtualenv_faq.rst b/doc/faq/virtualenv_faq.rst
@@ -62,6 +62,19 @@ and the systemwide install use the same python version.
 OSX
 ===
 
+Short version
+-------------
+
+If you are on Python 3, use ``venv`` instead of ``virtualenv``::
+
+    python -m venv my-virtualenv
+    source my-virtualenv/bin/activate
+
+Otherwise you will need one of the workarounds below.
+
+Long version
+------------
+
 On OSX, two different types of Python Builds exist: a regular build and a
 framework build. In order to interact correctly with OSX through some
 GUI frameworks you need a framework build of Python.
@@ -80,7 +93,7 @@ The issue has been reported on the virtualenv bug tracker `here
 Until this is fixed, one of the following workarounds must be used:
 
 ``PYTHONHOME`` Script
----------------------
+^^^^^^^^^^^^^^^^^^^^^
 
 The best known workaround,
 borrowed  from the `WX wiki
@@ -114,7 +127,7 @@ framework build. To run an interactive ``IPython`` session with the framework
 build within the virtual environment you can do ``frameworkpython -m IPython``
 
 ``PYTHONHOME`` Function
------------------------
+^^^^^^^^^^^^^^^^^^^^^^^
 
 Alternatively you can define a function in your ``.bashrc`` using
 
@@ -132,7 +145,7 @@ This function can then be used in all of your virtualenvs without having to
 fix every single one of them.
 
 PythonW Compiler
-----------------
+^^^^^^^^^^^^^^^^
 
 In addition
 `virtualenv-pythonw-osx <https://github.com/gldnspud/virtualenv-pythonw-osx>`_
diff --git a/examples/pylab_examples/tex_unicode_demo.py b/examples/pylab_examples/tex_unicode_demo.py
@@ -19,9 +19,8 @@
 plt.plot(t, s)
 
 plt.xlabel(r'\textbf{time (s)}')
-plt.ylabel(r'\textit{Velocity (\u00B0/sec)}', fontsize=16)
-plt.title(r"\TeX\ is Number \
-          $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!",
-          fontsize=16, color='r')
+plt.ylabel('\\textit{Velocity (\u00B0/sec)}', fontsize=16)
+plt.title(r'\TeX\ is Number $\displaystyle\sum_{n=1}^\infty'
+          r'\frac{-e^{i\pi}}{2^n}$!', fontsize=16, color='r')
 plt.grid(True)
 plt.show()
diff --git a/examples/style_sheets/plot_ggplot.py b/examples/style_sheets/plot_ggplot.py
@@ -6,8 +6,8 @@
 
 .. [1] http://www.huyng.com/posts/sane-color-scheme-for-matplotlib/
 
-.. _ggplot: http://had.co.nz/ggplot/
-.. _R: http://www.r-project.org/
+.. _ggplot: http://ggplot2.org/
+.. _R: https://www.r-project.org/
 
 """
 import numpy as np

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+Adrien F. Vincent <[email protected]>`
`1`	`2`	`Andrew Dawson <[email protected]> Andrew Dawson <[email protected]>`
`2`	`3`	`anykraus <[email protected]> anykraus <[email protected]>`
`3`	`4`	`Ben Cohen <[email protected]> Ben Cohen <[email protected]>`