chore: post 3.12 changelog merge (#9317)

* chore: post 3.12 changelog merge - Add 3.12.1 changelog - #9280 was reverted; move it off the main changelog Signed-off-by: Etienne Millon <[email protected]> * Add main changelog warning Signed-off-by: Etienne Millon <[email protected]> --------- Signed-off-by: Etienne Millon <[email protected]>
ocaml · Nov 30, 2023 · 67bbd0c · 67bbd0c
1 parent 8a3ca10
commit 67bbd0c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,15 @@
+Unreleased
+----------
+
+If you're a contributor, please include your CHANGES entry in a file
+`doc/changes/$PR_NAME.md`. At release time, it will be incoporated into the
+changelog properly.  
+
+3.12.1 (2023-11-29)
+-------------------
+
+- Revert unintended inclusion of #9250 and #9280 (@emillon)
+
 3.12.0 (2023-11-28)
 -------------------
 
@@ -40,9 +52,6 @@
 - Add `test_` prefix to default test name in `dune init project` (#9257, fixes
   #9131, @9sako6)
 
-- Add `coqdoc_flags` field to `coq` field of `env` stanza allowing the setting
-  of workspace-wide defaults for `coqdoc_flags`. (#9280, fixes #9139, @Alizter)
-
 - [coq rules] Be more tolerant when coqc --print-version / --config don't work
   properly, and fallback to a reasonable default. This fixes problems when
   building Coq projects with `(stdlib no)` and likely other cases. (#8966, fix

diff --git a/doc/changes/coqdoc-flags.md b/doc/changes/coqdoc-flags.md
@@ -0,0 +1,2 @@
+- Add `coqdoc_flags` field to `coq` field of `env` stanza allowing the setting
+  of workspace-wide defaults for `coqdoc_flags`. (#9280, fixes #9139, @Alizter)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Add `coqdoc_flags` field to `coq` field of `env` stanza allowing the setting
		of workspace-wide defaults for `coqdoc_flags`. (#9280, fixes #9139, @Alizter)