aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEnrico Tassi2019-05-22 17:52:19 +0200
committerEnrico Tassi2019-06-04 13:58:43 +0200
commit0f1814bcbaafbd93d7c7587eef8826a80b65477f (patch)
treef6eb6f20a829ae78093bd5751560dcf258c90466 /doc
parent3b7509b96273f4e412b747e0c55dd193f38fd418 (diff)
[function] always open a proof when used with `wf` or `measure`
Diffstat (limited to 'doc')
-rw-r--r--doc/changelog/02-specification-language/10215-rm-maybe-open-proof.rst5
-rw-r--r--doc/sphinx/language/gallina-extensions.rst2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/changelog/02-specification-language/10215-rm-maybe-open-proof.rst b/doc/changelog/02-specification-language/10215-rm-maybe-open-proof.rst
new file mode 100644
index 0000000000..53828db951
--- /dev/null
+++ b/doc/changelog/02-specification-language/10215-rm-maybe-open-proof.rst
@@ -0,0 +1,5 @@
+- Function always opens a proof when used with a ``measure`` or ``wf``
+ annotation, see Description of the changes, with possible link to
+ :ref:`advanced-recursive-functions` of the updated documentation
+ (`#10215 <https://github.com/coq/coq/pull/10215>`_,
+ by Enrico Tassi).
diff --git a/doc/sphinx/language/gallina-extensions.rst b/doc/sphinx/language/gallina-extensions.rst
index 8c5ad785e4..c93984661e 100644
--- a/doc/sphinx/language/gallina-extensions.rst
+++ b/doc/sphinx/language/gallina-extensions.rst
@@ -737,7 +737,7 @@ used by ``Function``. A more precise description is given below.
decreases at each recursive call of :token:`term`. The order must be well-founded.
Parameters of the function are bound in :token:`term`.
- Depending on the annotation, the user is left with some proof
+ If the annotation is ``measure`` or ``fw``, the user is left with some proof
obligations that will be used to define the function. These proofs
are: proofs that each recursive call is actually decreasing with
respect to the given criteria, and (if the criteria is `wf`) a proof