matplotlib · dstansby · Apr 15, 2019 · Apr 15, 2019
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -3,36 +3,39 @@
 API Changes
 ===========
 
-A log of changes to the most recent version of Matplotlib that affect the
-outward-facing API. If updating Matplotlib breaks your scripts, this list may
-help you figure out what caused the breakage and how to fix it by updating
-your code. For API changes in older versions see :doc:`api_changes_old`.
+If updating Matplotlib breaks your scripts, this list may help you figure out
+what caused the breakage and how to fix it by updating your code.
 
-For new features that were added to Matplotlib, see :ref:`whats-new`.
-
-This pages lists API changes for the most recent version of Matplotlib.
+For API changes in older versions see
 
 .. toctree::
    :maxdepth: 1
 
    api_changes_old
 
+Changes for the latest version are listed below. For new features that were
+added to Matplotlib, see :ref:`whats-new`.
 
-.. note::
+.. ifconfig:: releaselevel == 'dev'
 
-   The list below is a table of contents of individual files from the
-   'next_api_changes' folder.
+   .. note::
 
-   When a release is made
+      The list below is a table of contents of individual files from the
+      'next_api_changes' folder.
 
-    - The full text list below should be moved into its own file in
-      'prev_api_changes'
-    - All the files in 'next_api_changes' should be moved to the bottom of this page
-    - This note, and the toctree below should be commented out
+      When a release is made
 
+       - All the files in 'next_api_changes/' should be moved to a single file in
+         'prev_api_changes/'.
+       - The include directive below should be changed to point to the new file
+         created in the previous step.
+       - This note, and the toctree below should be commented out.
 
-.. toctree::
-   :glob:
-   :maxdepth: 1
 
-   next_api_changes/*
+   .. toctree::
+      :glob:
+      :maxdepth: 1
+
+      next_api_changes/*
+
+.. include:: prev_api_changes/api_changes_3.1.0.rst
diff --git a/doc/api/axis_api.rst b/doc/api/axis_api.rst
@@ -60,7 +60,10 @@ Formatters and Locators
    Axis.set_major_locator
    Axis.set_minor_formatter
    Axis.set_minor_locator
+
    Axis.remove_overlapping_locs
+   Axis.get_remove_overlapping_locs
+   Axis.set_remove_overlapping_locs
 
 Axis Label
 ----------

diff --git a/doc/api/next_api_changes/2017-10-24-DS.rst b/doc/api/next_api_changes/2017-10-24-DS.rst
diff --git a/doc/api/next_api_changes/2018-01-03-AL.rst b/doc/api/next_api_changes/2018-01-03-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-07-AL.rst b/doc/api/next_api_changes/2018-01-07-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-08-AL.rst b/doc/api/next_api_changes/2018-01-08-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-09-AL.rst b/doc/api/next_api_changes/2018-01-09-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-10-AL.rst b/doc/api/next_api_changes/2018-01-10-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-21-AL.rst b/doc/api/next_api_changes/2018-01-21-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-22-AL.rst b/doc/api/next_api_changes/2018-01-22-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-27-AL.rst b/doc/api/next_api_changes/2018-01-27-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-28-AL.rst b/doc/api/next_api_changes/2018-01-28-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-28_tac.rst b/doc/api/next_api_changes/2018-01-28_tac.rst
diff --git a/doc/api/next_api_changes/2018-01-30-AL.rst b/doc/api/next_api_changes/2018-01-30-AL.rst
diff --git a/doc/api/next_api_changes/2018-01-31-AL.rst b/doc/api/next_api_changes/2018-01-31-AL.rst
diff --git a/doc/api/next_api_changes/2018-02-03-AL.rst b/doc/api/next_api_changes/2018-02-03-AL.rst
diff --git a/doc/api/next_api_changes/2018-02-05-AL.rst b/doc/api/next_api_changes/2018-02-05-AL.rst
diff --git a/doc/api/next_api_changes/2018-02-06-AL.rst b/doc/api/next_api_changes/2018-02-06-AL.rst
diff --git a/doc/api/next_api_changes/2018-02-16-AL.rst b/doc/api/next_api_changes/2018-02-16-AL.rst
diff --git a/doc/api/next_api_changes/2018-02-17-AL.rst b/doc/api/next_api_changes/2018-02-17-AL.rst
diff --git a/doc/api/next_api_changes/2018-03-31-AL.rst b/doc/api/next_api_changes/2018-03-31-AL.rst
diff --git a/doc/api/next_api_changes/2018-05-15-AL-removals.rst b/doc/api/next_api_changes/2018-05-15-AL-removals.rst
diff --git a/doc/api/next_api_changes/2018-06-02-TH.rst b/doc/api/next_api_changes/2018-06-02-TH.rst
diff --git a/doc/api/next_api_changes/2018-06-24-JMK.rst b/doc/api/next_api_changes/2018-06-24-JMK.rst
diff --git a/doc/api/next_api_changes/2018-07-16-AL-removals.rst b/doc/api/next_api_changes/2018-07-16-AL-removals.rst
diff --git a/doc/api/next_api_changes/2018-07-17-AL-deprecations.rst b/doc/api/next_api_changes/2018-07-17-AL-deprecations.rst
diff --git a/doc/api/next_api_changes/2018-07-22-AL-deprecations.rst b/doc/api/next_api_changes/2018-07-22-AL-deprecations.rst
diff --git a/doc/api/next_api_changes/2018-07-22-AL.rst b/doc/api/next_api_changes/2018-07-22-AL.rst
diff --git a/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst b/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst
diff --git a/doc/api/next_api_changes/2018-08-19-AL-deprecations.rst b/doc/api/next_api_changes/2018-08-19-AL-deprecations.rst
diff --git a/doc/api/next_api_changes/2018-08-29-AL-sankey.rst b/doc/api/next_api_changes/2018-08-29-AL-sankey.rst
diff --git a/doc/api/next_api_changes/2018-08-31-AL-gs.rst b/doc/api/next_api_changes/2018-08-31-AL-gs.rst
diff --git a/doc/api/next_api_changes/2018-08-31-AL.rst b/doc/api/next_api_changes/2018-08-31-AL.rst