aboutsummaryrefslogtreecommitdiff
path: root/dev/doc
diff options
context:
space:
mode:
authorVincent Laporte2019-05-06 13:08:14 +0000
committerVincent Laporte2019-05-06 13:08:14 +0000
commit1a670a23ad54cf5a3c2d2bbf4939f78f4f4b6b35 (patch)
tree81288272de52b007499b1d8d5933aad508c1660a /dev/doc
parent6ff10c569c1684927d4cb866a159fe6f54e55abe (diff)
parent50b148154fada66bb1145aaba696d9b427511592 (diff)
Merge PR #9964: Unreleased changelog folder
Ack-by: SkySkimmer Ack-by: Zimmi48 Reviewed-by: gares Reviewed-by: vbgl
Diffstat (limited to 'dev/doc')
-rw-r--r--dev/doc/MERGING.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md
index 3f1b470878..c9eceb1270 100644
--- a/dev/doc/MERGING.md
+++ b/dev/doc/MERGING.md
@@ -71,8 +71,9 @@ those external projects should have been prepared (cf. the relevant sub-section
in the [CI README](../ci/README.md#Breaking-changes) and the PR can be tested
with these fixes thanks to ["overlays"](../ci/user-overlays/README.md).
-Moreover the PR must absolutely update the [`CHANGES.md`](../../CHANGES.md) or
-the [`dev/doc/changes.md`](changes.md) file.
+Moreover the PR author *must* add an entry to the [unreleased
+changelog](../../doc/changelog/README.md) or to the
+[`dev/doc/changes.md`](changes.md) file.
If overlays are missing, ask the author to prepare them and label the PR with
the [needs: overlay](https://github.com/coq/coq/labels/needs%3A%20overlay) label.