From 59fd01457fa662bca17110bc7505ea52bf162135 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:22:02 +0000
Subject: [PATCH] Fix changelog/readme (backport #9935) (#9936)

* Fix changelog/readme

(cherry picked from commit ea0f4640dd8ac56ad543cf39ef368f9a4e0a8b9f)

* Remove previous release date

---------

Co-authored-by: Francesco Ariis <fa-ml@ariis.it>
---
 Cabal-syntax/ChangeLog.md | 2 +-
 Cabal/ChangeLog.md        | 2 +-
 Cabal/README.md           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cabal-syntax/ChangeLog.md b/Cabal-syntax/ChangeLog.md
index 7706be3236..7554aaf498 100644
--- a/Cabal-syntax/ChangeLog.md
+++ b/Cabal-syntax/ChangeLog.md
@@ -1 +1 @@
-Please see See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.10.3.0.md
+Please see https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.12.0.0.md
diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
index 5eaee95c65..45abf6e691 100644
--- a/Cabal/ChangeLog.md
+++ b/Cabal/ChangeLog.md
@@ -1,4 +1,4 @@
-# 3.12.0.0 [Francesco Ariis](mailto:fa-ml@ariis.it) March 2024
+# 3.12.0.0 [Francesco Ariis](mailto:fa-ml@ariis.it) May 2024
 * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.12.0.0.md
 
 # 3.10.3.0 [Hécate](mailto:hecate+github@glitchbra.in) January 2024
diff --git a/Cabal/README.md b/Cabal/README.md
index 6243422a2c..2bdd6a6ca0 100644
--- a/Cabal/README.md
+++ b/Cabal/README.md
@@ -34,8 +34,8 @@ Cabal's users what their most pressing problems are with Cabal and
 [Hackage]. You may have a favourite Cabal bug or limitation. Look at
 Cabal's [bug tracker]. Ensure that the problem is reported there and
 adequately described. Comment on the issue to report how much of a
-problem the bug is for you. Subscribe to the issues's notifications to
-discussed requirements and keep informed on progress. For feature
+problem the bug is for you. Subscribe to the issue's notifications to
+discuss requirements and keep informed on progress. For feature
 requests, it is helpful if there is a description of how you would
 expect to interact with the new feature.
 
-- 
GitLab