Merge remote-tracking branch 'upstream/master' into frontdocs

Author: jklymak

doc/_templates/citing.html

@@ -5,8 +5,8 @@
 <h1>Citing Matplotlib</h1>
 <p>
 If Matplotlib contributes to a project that leads to a scientific publication,
-please acknowledge this fact by citing the project. You can use this
-BibTeX entry:
+please acknowledge this fact by citing 
+  <a href ='http://doi.org/10.1109/MCSE.2007.55'>Hunter et al (2007)</a> using this ready-made BibTeX entry:
 </p>
 <pre>
 @Article{Hunter:2007,
@@ -29,6 +29,7 @@ <h1>Citing Matplotlib</h1>
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v2.1.0</dt><dd><a href="https://doi.org/10.5281/zenodo.1004650"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.1004650.svg" alt="DOI"></a></dd>
   <dt>v2.0.2</dt><dd><a href="https://doi.org/10.5281/zenodo.573577"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.573577.svg" alt="10.5281/zenodo.573577.svg"></a></dd>
   <dt>v2.0.1</dt><dd><a href="https://doi.org/10.5281/zenodo.570311"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.570311.svg" alt="10.5281/zenodo.570311.svg"></a></dd>
   <dt>v2.0.0</dt><dd><a href="https://doi.org/10.5281/zenodo.248351"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.248351.svg" alt="10.5281/zenodo.248351.svg"></a></dd>