From 70a93b3c62bf3859fa6585fa63851a4b89f6cf92 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sat, 30 Sep 2023 20:30:55 +0200
Subject: [PATCH] Release 2.5.0.

---
 CHANGELOG.rst                                       | 13 +++++++++++++
 changelogs/changelog.yaml                           | 12 ++++++++++++
 changelogs/fragments/2.5.0.yml                      |  3 ---
 .../fragments/220-collection_url-template.yml       |  3 ---
 4 files changed, 25 insertions(+), 6 deletions(-)
 delete mode 100644 changelogs/fragments/2.5.0.yml
 delete mode 100644 changelogs/fragments/220-collection_url-template.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1d433dc4..8b33cf00 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,19 @@ antsibull-docs -- Ansible Documentation Build Scripts Release Notes
 .. contents:: Topics
 
 
+v2.5.0
+======
+
+Release Summary
+---------------
+
+Release to support the updated Ansible Galaxy codebase.
+
+Minor Changes
+-------------
+
+- The default collection URL template has been changed from ``https://galaxy.ansible.com/{namespace}/{name}`` to ``https://galaxy.ansible.com/ui/repo/published/{namespace}/{name}/`` to adjust for the Galaxy codebase change on September 30th, 2023 (https://github.com/ansible-community/antsibull-docs/issues/147, https://github.com/ansible-community/antsibull-docs/pull/220).
+
 v2.4.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index fb5e5403..99ed67e6 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -700,3 +700,15 @@ releases:
     - 218-bulitin-info.yml
     - 219-collection-wildcards.yml
     release_date: '2023-09-27'
+  2.5.0:
+    changes:
+      minor_changes:
+      - The default collection URL template has been changed from ``https://galaxy.ansible.com/{namespace}/{name}``
+        to ``https://galaxy.ansible.com/ui/repo/published/{namespace}/{name}/`` to
+        adjust for the Galaxy codebase change on September 30th, 2023 (https://github.com/ansible-community/antsibull-docs/issues/147,
+        https://github.com/ansible-community/antsibull-docs/pull/220).
+      release_summary: Release to support the updated Ansible Galaxy codebase.
+    fragments:
+    - 2.5.0.yml
+    - 220-collection_url-template.yml
+    release_date: '2023-09-30'
diff --git a/changelogs/fragments/2.5.0.yml b/changelogs/fragments/2.5.0.yml
deleted file mode 100644
index 8b48bcae..00000000
--- a/changelogs/fragments/2.5.0.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-release_summary: Release to support the updated Ansible Galaxy codebase.
-
-
diff --git a/changelogs/fragments/220-collection_url-template.yml b/changelogs/fragments/220-collection_url-template.yml
deleted file mode 100644
index c7e0fe29..00000000
--- a/changelogs/fragments/220-collection_url-template.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-minor_changes:
-  - "The default collection URL template has been changed from ``https://galaxy.ansible.com/{namespace}/{name}`` to ``https://galaxy.ansible.com/ui/repo/published/{namespace}/{name}/``
-     to adjust for the Galaxy codebase change on September 30th, 2023 (https://github.com/ansible-community/antsibull-docs/issues/147, https://github.com/ansible-community/antsibull-docs/pull/220)."