matplotlib · QuLogic · Aug 14, 2020 · Jul 16, 2020 · Jul 16, 2020 · Jul 17, 2020
diff --git a/.gitignore b/.gitignore
@@ -79,6 +79,7 @@ examples/*/*.svgz
 examples/tests/*
 !examples/tests/backend_driver_sgskip.py
 result_images
+doc/_static/constrained_layout*.png
 
 # Nose/Pytest generated files #
 ###############################

diff --git a/doc/_static/constrained_layout/CL00.png b/doc/_static/constrained_layout/CL00.png
diff --git a/doc/_static/constrained_layout/CL01.png b/doc/_static/constrained_layout/CL01.png
diff --git a/doc/_static/constrained_layout/CL02.png b/doc/_static/constrained_layout/CL02.png
diff --git a/doc/_static/figpager.png b/doc/_static/figpager.png
diff --git a/doc/_static/zenodo_cache/3898017.svg b/doc/_static/zenodo_cache/3898017.svg
diff --git a/doc/_static/zenodo_cache/3948793.svg b/doc/_static/zenodo_cache/3948793.svg
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -35,4 +35,5 @@ added to Matplotlib, see :ref:`whats-new`
 
       api_changes_3.4/*
 
+.. include:: prev_api_changes/api_changes_3.3.1.rst
 .. include:: prev_api_changes/api_changes_3.3.0.rst
diff --git a/doc/api/api_changes_3.4/deprecations.rst b/doc/api/api_changes_3.4/deprecations.rst
@@ -1,19 +1,2 @@
 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
-handling (`~.dates.get_epoch` and :rc:`date.epoch`).  This version
-reverts the deprecation.
-
-Functions ``epoch2num`` and ``dates.julian2num`` use ``date.epoch`` rcParam
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Now `~.dates.epoch2num` and (undocumented) ``julian2num`` return floating point
-days since `~.dates.get_epoch` as set by :rc:`date.epoch`, instead of
-floating point days since the old epoch of "0000-12-31T00:00:00".  If
-needed, you can translate from the new to old values as
-``old = new + mdates.date2num(np.datetime64('0000-12-31'))``
diff --git a/doc/api/prev_api_changes/api_changes_3.1.0.rst b/doc/api/prev_api_changes/api_changes_3.1.0.rst
@@ -531,7 +531,11 @@ The following miscellaneous API elements have been removed
 
     import logging
     logger = logging.getLogger('matplotlib')
-    logger.set_level(logging.INFO)
+    logger.setLevel(logging.INFO)
+    # configure log handling: Either include it into your ``logging`` hierarchy,
+    # e.g. by configuring a root looger using ``logging.basicConfig()``,
+    # or add a standalone handler to the matplotlib logger:
+    logger.addHandler(logging.StreamHandler())
 
 - ``__version__numpy__``
 - ``collections.CIRCLE_AREA_FACTOR``

diff --git a/doc/api/prev_api_changes/api_changes_3.3.1.rst b/doc/api/prev_api_changes/api_changes_3.3.1.rst
@@ -0,0 +1,22 @@
+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
+handling (`~.dates.get_epoch` and :rc:`date.epoch`).  This version
+reverts the deprecation.
+
+Functions ``epoch2num`` and ``dates.julian2num`` use ``date.epoch`` rcParam
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Now `~.dates.epoch2num` and (undocumented) ``julian2num`` return floating point
+days since `~.dates.get_epoch` as set by :rc:`date.epoch`, instead of
+floating point days since the old epoch of "0000-12-31T00:00:00".  If
+needed, you can translate from the new to old values as
+``old = new + mdates.date2num(np.datetime64('0000-12-31'))``
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -39,9 +39,12 @@ By version
 .. START OF AUTOGENERATED
 
 
+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

diff --git a/doc/conf.py b/doc/conf.py
@@ -58,7 +58,12 @@
     'sphinx_copybutton',
 ]
 
-exclude_patterns = ['api/api_changes/*', 'users/whats_new/*']
+exclude_patterns = [
+    'api/prev_api_changes/api_changes_*/*',
+    # Be sure to update users/whats_new.rst:
+    'users/prev_whats_new/whats_new_3.3.0.rst',
+    'users/prev_whats_new/whats_new_3.3.1.rst',
+]
 
 
 def _check_dependencies():

diff --git a/doc/thirdpartypackages/index.rst b/doc/thirdpartypackages/index.rst
@@ -282,6 +282,14 @@ border, and logo.
 .. image:: /_static/mpl_template_example.png
     :height: 330px
 
+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.
+
+ .. image:: /_static/figpager.png
+
 blume
 =====
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,5 @@ added to Matplotlib, see :ref:`whats-new`

		api_changes_3.4/*

		.. include:: prev_api_changes/api_changes_3.3.1.rst
		.. include:: prev_api_changes/api_changes_3.3.0.rst