Merge pull request matplotlib#18251 from QuLogic/merge-v3.3.x

Merge v3.3.x into master

Author: dopplershift

doc/_static/zenodo_cache/3898017.svg

@@ -38,4 +38,5 @@ added to Matplotlib, see :ref:`whats-new`
       next_api_changes/development/*
       next_api_changes/removals/*
 
+.. include:: prev_api_changes/api_changes_3.3.1.rst
 .. include:: prev_api_changes/api_changes_3.3.0.rst

doc/_static/zenodo_cache/3948793.svg

@@ -1,5 +1,11 @@
+API Changes for 3.3.1
+=====================
+
+Deprecations
+------------
+
 Reverted deprecation of ``num2epoch`` and ``epoch2num``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 These two functions were deprecated in 3.3.0, and did not return
 an accurate Matplotlib datenum relative to the new Matplotlib epoch

doc/_static/zenodo_cache/3984190.svg

@@ -39,9 +39,15 @@ By version
 .. START OF AUTOGENERATED
 
 
+v3.3.1
+   .. image:: _static/zenodo_cache/3984190.svg
+      :target:  https://doi.org/10.5281/zenodo.3984190
+v3.3.0
+   .. image:: _static/zenodo_cache/3948793.svg
+      :target:  https://doi.org/10.5281/zenodo.3948793
 v3.2.2
-   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3898017.svg
-      :target: https://doi.org/10.5281/zenodo.3898017
+   .. image:: _static/zenodo_cache/3898017.svg
+      :target:  https://doi.org/10.5281/zenodo.3898017
 v3.2.1
    .. image:: _static/zenodo_cache/3714460.svg
       :target:  https://doi.org/10.5281/zenodo.3714460

doc/api/api_changes.rst

@@ -81,7 +81,7 @@ number of other projects:
 .. _pango: https://www.pango.org/
 .. _harfbuzz: https://www.freedesktop.org/wiki/Software/HarfBuzz/
 .. _QtTextLayout: https://doc.qt.io/archives/qt-4.8/qtextlayout.html
-.. _Microsoft DirectWrite: https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554(v=vs.85).aspx
+.. _Microsoft DirectWrite: https://docs.microsoft.com/en-ca/windows/win32/directwrite/introducing-directwrite
 .. _Apple Core Text: https://developer.apple.com/library/content/documentation/StringsTextFonts/Conceptual/CoreText_Programming/Overview/Overview.html
 
 Of the above options, it should be noted that harfbuzz_ is designed

doc/api/next_api_changes/deprecations/17983-JMK.rst renamed to doc/api/prev_api_changes/api_changes_3.3.1.rst

@@ -14,7 +14,7 @@
 .. _github help: https://help.github.com
 .. _msysgit: https://git-scm.com/download/win
 .. _git-osx-installer: https://git-scm.com/download/mac
-.. _subversion: http://subversion.tigris.org/
+.. _subversion: https://subversion.apache.org/
 .. _git cheat sheet: https://help.github.com/git-cheat-sheets/
 .. _pro git book: https://git-scm.com/book/en/v2
 .. _git svn crash course: https://git-scm.com/course/svn.html

doc/citing.rst

@@ -26,7 +26,7 @@
   Applications
 
 * `Ten Simple Rules for Better Figures
-  <http://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1003833>`_
+  <https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1003833>`_
   by Nicolas P. Rougier, Michael Droettboom and Philip E. Bourne
 
 * `Learning Scientific Programming with Python chapter 7

doc/devel/MEP/MEP14.rst

@@ -284,9 +284,9 @@ border, and logo.
 
 figpager
 ========
-`figpager <https://pypi.org/project/figpager/>`_ provides 
-customizable figure elements such as text, lines and images
-and subplot layout control for single or multi page output.
+`figpager <https://pypi.org/project/figpager/>`_ provides customizable figure
+elements such as text, lines and images and subplot layout control for single
+or multi page output.
 
  .. image:: /_static/figpager.png