From a914c209f527836035d60341a20f40758240fb22 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Sun, 13 Jul 2025 19:22:35 +0100
Subject: [PATCH 1/3] Move release related docs to new sub-folder

---
 .github/labeler.yml                            |  4 ++--
 .pre-commit-config.yaml                        |  2 +-
 doc/conf.py                                    |  4 ++--
 doc/devel/api_changes.rst                      |  4 ++--
 doc/devel/release_guide.rst                    | 18 +++++++++---------
 doc/index.rst                                  |  2 +-
 doc/project/credits.rst                        |  2 +-
 doc/{users => release}/generate_credits.py     |  0
 doc/{users => release}/github_stats.rst        |  2 ++
 doc/{users => release}/next_whats_new.rst      |  2 ++
 .../next_whats_new/3d_speedups.rst             |  0
 .../next_whats_new/README.rst                  |  2 +-
 .../next_whats_new/axis_inversion.rst          |  0
 .../bar_label_padding_update.rst               |  0
 .../color_cycle_from_sequence.rst              |  0
 .../next_whats_new/colormap_bad_under_over.rst |  0
 .../next_whats_new/colormap_with_alpha         |  0
 .../depthshading_improvement.rst               |  0
 .../next_whats_new/figsize_unit.rst            |  0
 .../next_whats_new/gif_savefig.rst             |  0
 .../next_whats_new/grouped_bar.rst             |  0
 .../next_whats_new/last_resort_font.rst        |  0
 .../next_whats_new/log_contour_levels.rst      |  0
 .../next_whats_new/logticks.rst                |  0
 .../new_rcparams_grid_options.rst              |  0
 .../next_whats_new/separated_hatchcolor.rst    |  0
 ...ix_and_eight_color_petroff_color_cycles.rst |  0
 .../streamplot_integration_control.rst         |  0
 .../streamplot_multiple_arrows.rst             |  0
 .../next_whats_new/subplots_adjust.rst         |  0
 .../next_whats_new/type1_subset.rst            |  0
 .../next_whats_new/violinplot_colors.rst       |  0
 .../xtick_ytick_rotation_modes.rst             |  0
 .../prev_whats_new/changelog.rst               |  6 ++++--
 .../prev_whats_new/dflt_style_changes.rst      |  1 +
 .../prev_whats_new/github_stats_3.0.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.0.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.0.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.0.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.1.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.1.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.1.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.1.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.10.0.rst     |  2 ++
 .../prev_whats_new/github_stats_3.2.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.2.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.2.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.3.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.3.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.3.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.3.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.3.4.rst      |  2 ++
 .../prev_whats_new/github_stats_3.4.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.4.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.4.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.4.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.5.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.5.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.5.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.5.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.6.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.6.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.6.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.6.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.7.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.7.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.7.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.7.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.8.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.8.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.8.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.8.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.8.4.rst      |  2 ++
 .../prev_whats_new/github_stats_3.9.0.rst      |  2 ++
 .../prev_whats_new/github_stats_3.9.1.rst      |  2 ++
 .../prev_whats_new/github_stats_3.9.2.rst      |  2 ++
 .../prev_whats_new/github_stats_3.9.3.rst      |  2 ++
 .../prev_whats_new/github_stats_3.9.4.rst      |  2 ++
 .../prev_whats_new/whats_new_0.98.4.rst        |  2 ++
 .../prev_whats_new/whats_new_0.99.rst          |  2 ++
 .../prev_whats_new/whats_new_1.0.rst           |  2 ++
 .../prev_whats_new/whats_new_1.1.rst           |  2 ++
 .../prev_whats_new/whats_new_1.2.2.rst         |  2 ++
 .../prev_whats_new/whats_new_1.2.rst           |  2 ++
 .../prev_whats_new/whats_new_1.3.rst           |  2 ++
 .../prev_whats_new/whats_new_1.4.rst           |  2 ++
 .../prev_whats_new/whats_new_1.5.rst           |  2 ++
 .../prev_whats_new/whats_new_2.0.0.rst         |  2 ++
 .../prev_whats_new/whats_new_2.1.0.rst         |  2 ++
 .../prev_whats_new/whats_new_2.2.rst           |  2 ++
 .../prev_whats_new/whats_new_3.0.rst           |  2 ++
 .../prev_whats_new/whats_new_3.1.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.10.0.rst        |  2 ++
 .../prev_whats_new/whats_new_3.2.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.3.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.4.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.5.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.5.2.rst         |  2 ++
 .../prev_whats_new/whats_new_3.6.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.7.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.8.0.rst         |  2 ++
 .../prev_whats_new/whats_new_3.9.0.rst         |  2 ++
 doc/{users => release}/release_notes.rst       |  1 +
 doc/{users => release}/release_notes_next.rst  |  2 ++
 104 files changed, 165 insertions(+), 21 deletions(-)
 rename doc/{users => release}/generate_credits.py (100%)
 rename doc/{users => release}/github_stats.rst (99%)
 rename doc/{users => release}/next_whats_new.rst (80%)
 rename doc/{users => release}/next_whats_new/3d_speedups.rst (100%)
 rename doc/{users => release}/next_whats_new/README.rst (95%)
 rename doc/{users => release}/next_whats_new/axis_inversion.rst (100%)
 rename doc/{users => release}/next_whats_new/bar_label_padding_update.rst (100%)
 rename doc/{users => release}/next_whats_new/color_cycle_from_sequence.rst (100%)
 rename doc/{users => release}/next_whats_new/colormap_bad_under_over.rst (100%)
 rename doc/{users => release}/next_whats_new/colormap_with_alpha (100%)
 rename doc/{users => release}/next_whats_new/depthshading_improvement.rst (100%)
 rename doc/{users => release}/next_whats_new/figsize_unit.rst (100%)
 rename doc/{users => release}/next_whats_new/gif_savefig.rst (100%)
 rename doc/{users => release}/next_whats_new/grouped_bar.rst (100%)
 rename doc/{users => release}/next_whats_new/last_resort_font.rst (100%)
 rename doc/{users => release}/next_whats_new/log_contour_levels.rst (100%)
 rename doc/{users => release}/next_whats_new/logticks.rst (100%)
 rename doc/{users => release}/next_whats_new/new_rcparams_grid_options.rst (100%)
 rename doc/{users => release}/next_whats_new/separated_hatchcolor.rst (100%)
 rename doc/{users => release}/next_whats_new/six_and_eight_color_petroff_color_cycles.rst (100%)
 rename doc/{users => release}/next_whats_new/streamplot_integration_control.rst (100%)
 rename doc/{users => release}/next_whats_new/streamplot_multiple_arrows.rst (100%)
 rename doc/{users => release}/next_whats_new/subplots_adjust.rst (100%)
 rename doc/{users => release}/next_whats_new/type1_subset.rst (100%)
 rename doc/{users => release}/next_whats_new/violinplot_colors.rst (100%)
 rename doc/{users => release}/next_whats_new/xtick_ytick_rotation_modes.rst (100%)
 rename doc/{users => release}/prev_whats_new/changelog.rst (99%)
 rename doc/{users => release}/prev_whats_new/dflt_style_changes.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.0.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.0.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.0.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.0.3.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.1.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.1.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.1.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.1.3.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.10.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.2.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.2.1.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.2.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.3.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.3.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.3.2.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.3.3.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.3.4.rst (97%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.4.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.4.1.rst (97%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.4.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.4.3.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.5.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.5.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.5.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.5.3.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.6.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.6.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.6.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.6.3.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.7.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.7.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.7.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.7.3.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.8.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.8.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.8.2.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.8.3.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.8.4.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.9.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.9.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.9.2.rst (98%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.9.3.rst (99%)
 rename doc/{users => release}/prev_whats_new/github_stats_3.9.4.rst (94%)
 rename doc/{users => release}/prev_whats_new/whats_new_0.98.4.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_0.99.rst (98%)
 rename doc/{users => release}/prev_whats_new/whats_new_1.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_1.1.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_1.2.2.rst (90%)
 rename doc/{users => release}/prev_whats_new/whats_new_1.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_1.3.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_1.4.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_1.5.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_2.0.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_2.1.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_2.2.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.1.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.10.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.2.0.rst (98%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.3.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.4.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.5.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.5.2.rst (90%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.6.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.7.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.8.0.rst (99%)
 rename doc/{users => release}/prev_whats_new/whats_new_3.9.0.rst (99%)
 rename doc/{users => release}/release_notes.rst (99%)
 rename doc/{users => release}/release_notes_next.rst (73%)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 75adfed57f43..bf147be952f8 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -110,10 +110,10 @@
   - all:
       - changed-files:
           - any-glob-to-any-file:
-              - 'doc/users/**'
+              - 'doc/release/**'
               - 'galleries/users_explain/**'
           - all-globs-to-all-files:
-              - '!doc/users/next_whats_new/**'
+              - '!doc/release/next_whats_new/**'
 
 "topic: animation":
   - changed-files:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 86a9a0f45440..11499188509e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ exclude: |
     LICENSE|
     lib/matplotlib/mpl-data|
     doc/devel/gitwash|
-    doc/users/prev|
+    doc/release/prev|
     doc/api/prev|
     lib/matplotlib/tests/data/tinypages
     )
diff --git a/doc/conf.py b/doc/conf.py
index 199249fdd437..4d922a5636e1 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -57,7 +57,7 @@ def _parse_skip_subdirs_file():
     can make partial builds very fast.
     """
     default_skip_subdirs = [
-        'users/prev_whats_new/*', 'users/explain/*', 'api/*', 'gallery/*',
+        'release/prev_whats_new/*', 'users/explain/*', 'api/*', 'gallery/*',
         'tutorials/*', 'plot_types/*', 'devel/*']
     try:
         with open(".mpl_skip_subdirs.yaml", 'r') as fin:
@@ -595,7 +595,7 @@ def js_tag_with_cache_busting(js):
     # no sidebar for release notes, because that page is only a collection of links
     # to sub-pages. The sidebar would repeat all the titles of the sub-pages and
     # thus basically repeat all the content of the page.
-    "users/release_notes": ["empty_sidebar.html"],
+    "release/release_notes": ["empty_sidebar.html"],
     # '**': ['localtoc.html', 'pagesource.html']
 }
 
diff --git a/doc/devel/api_changes.rst b/doc/devel/api_changes.rst
index 19bc530abf6b..5fed9f683a48 100644
--- a/doc/devel/api_changes.rst
+++ b/doc/devel/api_changes.rst
@@ -220,7 +220,7 @@ folder:
 +-------------------+-----------------------------+----------------------------------------------+
 |                   |   versioning directive      |  announcement folder                         |
 +===================+=============================+==============================================+
-| new feature       | ``.. versionadded:: 3.N``   | :file:`doc/users/next_whats_new/`            |
+| new feature       | ``.. versionadded:: 3.N``   | :file:`doc/release/next_whats_new/`          |
 +-------------------+-----------------------------+----------------------------------------------+
 | API change        | ``.. versionchanged:: 3.N`` | :file:`doc/api/next_api_changes/[kind]`      |
 +-------------------+-----------------------------+----------------------------------------------+
@@ -306,7 +306,7 @@ API change notes
 What's new notes
 """"""""""""""""
 
-.. include:: ../users/next_whats_new/README.rst
+.. include:: ../release/next_whats_new/README.rst
    :start-after: whats-new-guide-start
    :end-before: whats-new-guide-end
 
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
index 6c45bfa56c64..20111e3501b3 100644
--- a/doc/devel/release_guide.rst
+++ b/doc/devel/release_guide.rst
@@ -125,22 +125,22 @@ prepare this list:
 
 1. Archive the existing GitHub statistics page.
 
-   a. Copy the current :file:`doc/users/github_stats.rst` to
-      :file:`doc/users/prev_whats_new/github_stats_{X}.{Y}.{Z}.rst`.
+   a. Copy the current :file:`doc/release/github_stats.rst` to
+      :file:`doc/release/prev_whats_new/github_stats_{X}.{Y}.{Z}.rst`.
    b. Change the link target at the top of the file.
    c. Remove the "Previous GitHub Stats" section at the end.
 
    For example, when updating from v3.7.0 to v3.7.1::
 
-      cp doc/users/github_stats.rst doc/users/prev_whats_new/github_stats_3.7.0.rst
-      $EDITOR doc/users/prev_whats_new/github_stats_3.7.0.rst
+      cp doc/release/github_stats.rst doc/release/prev_whats_new/github_stats_3.7.0.rst
+      $EDITOR doc/release/prev_whats_new/github_stats_3.7.0.rst
       # Change contents as noted above.
-      git add doc/users/prev_whats_new/github_stats_3.7.0.rst
+      git add doc/release/prev_whats_new/github_stats_3.7.0.rst
 
 2. Re-generate the updated stats::
 
        python tools/github_stats.py --since-tag v3.7.0 --milestone=v3.7.1 \
-           --project 'matplotlib/matplotlib' --links > doc/users/github_stats.rst
+           --project 'matplotlib/matplotlib' --links > doc/release/github_stats.rst
 
 3. Review and commit changes. Some issue/PR titles may not be valid reST (the most
    common issue is ``*`` which is interpreted as unclosed markup). Also confirm that
@@ -194,8 +194,8 @@ What's new
 *Only needed for macro and meso releases. Bugfix releases should not have new
 features.*
 
-Merge the contents of all the files in :file:`doc/users/next_whats_new/` into a single
-file :file:`doc/users/prev_whats_new/whats_new_{X}.{Y}.0.rst` and delete the individual
+Merge the contents of all the files in :file:`doc/release/next_whats_new/` into a single
+file :file:`doc/release/prev_whats_new/whats_new_{X}.{Y}.0.rst` and delete the individual
 files.
 
 API changes
@@ -211,7 +211,7 @@ individual files.
 Release notes TOC
 ^^^^^^^^^^^^^^^^^
 
-Update :file:`doc/users/release_notes.rst`:
+Update :file:`doc/release/release_notes.rst`:
 
 - For macro and meso releases add a new section
 
diff --git a/doc/index.rst b/doc/index.rst
index 74a183d6cd7b..e3cd7b120cd3 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -163,7 +163,7 @@ What's new
         .. toctree::
             :maxdepth: 1
 
-            users/release_notes.rst
+            release/release_notes.rst
 
 
 Contribute
diff --git a/doc/project/credits.rst b/doc/project/credits.rst
index a57c35e8127d..62f5ab34a493 100644
--- a/doc/project/credits.rst
+++ b/doc/project/credits.rst
@@ -1,4 +1,4 @@
-.. Note: This file is auto-generated using generate_credits.py
+.. Note: This file is auto-generated using doc/release/generate_credits.py
 
 .. redirect-from:: /users/credits
 .. redirect-from:: /users/project/credits
diff --git a/doc/users/generate_credits.py b/doc/release/generate_credits.py
similarity index 100%
rename from doc/users/generate_credits.py
rename to doc/release/generate_credits.py
diff --git a/doc/users/github_stats.rst b/doc/release/github_stats.rst
similarity index 99%
rename from doc/users/github_stats.rst
rename to doc/release/github_stats.rst
index de1f85004f09..234b5235f629 100644
--- a/doc/users/github_stats.rst
+++ b/doc/release/github_stats.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/github_stats
+
 .. _github-stats:
 
 GitHub statistics for 3.10.1 (Feb 27, 2025)
diff --git a/doc/users/next_whats_new.rst b/doc/release/next_whats_new.rst
similarity index 80%
rename from doc/users/next_whats_new.rst
rename to doc/release/next_whats_new.rst
index ddd82faf6731..7923dde4722a 100644
--- a/doc/users/next_whats_new.rst
+++ b/doc/release/next_whats_new.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/next_whats_new
+
 .. _whats-new:
 
 ================
diff --git a/doc/users/next_whats_new/3d_speedups.rst b/doc/release/next_whats_new/3d_speedups.rst
similarity index 100%
rename from doc/users/next_whats_new/3d_speedups.rst
rename to doc/release/next_whats_new/3d_speedups.rst
diff --git a/doc/users/next_whats_new/README.rst b/doc/release/next_whats_new/README.rst
similarity index 95%
rename from doc/users/next_whats_new/README.rst
rename to doc/release/next_whats_new/README.rst
index 23efd0208edb..a680f5120f52 100644
--- a/doc/users/next_whats_new/README.rst
+++ b/doc/release/next_whats_new/README.rst
@@ -15,7 +15,7 @@ Each new feature (e.g. function, parameter, config value, behavior, ...) must
 be described through a "What's new" entry.
 
 Each entry is written into a separate file in the
-:file:`doc/users/next_whats_new/` directory. They are sorted and merged into
+:file:`doc/release/next_whats_new/` directory. They are sorted and merged into
 :file:`whats_new.rst` during the release process.
 
 When adding an entry please look at the currently existing files to
diff --git a/doc/users/next_whats_new/axis_inversion.rst b/doc/release/next_whats_new/axis_inversion.rst
similarity index 100%
rename from doc/users/next_whats_new/axis_inversion.rst
rename to doc/release/next_whats_new/axis_inversion.rst
diff --git a/doc/users/next_whats_new/bar_label_padding_update.rst b/doc/release/next_whats_new/bar_label_padding_update.rst
similarity index 100%
rename from doc/users/next_whats_new/bar_label_padding_update.rst
rename to doc/release/next_whats_new/bar_label_padding_update.rst
diff --git a/doc/users/next_whats_new/color_cycle_from_sequence.rst b/doc/release/next_whats_new/color_cycle_from_sequence.rst
similarity index 100%
rename from doc/users/next_whats_new/color_cycle_from_sequence.rst
rename to doc/release/next_whats_new/color_cycle_from_sequence.rst
diff --git a/doc/users/next_whats_new/colormap_bad_under_over.rst b/doc/release/next_whats_new/colormap_bad_under_over.rst
similarity index 100%
rename from doc/users/next_whats_new/colormap_bad_under_over.rst
rename to doc/release/next_whats_new/colormap_bad_under_over.rst
diff --git a/doc/users/next_whats_new/colormap_with_alpha b/doc/release/next_whats_new/colormap_with_alpha
similarity index 100%
rename from doc/users/next_whats_new/colormap_with_alpha
rename to doc/release/next_whats_new/colormap_with_alpha
diff --git a/doc/users/next_whats_new/depthshading_improvement.rst b/doc/release/next_whats_new/depthshading_improvement.rst
similarity index 100%
rename from doc/users/next_whats_new/depthshading_improvement.rst
rename to doc/release/next_whats_new/depthshading_improvement.rst
diff --git a/doc/users/next_whats_new/figsize_unit.rst b/doc/release/next_whats_new/figsize_unit.rst
similarity index 100%
rename from doc/users/next_whats_new/figsize_unit.rst
rename to doc/release/next_whats_new/figsize_unit.rst
diff --git a/doc/users/next_whats_new/gif_savefig.rst b/doc/release/next_whats_new/gif_savefig.rst
similarity index 100%
rename from doc/users/next_whats_new/gif_savefig.rst
rename to doc/release/next_whats_new/gif_savefig.rst
diff --git a/doc/users/next_whats_new/grouped_bar.rst b/doc/release/next_whats_new/grouped_bar.rst
similarity index 100%
rename from doc/users/next_whats_new/grouped_bar.rst
rename to doc/release/next_whats_new/grouped_bar.rst
diff --git a/doc/users/next_whats_new/last_resort_font.rst b/doc/release/next_whats_new/last_resort_font.rst
similarity index 100%
rename from doc/users/next_whats_new/last_resort_font.rst
rename to doc/release/next_whats_new/last_resort_font.rst
diff --git a/doc/users/next_whats_new/log_contour_levels.rst b/doc/release/next_whats_new/log_contour_levels.rst
similarity index 100%
rename from doc/users/next_whats_new/log_contour_levels.rst
rename to doc/release/next_whats_new/log_contour_levels.rst
diff --git a/doc/users/next_whats_new/logticks.rst b/doc/release/next_whats_new/logticks.rst
similarity index 100%
rename from doc/users/next_whats_new/logticks.rst
rename to doc/release/next_whats_new/logticks.rst
diff --git a/doc/users/next_whats_new/new_rcparams_grid_options.rst b/doc/release/next_whats_new/new_rcparams_grid_options.rst
similarity index 100%
rename from doc/users/next_whats_new/new_rcparams_grid_options.rst
rename to doc/release/next_whats_new/new_rcparams_grid_options.rst
diff --git a/doc/users/next_whats_new/separated_hatchcolor.rst b/doc/release/next_whats_new/separated_hatchcolor.rst
similarity index 100%
rename from doc/users/next_whats_new/separated_hatchcolor.rst
rename to doc/release/next_whats_new/separated_hatchcolor.rst
diff --git a/doc/users/next_whats_new/six_and_eight_color_petroff_color_cycles.rst b/doc/release/next_whats_new/six_and_eight_color_petroff_color_cycles.rst
similarity index 100%
rename from doc/users/next_whats_new/six_and_eight_color_petroff_color_cycles.rst
rename to doc/release/next_whats_new/six_and_eight_color_petroff_color_cycles.rst
diff --git a/doc/users/next_whats_new/streamplot_integration_control.rst b/doc/release/next_whats_new/streamplot_integration_control.rst
similarity index 100%
rename from doc/users/next_whats_new/streamplot_integration_control.rst
rename to doc/release/next_whats_new/streamplot_integration_control.rst
diff --git a/doc/users/next_whats_new/streamplot_multiple_arrows.rst b/doc/release/next_whats_new/streamplot_multiple_arrows.rst
similarity index 100%
rename from doc/users/next_whats_new/streamplot_multiple_arrows.rst
rename to doc/release/next_whats_new/streamplot_multiple_arrows.rst
diff --git a/doc/users/next_whats_new/subplots_adjust.rst b/doc/release/next_whats_new/subplots_adjust.rst
similarity index 100%
rename from doc/users/next_whats_new/subplots_adjust.rst
rename to doc/release/next_whats_new/subplots_adjust.rst
diff --git a/doc/users/next_whats_new/type1_subset.rst b/doc/release/next_whats_new/type1_subset.rst
similarity index 100%
rename from doc/users/next_whats_new/type1_subset.rst
rename to doc/release/next_whats_new/type1_subset.rst
diff --git a/doc/users/next_whats_new/violinplot_colors.rst b/doc/release/next_whats_new/violinplot_colors.rst
similarity index 100%
rename from doc/users/next_whats_new/violinplot_colors.rst
rename to doc/release/next_whats_new/violinplot_colors.rst
diff --git a/doc/users/next_whats_new/xtick_ytick_rotation_modes.rst b/doc/release/next_whats_new/xtick_ytick_rotation_modes.rst
similarity index 100%
rename from doc/users/next_whats_new/xtick_ytick_rotation_modes.rst
rename to doc/release/next_whats_new/xtick_ytick_rotation_modes.rst
diff --git a/doc/users/prev_whats_new/changelog.rst b/doc/release/prev_whats_new/changelog.rst
similarity index 99%
rename from doc/users/prev_whats_new/changelog.rst
rename to doc/release/prev_whats_new/changelog.rst
index 93fd4df2200a..47b1fb68b09a 100644
--- a/doc/users/prev_whats_new/changelog.rst
+++ b/doc/release/prev_whats_new/changelog.rst
@@ -1,10 +1,12 @@
+.. redirect-from:: /users/prev_whats_new/changelog
+
 .. _old_changelog:
 
 List of changes to Matplotlib prior to 2015
 ===========================================
 
 This is a list of the changes made to Matplotlib from 2003 to 2015. For more
-recent changes, please refer to the :doc:`/users/release_notes`.
+recent changes, please refer to the :doc:`/release/release_notes`.
 
 2015-11-16
     Levels passed to contour(f) and tricontour(f) must be in increasing order.
@@ -4272,7 +4274,7 @@ recent changes, please refer to the :doc:`/users/release_notes`.
 2006-01-11
     Released 0.86.1
 
-2006-01-11 
+2006-01-11
     Fixed setup.py for win32 build and added rc template to the MANIFEST.in
 
 2006-01-10
diff --git a/doc/users/prev_whats_new/dflt_style_changes.rst b/doc/release/prev_whats_new/dflt_style_changes.rst
similarity index 99%
rename from doc/users/prev_whats_new/dflt_style_changes.rst
rename to doc/release/prev_whats_new/dflt_style_changes.rst
index 808204383fb8..e4697cf2c451 100644
--- a/doc/users/prev_whats_new/dflt_style_changes.rst
+++ b/doc/release/prev_whats_new/dflt_style_changes.rst
@@ -1,3 +1,4 @@
+.. redirect-from:: /users/prev_whats_new/dflt_style_changes
 .. redirect-from:: /users/dflt_style_changes
 
 ==============================
diff --git a/doc/users/prev_whats_new/github_stats_3.0.0.rst b/doc/release/prev_whats_new/github_stats_3.0.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.0.0.rst
rename to doc/release/prev_whats_new/github_stats_3.0.0.rst
index cae3ee9b570d..dd17bc0fece7 100644
--- a/doc/users/prev_whats_new/github_stats_3.0.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.0.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.0.0
+
 .. _github-stats-3-0-0:
 
 GitHub statistics for 3.0.0 (Sep 18, 2018)
diff --git a/doc/users/prev_whats_new/github_stats_3.0.1.rst b/doc/release/prev_whats_new/github_stats_3.0.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.0.1.rst
rename to doc/release/prev_whats_new/github_stats_3.0.1.rst
index 8ebc7f5f11c1..eaa0f88ba22a 100644
--- a/doc/users/prev_whats_new/github_stats_3.0.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.0.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.0.1
+
 .. _github-stats-3-0-1:
 
 GitHub statistics for 3.0.1 (Oct 25, 2018)
diff --git a/doc/users/prev_whats_new/github_stats_3.0.2.rst b/doc/release/prev_whats_new/github_stats_3.0.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.0.2.rst
rename to doc/release/prev_whats_new/github_stats_3.0.2.rst
index 6b4ef3071f1c..45c99e990147 100644
--- a/doc/users/prev_whats_new/github_stats_3.0.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.0.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.0.2
+
 .. _github-stats-3-0-2:
 
 GitHub statistics for 3.0.2 (Nov 10, 2018)
diff --git a/doc/users/prev_whats_new/github_stats_3.0.3.rst b/doc/release/prev_whats_new/github_stats_3.0.3.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.0.3.rst
rename to doc/release/prev_whats_new/github_stats_3.0.3.rst
index 5c1271e52e4f..a70c83ecfec8 100644
--- a/doc/users/prev_whats_new/github_stats_3.0.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.0.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.0.3
+
 .. _github-stats-3-0-3:
 
 GitHub statistics for 3.0.3 (Feb 28, 2019)
diff --git a/doc/users/prev_whats_new/github_stats_3.1.0.rst b/doc/release/prev_whats_new/github_stats_3.1.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.1.0.rst
rename to doc/release/prev_whats_new/github_stats_3.1.0.rst
index a0fb2692fdbb..fe553a4af8f3 100644
--- a/doc/users/prev_whats_new/github_stats_3.1.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.1.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.1.0
+
 .. _github-stats-3-1-0:
 
 GitHub statistics for 3.1.0 (May 18, 2019)
diff --git a/doc/users/prev_whats_new/github_stats_3.1.1.rst b/doc/release/prev_whats_new/github_stats_3.1.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.1.1.rst
rename to doc/release/prev_whats_new/github_stats_3.1.1.rst
index 3e552c371c55..a84fe93d6808 100644
--- a/doc/users/prev_whats_new/github_stats_3.1.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.1.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.1.1
+
 .. _github-stats-3-1-1:
 
 GitHub statistics for 3.1.1 (Jul 02, 2019)
diff --git a/doc/users/prev_whats_new/github_stats_3.1.2.rst b/doc/release/prev_whats_new/github_stats_3.1.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.1.2.rst
rename to doc/release/prev_whats_new/github_stats_3.1.2.rst
index d8476cb5c3a8..c966c2fbcaf0 100644
--- a/doc/users/prev_whats_new/github_stats_3.1.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.1.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.1.2
+
 .. _github-stats-3-1-2:
 
 GitHub statistics for 3.1.2 (Nov 21, 2019)
diff --git a/doc/users/prev_whats_new/github_stats_3.1.3.rst b/doc/release/prev_whats_new/github_stats_3.1.3.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.1.3.rst
rename to doc/release/prev_whats_new/github_stats_3.1.3.rst
index f8c1afb0e177..604606e98a42 100644
--- a/doc/users/prev_whats_new/github_stats_3.1.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.1.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.1.3
+
 .. _github-stats-3-1-3:
 
 GitHub statistics for 3.1.3 (Feb 03, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.10.0.rst b/doc/release/prev_whats_new/github_stats_3.10.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.10.0.rst
rename to doc/release/prev_whats_new/github_stats_3.10.0.rst
index 01b54708b7ec..d61150e6bd6a 100644
--- a/doc/users/prev_whats_new/github_stats_3.10.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.10.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.10.0
+
 .. _github-stats-3_10_0:
 
 GitHub statistics for 3.10.0 (Dec 13, 2024)
diff --git a/doc/users/prev_whats_new/github_stats_3.2.0.rst b/doc/release/prev_whats_new/github_stats_3.2.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.2.0.rst
rename to doc/release/prev_whats_new/github_stats_3.2.0.rst
index 4efdb191494d..32151f0898a8 100644
--- a/doc/users/prev_whats_new/github_stats_3.2.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.2.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.2.0
+
 .. _github-stats-3-2-0:
 
 GitHub statistics for 3.2.0 (Mar 04, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.2.1.rst b/doc/release/prev_whats_new/github_stats_3.2.1.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.2.1.rst
rename to doc/release/prev_whats_new/github_stats_3.2.1.rst
index 4f865dbb5429..a6b2eb1bfe55 100644
--- a/doc/users/prev_whats_new/github_stats_3.2.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.2.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.2.1
+
 .. _github-stats-3-2-1:
 
 GitHub statistics for 3.2.1 (Mar 18, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.2.2.rst b/doc/release/prev_whats_new/github_stats_3.2.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.2.2.rst
rename to doc/release/prev_whats_new/github_stats_3.2.2.rst
index 9026d518ce4d..d6aae86d9b43 100644
--- a/doc/users/prev_whats_new/github_stats_3.2.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.2.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.2.2
+
 .. _github-stats-3-2-2:
 
 GitHub statistics for 3.2.2 (Jun 17, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.3.0.rst b/doc/release/prev_whats_new/github_stats_3.3.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.3.0.rst
rename to doc/release/prev_whats_new/github_stats_3.3.0.rst
index 45813659b890..47be96d0a2cb 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.3.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.3.0
+
 .. _github-stats-3-3-0:
 
 GitHub statistics for 3.3.0 (Jul 16, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.3.1.rst b/doc/release/prev_whats_new/github_stats_3.3.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.3.1.rst
rename to doc/release/prev_whats_new/github_stats_3.3.1.rst
index dc8e9996313f..24df6db38776 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.3.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.3.1
+
 .. _github-stats-3-3-1:
 
 GitHub statistics for 3.3.1 (Aug 13, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.3.2.rst b/doc/release/prev_whats_new/github_stats_3.3.2.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.3.2.rst
rename to doc/release/prev_whats_new/github_stats_3.3.2.rst
index 0bc03cbc83ee..8875a51c830f 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.3.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.3.2
+
 .. _github-stats-3-3-2:
 
 GitHub statistics for 3.3.2 (Sep 15, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.3.3.rst b/doc/release/prev_whats_new/github_stats_3.3.3.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.3.3.rst
rename to doc/release/prev_whats_new/github_stats_3.3.3.rst
index 5475a5209eed..dc8f9964c30f 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.3.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.3.3
+
 .. _github-stats-3-3-3:
 
 GitHub statistics for 3.3.3 (Nov 11, 2020)
diff --git a/doc/users/prev_whats_new/github_stats_3.3.4.rst b/doc/release/prev_whats_new/github_stats_3.3.4.rst
similarity index 97%
rename from doc/users/prev_whats_new/github_stats_3.3.4.rst
rename to doc/release/prev_whats_new/github_stats_3.3.4.rst
index afff8b384b8e..23fcf6fe0da3 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.4.rst
+++ b/doc/release/prev_whats_new/github_stats_3.3.4.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.3.4
+
 .. _github-stats-3-3-4:
 
 GitHub statistics for 3.3.4 (Jan 28, 2021)
diff --git a/doc/users/prev_whats_new/github_stats_3.4.0.rst b/doc/release/prev_whats_new/github_stats_3.4.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.4.0.rst
rename to doc/release/prev_whats_new/github_stats_3.4.0.rst
index fb6f0044d139..c6cc8f7091d6 100644
--- a/doc/users/prev_whats_new/github_stats_3.4.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.4.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.4.0
+
 .. _github-stats-3-4-0:
 
 GitHub statistics for 3.4.0 (Mar 26, 2021)
diff --git a/doc/users/prev_whats_new/github_stats_3.4.1.rst b/doc/release/prev_whats_new/github_stats_3.4.1.rst
similarity index 97%
rename from doc/users/prev_whats_new/github_stats_3.4.1.rst
rename to doc/release/prev_whats_new/github_stats_3.4.1.rst
index 0819a6850a3e..5452bfd15349 100644
--- a/doc/users/prev_whats_new/github_stats_3.4.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.4.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.4.1
+
 .. _github-stats-3-4-1:
 
 GitHub statistics for 3.4.1 (Mar 31, 2021)
diff --git a/doc/users/prev_whats_new/github_stats_3.4.2.rst b/doc/release/prev_whats_new/github_stats_3.4.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.4.2.rst
rename to doc/release/prev_whats_new/github_stats_3.4.2.rst
index d16a69b43151..4d5e13e9a587 100644
--- a/doc/users/prev_whats_new/github_stats_3.4.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.4.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.4.2
+
 .. _github-stats-3-4-2:
 
 GitHub statistics for 3.4.2 (May 08, 2021)
diff --git a/doc/users/prev_whats_new/github_stats_3.4.3.rst b/doc/release/prev_whats_new/github_stats_3.4.3.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.4.3.rst
rename to doc/release/prev_whats_new/github_stats_3.4.3.rst
index ff98041e2d72..9256b20b1e16 100644
--- a/doc/users/prev_whats_new/github_stats_3.4.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.4.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.4.3
+
 .. _github-stats-3-4-3:
 
 GitHub statistics for 3.4.3 (August 21, 2021)
diff --git a/doc/users/prev_whats_new/github_stats_3.5.0.rst b/doc/release/prev_whats_new/github_stats_3.5.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.5.0.rst
rename to doc/release/prev_whats_new/github_stats_3.5.0.rst
index c39b614e7bad..89a58de096a1 100644
--- a/doc/users/prev_whats_new/github_stats_3.5.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.5.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.5.0
+
 .. _github-stats-3-5-0:
 
 GitHub statistics for 3.5.0 (Nov 15, 2021)
diff --git a/doc/users/prev_whats_new/github_stats_3.5.1.rst b/doc/release/prev_whats_new/github_stats_3.5.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.5.1.rst
rename to doc/release/prev_whats_new/github_stats_3.5.1.rst
index 626cf319c23c..dba71812c76c 100644
--- a/doc/users/prev_whats_new/github_stats_3.5.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.5.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.5.1
+
 .. _github-stats-3-5-1:
 
 GitHub statistics for 3.5.1 (Dec 11, 2021)
diff --git a/doc/users/prev_whats_new/github_stats_3.5.2.rst b/doc/release/prev_whats_new/github_stats_3.5.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.5.2.rst
rename to doc/release/prev_whats_new/github_stats_3.5.2.rst
index 66f53d8e3672..15e5067de7a6 100644
--- a/doc/users/prev_whats_new/github_stats_3.5.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.5.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.5.2
+
 .. _github-stats-3-5-2:
 
 GitHub statistics for 3.5.2 (May 02, 2022)
diff --git a/doc/users/prev_whats_new/github_stats_3.5.3.rst b/doc/release/prev_whats_new/github_stats_3.5.3.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.5.3.rst
rename to doc/release/prev_whats_new/github_stats_3.5.3.rst
index bafd6d5c27eb..e8c22ccc63a2 100644
--- a/doc/users/prev_whats_new/github_stats_3.5.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.5.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.5.3
+
 .. _github-stats-3-5-3:
 
 GitHub statistics for 3.5.3 (Aug 10, 2022)
diff --git a/doc/users/prev_whats_new/github_stats_3.6.0.rst b/doc/release/prev_whats_new/github_stats_3.6.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.6.0.rst
rename to doc/release/prev_whats_new/github_stats_3.6.0.rst
index 6764c7817741..32f373c13c78 100644
--- a/doc/users/prev_whats_new/github_stats_3.6.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.6.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.6.0
+
 .. _github-stats-3-6-0:
 
 GitHub statistics for 3.6.0 (Sep 15, 2022)
diff --git a/doc/users/prev_whats_new/github_stats_3.6.1.rst b/doc/release/prev_whats_new/github_stats_3.6.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.6.1.rst
rename to doc/release/prev_whats_new/github_stats_3.6.1.rst
index d47dc28fa076..94167402172f 100644
--- a/doc/users/prev_whats_new/github_stats_3.6.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.6.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.6.1
+
 .. _github-stats-3-6-1:
 
 GitHub statistics for 3.6.1 (Oct 08, 2022)
diff --git a/doc/users/prev_whats_new/github_stats_3.6.2.rst b/doc/release/prev_whats_new/github_stats_3.6.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.6.2.rst
rename to doc/release/prev_whats_new/github_stats_3.6.2.rst
index f633448aeaf1..e3b75268c528 100644
--- a/doc/users/prev_whats_new/github_stats_3.6.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.6.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.6.2
+
 .. _github-stats-3-6-2:
 
 GitHub statistics for 3.6.2 (Nov 02, 2022)
diff --git a/doc/users/prev_whats_new/github_stats_3.6.3.rst b/doc/release/prev_whats_new/github_stats_3.6.3.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.6.3.rst
rename to doc/release/prev_whats_new/github_stats_3.6.3.rst
index b1d17a791c87..edd3f63c38c5 100644
--- a/doc/users/prev_whats_new/github_stats_3.6.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.6.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.6.3
+
 .. _github-stats-3-6-3:
 
 GitHub statistics for 3.6.3 (Jan 11, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.7.0.rst b/doc/release/prev_whats_new/github_stats_3.7.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.7.0.rst
rename to doc/release/prev_whats_new/github_stats_3.7.0.rst
index 754c4c1fc059..88140a2bc021 100644
--- a/doc/users/prev_whats_new/github_stats_3.7.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.7.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.7.0
+
 .. _github-stats-3-7-0:
 
 GitHub statistics for 3.7.0 (Feb 13, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.7.1.rst b/doc/release/prev_whats_new/github_stats_3.7.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.7.1.rst
rename to doc/release/prev_whats_new/github_stats_3.7.1.rst
index b187122cb779..9147ff4e6ac1 100644
--- a/doc/users/prev_whats_new/github_stats_3.7.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.7.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.7.1
+
 .. _github-stats-3-7-1:
 
 GitHub statistics for 3.7.1 (Mar 03, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.7.2.rst b/doc/release/prev_whats_new/github_stats_3.7.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.7.2.rst
rename to doc/release/prev_whats_new/github_stats_3.7.2.rst
index 9bc8ab85fdfd..500ce807f524 100644
--- a/doc/users/prev_whats_new/github_stats_3.7.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.7.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.7.2
+
 .. _github-stats-3-7-2:
 
 GitHub statistics for 3.7.2 (Jul 05, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.7.3.rst b/doc/release/prev_whats_new/github_stats_3.7.3.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.7.3.rst
rename to doc/release/prev_whats_new/github_stats_3.7.3.rst
index bb43c1a8395e..f5b0ab256996 100644
--- a/doc/users/prev_whats_new/github_stats_3.7.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.7.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.7.3
+
 .. _github-stats-3-7-3:
 
 GitHub statistics for 3.7.3 (Sep 11, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.8.0.rst b/doc/release/prev_whats_new/github_stats_3.8.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.8.0.rst
rename to doc/release/prev_whats_new/github_stats_3.8.0.rst
index 219e60f399ac..589093455af5 100644
--- a/doc/users/prev_whats_new/github_stats_3.8.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.8.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.8.0
+
 .. _github-stats-3-8-0:
 
 GitHub statistics for 3.8.0 (Sep 14, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.8.1.rst b/doc/release/prev_whats_new/github_stats_3.8.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.8.1.rst
rename to doc/release/prev_whats_new/github_stats_3.8.1.rst
index 86de0e3b70a9..5043f5b641f1 100644
--- a/doc/users/prev_whats_new/github_stats_3.8.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.8.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.8.1
+
 .. _github-stats-3-8-1:
 
 GitHub statistics for 3.8.1 (Oct 31, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.8.2.rst b/doc/release/prev_whats_new/github_stats_3.8.2.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.8.2.rst
rename to doc/release/prev_whats_new/github_stats_3.8.2.rst
index 0e5852be394b..1703c2e1bbb4 100644
--- a/doc/users/prev_whats_new/github_stats_3.8.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.8.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.8.2
+
 .. _github-stats-3-8-2:
 
 GitHub statistics for 3.8.2 (Nov 17, 2023)
diff --git a/doc/users/prev_whats_new/github_stats_3.8.3.rst b/doc/release/prev_whats_new/github_stats_3.8.3.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.8.3.rst
rename to doc/release/prev_whats_new/github_stats_3.8.3.rst
index c91e046fd6ae..c43a215bb869 100644
--- a/doc/users/prev_whats_new/github_stats_3.8.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.8.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.8.3
+
 .. _github-stats-3-8-3:
 
 GitHub statistics for 3.8.3 (Feb 14, 2024)
diff --git a/doc/users/prev_whats_new/github_stats_3.8.4.rst b/doc/release/prev_whats_new/github_stats_3.8.4.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.8.4.rst
rename to doc/release/prev_whats_new/github_stats_3.8.4.rst
index 324393b12f9d..9b38d03e8464 100644
--- a/doc/users/prev_whats_new/github_stats_3.8.4.rst
+++ b/doc/release/prev_whats_new/github_stats_3.8.4.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.8.4
+
 .. _github-stats-3-8-4:
 
 GitHub statistics for 3.8.4 (Apr 03, 2024)
diff --git a/doc/users/prev_whats_new/github_stats_3.9.0.rst b/doc/release/prev_whats_new/github_stats_3.9.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.9.0.rst
rename to doc/release/prev_whats_new/github_stats_3.9.0.rst
index 5ddbdfd6f2bd..cd84acc8e288 100644
--- a/doc/users/prev_whats_new/github_stats_3.9.0.rst
+++ b/doc/release/prev_whats_new/github_stats_3.9.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.9.0
+
 .. _github-stats-3-9-0:
 
 GitHub statistics for 3.9.0 (May 15, 2024)
diff --git a/doc/users/prev_whats_new/github_stats_3.9.1.rst b/doc/release/prev_whats_new/github_stats_3.9.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.9.1.rst
rename to doc/release/prev_whats_new/github_stats_3.9.1.rst
index 1bd7860546cb..58848b388f0c 100644
--- a/doc/users/prev_whats_new/github_stats_3.9.1.rst
+++ b/doc/release/prev_whats_new/github_stats_3.9.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.9.1
+
 .. _github-stats-3-9-1:
 
 GitHub statistics for 3.9.1 (Jul 04, 2024)
diff --git a/doc/users/prev_whats_new/github_stats_3.9.2.rst b/doc/release/prev_whats_new/github_stats_3.9.2.rst
similarity index 98%
rename from doc/users/prev_whats_new/github_stats_3.9.2.rst
rename to doc/release/prev_whats_new/github_stats_3.9.2.rst
index 542e0d81ce32..eb11dd62c3f3 100644
--- a/doc/users/prev_whats_new/github_stats_3.9.2.rst
+++ b/doc/release/prev_whats_new/github_stats_3.9.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.9.2
+
 .. _github-stats-3-9-2:
 
 GitHub statistics for 3.9.2 (Aug 12, 2024)
diff --git a/doc/users/prev_whats_new/github_stats_3.9.3.rst b/doc/release/prev_whats_new/github_stats_3.9.3.rst
similarity index 99%
rename from doc/users/prev_whats_new/github_stats_3.9.3.rst
rename to doc/release/prev_whats_new/github_stats_3.9.3.rst
index 06f0232c338c..f0b8a7b59c0d 100644
--- a/doc/users/prev_whats_new/github_stats_3.9.3.rst
+++ b/doc/release/prev_whats_new/github_stats_3.9.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.9.3
+
 .. _github-stats-3-9-3:
 
 GitHub statistics for 3.9.3 (Nov 30, 2024)
diff --git a/doc/users/prev_whats_new/github_stats_3.9.4.rst b/doc/release/prev_whats_new/github_stats_3.9.4.rst
similarity index 94%
rename from doc/users/prev_whats_new/github_stats_3.9.4.rst
rename to doc/release/prev_whats_new/github_stats_3.9.4.rst
index a821d2fc1f57..afedb6eccc27 100644
--- a/doc/users/prev_whats_new/github_stats_3.9.4.rst
+++ b/doc/release/prev_whats_new/github_stats_3.9.4.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/github_stats_3.9.4
+
 .. _github-stats-3-9-4:
 
 GitHub statistics for 3.9.4 (Dec 13, 2024)
diff --git a/doc/users/prev_whats_new/whats_new_0.98.4.rst b/doc/release/prev_whats_new/whats_new_0.98.4.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_0.98.4.rst
rename to doc/release/prev_whats_new/whats_new_0.98.4.rst
index 88d376cf79bf..fb08b8355971 100644
--- a/doc/users/prev_whats_new/whats_new_0.98.4.rst
+++ b/doc/release/prev_whats_new/whats_new_0.98.4.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_0.98.4
+
 .. _whats-new-0-98-4:
 
 What's new in Matplotlib 0.98.4
diff --git a/doc/users/prev_whats_new/whats_new_0.99.rst b/doc/release/prev_whats_new/whats_new_0.99.rst
similarity index 98%
rename from doc/users/prev_whats_new/whats_new_0.99.rst
rename to doc/release/prev_whats_new/whats_new_0.99.rst
index 47e4b18ae62d..94996a24c50b 100644
--- a/doc/users/prev_whats_new/whats_new_0.99.rst
+++ b/doc/release/prev_whats_new/whats_new_0.99.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_0.99
+
 .. _whats-new-0-99:
 
 What's new in Matplotlib 0.99 (Aug 29, 2009)
diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/release/prev_whats_new/whats_new_1.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_1.0.rst
rename to doc/release/prev_whats_new/whats_new_1.0.rst
index 772f241f4b23..99d40b3923b6 100644
--- a/doc/users/prev_whats_new/whats_new_1.0.rst
+++ b/doc/release/prev_whats_new/whats_new_1.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_1.0
+
 .. _whats-new-1-0:
 
 What's new in Matplotlib 1.0 (Jul 06, 2010)
diff --git a/doc/users/prev_whats_new/whats_new_1.1.rst b/doc/release/prev_whats_new/whats_new_1.1.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_1.1.rst
rename to doc/release/prev_whats_new/whats_new_1.1.rst
index 3f48fc9f87b6..1e036fbae095 100644
--- a/doc/users/prev_whats_new/whats_new_1.1.rst
+++ b/doc/release/prev_whats_new/whats_new_1.1.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_1.1
+
 .. _whats-new-1-1:
 
 What's new in Matplotlib 1.1 (Nov 02, 2011)
diff --git a/doc/users/prev_whats_new/whats_new_1.2.2.rst b/doc/release/prev_whats_new/whats_new_1.2.2.rst
similarity index 90%
rename from doc/users/prev_whats_new/whats_new_1.2.2.rst
rename to doc/release/prev_whats_new/whats_new_1.2.2.rst
index ab81018925cd..15e076e6cfaa 100644
--- a/doc/users/prev_whats_new/whats_new_1.2.2.rst
+++ b/doc/release/prev_whats_new/whats_new_1.2.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_1.2.2
+
 .. _whats-new-1-2-2:
 
 What's new in Matplotlib 1.2.2
diff --git a/doc/users/prev_whats_new/whats_new_1.2.rst b/doc/release/prev_whats_new/whats_new_1.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_1.2.rst
rename to doc/release/prev_whats_new/whats_new_1.2.rst
index 43c729999d5b..7e25f60d632b 100644
--- a/doc/users/prev_whats_new/whats_new_1.2.rst
+++ b/doc/release/prev_whats_new/whats_new_1.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_1.2
+
 .. _whats-new-1-2:
 
 
diff --git a/doc/users/prev_whats_new/whats_new_1.3.rst b/doc/release/prev_whats_new/whats_new_1.3.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_1.3.rst
rename to doc/release/prev_whats_new/whats_new_1.3.rst
index af40f37f92b7..f5c7165538aa 100644
--- a/doc/users/prev_whats_new/whats_new_1.3.rst
+++ b/doc/release/prev_whats_new/whats_new_1.3.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_1.3
+
 .. _whats-new-1-3:
 
 What's new in Matplotlib 1.3 (Aug 01, 2013)
diff --git a/doc/users/prev_whats_new/whats_new_1.4.rst b/doc/release/prev_whats_new/whats_new_1.4.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_1.4.rst
rename to doc/release/prev_whats_new/whats_new_1.4.rst
index eb0e93fd8883..994e12ec977b 100644
--- a/doc/users/prev_whats_new/whats_new_1.4.rst
+++ b/doc/release/prev_whats_new/whats_new_1.4.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_1.4
+
 .. _whats-new-1-4:
 
 
diff --git a/doc/users/prev_whats_new/whats_new_1.5.rst b/doc/release/prev_whats_new/whats_new_1.5.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_1.5.rst
rename to doc/release/prev_whats_new/whats_new_1.5.rst
index 5bb4d4b9b5e9..8de98aedb01d 100644
--- a/doc/users/prev_whats_new/whats_new_1.5.rst
+++ b/doc/release/prev_whats_new/whats_new_1.5.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_1.5
+
 .. _whats-new-1-5:
 
 What's new in Matplotlib 1.5 (Oct 29, 2015)
diff --git a/doc/users/prev_whats_new/whats_new_2.0.0.rst b/doc/release/prev_whats_new/whats_new_2.0.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_2.0.0.rst
rename to doc/release/prev_whats_new/whats_new_2.0.0.rst
index 0f5edb7c0e3f..e6eea1984707 100644
--- a/doc/users/prev_whats_new/whats_new_2.0.0.rst
+++ b/doc/release/prev_whats_new/whats_new_2.0.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_2.0.0
+
 .. _whats-new-2-0-0:
 
 What's new in Matplotlib 2.0 (Jan 17, 2017)
diff --git a/doc/users/prev_whats_new/whats_new_2.1.0.rst b/doc/release/prev_whats_new/whats_new_2.1.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_2.1.0.rst
rename to doc/release/prev_whats_new/whats_new_2.1.0.rst
index a66e2e10f3a2..426ce377b7d1 100644
--- a/doc/users/prev_whats_new/whats_new_2.1.0.rst
+++ b/doc/release/prev_whats_new/whats_new_2.1.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_2.1.0
+
 .. _whats-new-2-1-0:
 
 What's new in Matplotlib 2.1.0 (Oct 7, 2017)
diff --git a/doc/users/prev_whats_new/whats_new_2.2.rst b/doc/release/prev_whats_new/whats_new_2.2.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_2.2.rst
rename to doc/release/prev_whats_new/whats_new_2.2.rst
index 6354a390860a..066b64d19cca 100644
--- a/doc/users/prev_whats_new/whats_new_2.2.rst
+++ b/doc/release/prev_whats_new/whats_new_2.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_2.2
+
 .. _whats-new-2-2-0:
 
 What's new in Matplotlib 2.2 (Mar 06, 2018)
diff --git a/doc/users/prev_whats_new/whats_new_3.0.rst b/doc/release/prev_whats_new/whats_new_3.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.0.rst
rename to doc/release/prev_whats_new/whats_new_3.0.rst
index e3dd12c71a8e..207c9a5eacd5 100644
--- a/doc/users/prev_whats_new/whats_new_3.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.0
+
 .. _whats-new-3-0-0:
 
 What's new in Matplotlib 3.0 (Sep 18, 2018)
diff --git a/doc/users/prev_whats_new/whats_new_3.1.0.rst b/doc/release/prev_whats_new/whats_new_3.1.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.1.0.rst
rename to doc/release/prev_whats_new/whats_new_3.1.0.rst
index 9f53435b89f6..689b035209bc 100644
--- a/doc/users/prev_whats_new/whats_new_3.1.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.1.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.1.0
+
 .. _whats-new-3-1-0:
 
 What's new in Matplotlib 3.1 (May 18, 2019)
diff --git a/doc/users/prev_whats_new/whats_new_3.10.0.rst b/doc/release/prev_whats_new/whats_new_3.10.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.10.0.rst
rename to doc/release/prev_whats_new/whats_new_3.10.0.rst
index f1231be53cc4..82e67368805d 100644
--- a/doc/users/prev_whats_new/whats_new_3.10.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.10.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.10.0
+
 ===================================================
 What's new in Matplotlib 3.10.0 (December 13, 2024)
 ===================================================
diff --git a/doc/users/prev_whats_new/whats_new_3.2.0.rst b/doc/release/prev_whats_new/whats_new_3.2.0.rst
similarity index 98%
rename from doc/users/prev_whats_new/whats_new_3.2.0.rst
rename to doc/release/prev_whats_new/whats_new_3.2.0.rst
index 12d7fab3af90..4fcba4e5a0fc 100644
--- a/doc/users/prev_whats_new/whats_new_3.2.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.2.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.2.0
+
 .. _whats-new-3-2-0:
 
 What's new in Matplotlib 3.2 (Mar 04, 2020)
diff --git a/doc/users/prev_whats_new/whats_new_3.3.0.rst b/doc/release/prev_whats_new/whats_new_3.3.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.3.0.rst
rename to doc/release/prev_whats_new/whats_new_3.3.0.rst
index 94914bcc75db..86ee971792e4 100644
--- a/doc/users/prev_whats_new/whats_new_3.3.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.3.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.3.0
+
 .. _whats-new-3-3-0:
 
 =============================================
diff --git a/doc/users/prev_whats_new/whats_new_3.4.0.rst b/doc/release/prev_whats_new/whats_new_3.4.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.4.0.rst
rename to doc/release/prev_whats_new/whats_new_3.4.0.rst
index 003cd85fa49d..3cddee85b56e 100644
--- a/doc/users/prev_whats_new/whats_new_3.4.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.4.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.4.0
+
 .. _whats-new-3-4-0:
 
 =============================================
diff --git a/doc/users/prev_whats_new/whats_new_3.5.0.rst b/doc/release/prev_whats_new/whats_new_3.5.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.5.0.rst
rename to doc/release/prev_whats_new/whats_new_3.5.0.rst
index fb156d0c68e8..d43a390d2db9 100644
--- a/doc/users/prev_whats_new/whats_new_3.5.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.5.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.5.0
+
 =============================================
 What's new in Matplotlib 3.5.0 (Nov 15, 2021)
 =============================================
diff --git a/doc/users/prev_whats_new/whats_new_3.5.2.rst b/doc/release/prev_whats_new/whats_new_3.5.2.rst
similarity index 90%
rename from doc/users/prev_whats_new/whats_new_3.5.2.rst
rename to doc/release/prev_whats_new/whats_new_3.5.2.rst
index 85b1c38862eb..98880653c9d8 100644
--- a/doc/users/prev_whats_new/whats_new_3.5.2.rst
+++ b/doc/release/prev_whats_new/whats_new_3.5.2.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.5.2
+
 =============================================
 What's new in Matplotlib 3.5.2 (May 02, 2022)
 =============================================
diff --git a/doc/users/prev_whats_new/whats_new_3.6.0.rst b/doc/release/prev_whats_new/whats_new_3.6.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.6.0.rst
rename to doc/release/prev_whats_new/whats_new_3.6.0.rst
index 9fcf8cebfc6f..57b162ca159d 100644
--- a/doc/users/prev_whats_new/whats_new_3.6.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.6.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.6.0
+
 =============================================
 What's new in Matplotlib 3.6.0 (Sep 15, 2022)
 =============================================
diff --git a/doc/users/prev_whats_new/whats_new_3.7.0.rst b/doc/release/prev_whats_new/whats_new_3.7.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.7.0.rst
rename to doc/release/prev_whats_new/whats_new_3.7.0.rst
index 1834cbf3726f..d2451bfa50bc 100644
--- a/doc/users/prev_whats_new/whats_new_3.7.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.7.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.7.0
+
 =============================================
 What's new in Matplotlib 3.7.0 (Feb 13, 2023)
 =============================================
diff --git a/doc/users/prev_whats_new/whats_new_3.8.0.rst b/doc/release/prev_whats_new/whats_new_3.8.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.8.0.rst
rename to doc/release/prev_whats_new/whats_new_3.8.0.rst
index fe1d5f7a7952..2d5ffe3ad3e7 100644
--- a/doc/users/prev_whats_new/whats_new_3.8.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.8.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.8.0
+
 ==============================================
 What's new in Matplotlib 3.8.0 (Sept 13, 2023)
 ==============================================
diff --git a/doc/users/prev_whats_new/whats_new_3.9.0.rst b/doc/release/prev_whats_new/whats_new_3.9.0.rst
similarity index 99%
rename from doc/users/prev_whats_new/whats_new_3.9.0.rst
rename to doc/release/prev_whats_new/whats_new_3.9.0.rst
index 85fabf86efbe..259bd2f35ee4 100644
--- a/doc/users/prev_whats_new/whats_new_3.9.0.rst
+++ b/doc/release/prev_whats_new/whats_new_3.9.0.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/prev_whats_new/whats_new_3.9.0
+
 =============================================
 What's new in Matplotlib 3.9.0 (May 15, 2024)
 =============================================
diff --git a/doc/users/release_notes.rst b/doc/release/release_notes.rst
similarity index 99%
rename from doc/users/release_notes.rst
rename to doc/release/release_notes.rst
index ae06d9875988..2b445bbf606b 100644
--- a/doc/users/release_notes.rst
+++ b/doc/release/release_notes.rst
@@ -1,5 +1,6 @@
 .. redirect-from:: /api/api_changes_old
 .. redirect-from:: /users/whats_new_old
+.. redirect-from:: /users/release_notes
 
 .. _release-notes:
 
diff --git a/doc/users/release_notes_next.rst b/doc/release/release_notes_next.rst
similarity index 73%
rename from doc/users/release_notes_next.rst
rename to doc/release/release_notes_next.rst
index 6813f61c5f90..de10d5e8dc27 100644
--- a/doc/users/release_notes_next.rst
+++ b/doc/release/release_notes_next.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/release_notes_next
+
 :orphan:
 
 Next version

From a3c4a5fa88222f527011f122c51b23b9de3544f9 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Wed, 16 Jul 2025 09:07:17 +0100
Subject: [PATCH 2/3] Fix labeller

---
 .github/labeler.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index bf147be952f8..75adfed57f43 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -110,10 +110,10 @@
   - all:
       - changed-files:
           - any-glob-to-any-file:
-              - 'doc/release/**'
+              - 'doc/users/**'
               - 'galleries/users_explain/**'
           - all-globs-to-all-files:
-              - '!doc/release/next_whats_new/**'
+              - '!doc/users/next_whats_new/**'
 
 "topic: animation":
   - changed-files:

From 08d5d5799e12f65d664809531e87cc0dd0a26bbd Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Thu, 17 Jul 2025 17:09:53 +0100
Subject: [PATCH 3/3] Move generate_credits.py

---
 doc/project/credits.rst                      | 2 +-
 doc/{release => project}/generate_credits.py | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename doc/{release => project}/generate_credits.py (100%)

diff --git a/doc/project/credits.rst b/doc/project/credits.rst
index 62f5ab34a493..a57c35e8127d 100644
--- a/doc/project/credits.rst
+++ b/doc/project/credits.rst
@@ -1,4 +1,4 @@
-.. Note: This file is auto-generated using doc/release/generate_credits.py
+.. Note: This file is auto-generated using generate_credits.py
 
 .. redirect-from:: /users/credits
 .. redirect-from:: /users/project/credits
diff --git a/doc/release/generate_credits.py b/doc/project/generate_credits.py
similarity index 100%
rename from doc/release/generate_credits.py
rename to doc/project/generate_credits.py