diff options
| author | Théo Zimmermann | 2020-01-21 10:03:03 +0100 |
|---|---|---|
| committer | Théo Zimmermann | 2020-01-21 10:03:03 +0100 |
| commit | f93782dbbb2e61e6664a09b3ae7981223e57f9d3 (patch) | |
| tree | 494a4581396aa00a67ab63c3564603c268e96a65 | |
| parent | 4d12b00277aa1bfde14ba459363a5e9d38d4aeac (diff) | |
| parent | 61afb01b721d12068ade37f5c809319668e3573e (diff) | |
Merge PR #11425: Miscellaneous typos
Reviewed-by: SkySkimmer
Reviewed-by: Zimmi48
Reviewed-by: jfehrle
Reviewed-by: ppedrot
| -rw-r--r-- | doc/sphinx/addendum/universe-polymorphism.rst | 4 | ||||
| -rw-r--r-- | kernel/univ.mli | 2 | ||||
| -rw-r--r-- | tactics/declare.ml | 2 | ||||
| -rw-r--r-- | vernac/declareUniv.ml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/sphinx/addendum/universe-polymorphism.rst b/doc/sphinx/addendum/universe-polymorphism.rst index 7adb25cbd6..f9cc25959c 100644 --- a/doc/sphinx/addendum/universe-polymorphism.rst +++ b/doc/sphinx/addendum/universe-polymorphism.rst @@ -529,8 +529,8 @@ sections, except in the following ways: Polymorphic Universe i. Fail Constraint i = i. - This includes constraints implictly declared by commands such as - :cmd:`Variable`, which may as a such need to be used with universe + This includes constraints implicitly declared by commands such as + :cmd:`Variable`, which may need to be used with universe polymorphism activated (locally by attribute or globally by option): .. coqtop:: all diff --git a/kernel/univ.mli b/kernel/univ.mli index 1914ce5e34..f7c984870f 100644 --- a/kernel/univ.mli +++ b/kernel/univ.mli @@ -322,7 +322,7 @@ val in_punivs : 'a -> 'a puniverses val eq_puniverses : ('a -> 'a -> bool) -> 'a puniverses -> 'a puniverses -> bool (** A vector of universe levels with universe Constraint.t, - representiong local universe variables and associated Constraint.t *) + representing local universe variables and associated Constraint.t *) module UContext : sig diff --git a/tactics/declare.ml b/tactics/declare.ml index da4de3df77..9a14f4d40f 100644 --- a/tactics/declare.ml +++ b/tactics/declare.ml @@ -362,7 +362,7 @@ let inVariable : unit -> obj = classify_function = (fun () -> Dispose)} let declare_variable ~name ~kind d = - (* Constr raisonne sur les noms courts *) + (* Variables are distinguished by only short names *) if Decls.variable_exists name then raise (AlreadyDeclared (None, name)); diff --git a/vernac/declareUniv.ml b/vernac/declareUniv.ml index 69ba9d76ec..def2fdad2a 100644 --- a/vernac/declareUniv.ml +++ b/vernac/declareUniv.ml @@ -72,7 +72,7 @@ let declare_univ_binders gr pl = CErrors.anomaly ~label:"declare_univ_binders" Pp.(str "declare_univ_binders on variable " ++ Id.print id ++ str".") | ConstructRef _ -> CErrors.anomaly ~label:"declare_univ_binders" - Pp.(str "declare_univ_binders on an constructor reference") + Pp.(str "declare_univ_binders on a constructor reference") in let univs = Id.Map.fold (fun id univ univs -> match Univ.Level.name univ with |