diff options
author | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-10-15 09:47:43 +0200 |
---|---|---|
committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-10-15 09:47:43 +0200 |
commit | cbd28511526dfb561017c3d27a73598f6ce5f68d (patch) | |
tree | a8786b32433caa850e24f67ab5a3aa85f29a683a /dev | |
parent | 10e5883fed21f9631e1aa65adb7a7e62a529987f (diff) | |
parent | 7402a7788b6a73bd5c0cb9078823d48e6f01a357 (diff) |
Merge branch 'v8.5'
Diffstat (limited to 'dev')
-rw-r--r-- | dev/doc/univpoly.txt | 2 | ||||
-rw-r--r-- | dev/v8-syntax/memo-v8.tex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dev/doc/univpoly.txt b/dev/doc/univpoly.txt index 9e243eead..6a69c5793 100644 --- a/dev/doc/univpoly.txt +++ b/dev/doc/univpoly.txt @@ -167,7 +167,7 @@ kernel/univ.ml was modified. The new API forces every universe to be declared before it is mentionned in any constraint. This forces to declare every universe to be >= Set or > Set. Every universe variable introduced during elaboration is >= Set. Every _global_ universe is now -declared explicitely > Set, _after_ typechecking the definition. In +declared explicitly > Set, _after_ typechecking the definition. In polymorphic definitions Type@{i} ranges over Set and any other universe j. However, at instantiation time for polymorphic references, one can try to instantiate a universe parameter with Prop as well, if the diff --git a/dev/v8-syntax/memo-v8.tex b/dev/v8-syntax/memo-v8.tex index 8d116de26..ae4b569b3 100644 --- a/dev/v8-syntax/memo-v8.tex +++ b/dev/v8-syntax/memo-v8.tex @@ -253,7 +253,7 @@ became \TERM{context}. Syntax is unified with subterm matching. \subsection{Occurrences} To avoid ambiguity between a numeric literal and the optionnal -occurence numbers of this term, the occurence numbers are put after +occurrence numbers of this term, the occurrence numbers are put after the term itself. This applies to tactic \TERM{pattern} and also \TERM{unfold} \begin{transbox} |