From 0acd3d7886b0ed2e042389b37d3f5dfcebc126cc Mon Sep 17 00:00:00 2001
From: Ricardo Signes <rjbs@semiotic.systems>
Date: Fri, 3 Jan 2025 21:53:49 -0500
Subject: [PATCH] docs: simplify toctree of release notes

The existing globbing had too many overly-specific cases.

This led to quite a few documents having globs that matched nothing,
like:

    x/?.?.??

Unless there was a 3.5.10, this would match nothing.  Given how we
structure these documents, `x/*` is enough.  I've left the `x/*-alpha`
type patterns in place, just to keep the ordering a little nicer, for
now.
---
 docsrc/imap/download/release-notes/3.0/index.rst | 7 +++----
 docsrc/imap/download/release-notes/3.1/index.rst | 2 +-
 docsrc/imap/download/release-notes/3.2/index.rst | 7 +++----
 docsrc/imap/download/release-notes/3.3/index.rst | 3 +--
 docsrc/imap/download/release-notes/3.4/index.rst | 8 +++-----
 docsrc/imap/download/release-notes/3.5/index.rst | 6 ------
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/docsrc/imap/download/release-notes/3.0/index.rst b/docsrc/imap/download/release-notes/3.0/index.rst
index e222b81321..f9e5235f4d 100644
--- a/docsrc/imap/download/release-notes/3.0/index.rst
+++ b/docsrc/imap/download/release-notes/3.0/index.rst
@@ -8,7 +8,6 @@ Cyrus IMAP 3.0 Releases
     :maxdepth: 1
     :glob:
 
-    x/?.?.*-beta*
-    x/?.?.*-rc*
-    x/?.?.?
-    x/?.?.??
+    x/*-beta*
+    x/*-rc*
+    x/*
diff --git a/docsrc/imap/download/release-notes/3.1/index.rst b/docsrc/imap/download/release-notes/3.1/index.rst
index c40e789866..1fcfea6027 100644
--- a/docsrc/imap/download/release-notes/3.1/index.rst
+++ b/docsrc/imap/download/release-notes/3.1/index.rst
@@ -15,4 +15,4 @@ Cyrus IMAP 3.1 Tags
     :maxdepth: 1
     :glob:
 
-    x/?.?.*
+    x/*
diff --git a/docsrc/imap/download/release-notes/3.2/index.rst b/docsrc/imap/download/release-notes/3.2/index.rst
index bf4f40f316..607b2a0622 100644
--- a/docsrc/imap/download/release-notes/3.2/index.rst
+++ b/docsrc/imap/download/release-notes/3.2/index.rst
@@ -8,7 +8,6 @@ Cyrus IMAP 3.2 Releases
     :maxdepth: 1
     :glob:
 
-    x/?.?.*-beta*
-    x/?.?.*-rc*
-    x/?.?.?
-    x/?.?.??
+    x/*-beta*
+    x/*-rc*
+    x/*
diff --git a/docsrc/imap/download/release-notes/3.3/index.rst b/docsrc/imap/download/release-notes/3.3/index.rst
index 5a9b9c214f..244d6fe229 100644
--- a/docsrc/imap/download/release-notes/3.3/index.rst
+++ b/docsrc/imap/download/release-notes/3.3/index.rst
@@ -15,5 +15,4 @@ Cyrus IMAP 3.3 Tags
     :maxdepth: 1
     :glob:
 
-    x/?.?.?
-    x/?.?.??
+    x/*
diff --git a/docsrc/imap/download/release-notes/3.4/index.rst b/docsrc/imap/download/release-notes/3.4/index.rst
index 6d057ec83c..e31cea4b45 100644
--- a/docsrc/imap/download/release-notes/3.4/index.rst
+++ b/docsrc/imap/download/release-notes/3.4/index.rst
@@ -8,8 +8,6 @@ Cyrus IMAP 3.4 Releases
     :maxdepth: 1
     :glob:
 
-    x/?.?.*-alpha*
-    x/?.?.*-beta*
-    x/?.?.*-rc*
-    x/?.?.?
-    x/?.?.??
+    x/*-beta*
+    x/*-rc*
+    x/*
diff --git a/docsrc/imap/download/release-notes/3.5/index.rst b/docsrc/imap/download/release-notes/3.5/index.rst
index cc99b3c778..16ce59e85f 100644
--- a/docsrc/imap/download/release-notes/3.5/index.rst
+++ b/docsrc/imap/download/release-notes/3.5/index.rst
@@ -12,9 +12,3 @@ Cyrus IMAP 3.5 Tags
     there will generally be **large breaking changes** occurring between
     releases in this series.
 
-.. toctree::
-    :maxdepth: 1
-    :glob:
-
-    x/?.?.?
-    x/?.?.??