aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoqbot-app[bot]2020-12-06 16:06:27 +0000
committerGitHub2020-12-06 16:06:27 +0000
commitd8ba0f81c026d073c5271b7eda8ae22ce11105fe (patch)
tree50e5ee4ddd0a4aa89b80b11202a026688bef6c9e
parentaa05724c5f8f63171384580fbf429e9ec1e15ce3 (diff)
parent8e7b1adc7fc8a2a12a08f1b4a2817cab04fe00c3 (diff)
Merge PR #13585: [RM] Update changes 13501
Reviewed-by: Zimmi48
-rw-r--r--doc/changelog/01-kernel/13501-fix-13495.rst7
-rw-r--r--doc/sphinx/changes.rst8
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/changelog/01-kernel/13501-fix-13495.rst b/doc/changelog/01-kernel/13501-fix-13495.rst
deleted file mode 100644
index 5c81efa8b9..0000000000
--- a/doc/changelog/01-kernel/13501-fix-13495.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-- **Fixed:**
- Fix an incompleteness in the typechecking of `match` for
- cumulative inductive types. This could result in breaking subject
- reduction.
- (`#13501 <https://github.com/coq/coq/pull/13501>`_,
- fixes `#13495 <https://github.com/coq/coq/issues/13495>`_,
- by Matthieu Sozeau).
diff --git a/doc/sphinx/changes.rst b/doc/sphinx/changes.rst
index c2b32afea2..8fb03879e8 100644
--- a/doc/sphinx/changes.rst
+++ b/doc/sphinx/changes.rst
@@ -153,6 +153,14 @@ Kernel
<https://github.com/coq/coq/pull/12525>`_ and `#12647
<https://github.com/coq/coq/pull/12647>`_, by Hugo Herbelin).
+- **Fixed:**
+ Fix an incompleteness in the typechecking of `match` for
+ cumulative inductive types. This could result in breaking subject
+ reduction.
+ (`#13501 <https://github.com/coq/coq/pull/13501>`_,
+ fixes `#13495 <https://github.com/coq/coq/issues/13495>`_,
+ by Matthieu Sozeau).
+
Specification language, type inference
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^