MNT: merge v3.1.0-doc branch to v3.1.x

ivanov · ivanov · commit c40fe59f4923 · 2019-06-30T22:36:06.000-07:00
diff --git a/doc/_templates/donate_sidebar.html b/doc/_templates/donate_sidebar.html
@@ -1,5 +1,6 @@
 
+
+
 <div id="sidebar-donations">
-  <a href="https://www.flipcause.com/secure/cause_pdetails/MjI1OA==" target="_blank"> <div class="donate_button" >Support Matplotlib</div></a>
-  <a href="https://www.flipcause.com/secure/cause_pdetails/MTY3NTU=" target="_blank"> <div class="donate_button" >Support NumFOCUS</div></a>
+  <a href="https://numfocus.salsalabs.org/donate-to-matplotlib/index.html" target="_blank"> <div class="donate_button" >Support Matplotlib</div></a>
 </div>
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -185,7 +185,7 @@ <h3>{{ _('Navigation') }}</h3>
 </div>
 {%- endif %}
 <div id="plotting-contest" style="padding: 6px; background-color: teal; color: white;">
-<p style="margin: 0;">The 2019 SciPy John Hunter Excellence in Plotting Contest is accepting submissions! 
+<p style="margin: 0;">The 2019 SciPy John Hunter Excellence in Plotting Contest is accepting submissions!
   <br />
   <a href="https://docs.google.com/forms/d/e/1FAIpQLSe-_AnKvYSzeQWfNDRoXgW0vl7_8q6jj3QbLIac8eUcb9lSAA/viewform?usp=sf_link" style="font-weight: bold;">Apply by June 8th</a></p>
 </div>
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -27,7 +27,9 @@ pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
 
 DOIs
 ----
-
+v3.1.0
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2893252.svg
+      :target: https://doi.org/10.5281/zenodo.2893252
 v3.0.3
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2577644.svg
       :target: https://doi.org/10.5281/zenodo.2577644
@@ -40,6 +42,12 @@ v3.0.1
 v3.0.0
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1420605.svg
       :target: https://doi.org/10.5281/zenodo.1420605
+v2.2.4
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2669103.svg
+      :target: https://doi.org/10.5281/zenodo.2669103
+v2.2.3
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1343133.svg
+      :target: https://doi.org/10.5281/zenodo.1343133
 v2.2.2
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1202077.svg
       :target: https://doi.org/10.5281/zenodo.1202077
diff --git a/doc/index.rst b/doc/index.rst
@@ -186,7 +186,7 @@ Please consider `donating to the Matplotlib project <donating_>`_ through
 the Numfocus organization or to the `John Hunter Technology Fellowship
 <jdh-fellowship_>`_.
 
-.. _donating: https://www.flipcause.com/secure/cause_pdetails/MjI1OA==
+.. _donating: https://numfocus.salsalabs.org/donate-to-matplotlib/index.html
 .. _jdh-fellowship: https://www.numfocus.org/programs/john-hunter-technology-fellowship/
 
 The :doc:`Matplotlib license <users/license>` is based on the `Python Software
