aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/changelog/08-tools/11068-coqbin-noslash.rst3
-rw-r--r--doc/sphinx/addendum/type-classes.rst8
-rw-r--r--doc/sphinx/practical-tools/coq-commands.rst10
-rw-r--r--doc/sphinx/proof-engine/tactics.rst10
4 files changed, 24 insertions, 7 deletions
diff --git a/doc/changelog/08-tools/11068-coqbin-noslash.rst b/doc/changelog/08-tools/11068-coqbin-noslash.rst
new file mode 100644
index 0000000000..c2c8f4df31
--- /dev/null
+++ b/doc/changelog/08-tools/11068-coqbin-noslash.rst
@@ -0,0 +1,3 @@
+- ``coq_makefile`` now supports environment variable ``COQBIN`` with
+ no ending ``/`` character (`#11068
+ <https://github.com/coq/coq/pull/11068>`_, by Gaƫtan Gilbert).
diff --git a/doc/sphinx/addendum/type-classes.rst b/doc/sphinx/addendum/type-classes.rst
index 57a2254100..661aa88082 100644
--- a/doc/sphinx/addendum/type-classes.rst
+++ b/doc/sphinx/addendum/type-classes.rst
@@ -576,6 +576,14 @@ Settings
of goals. Setting this option to 1 or 2 turns on the :flag:`Typeclasses Debug` flag; setting this
option to 0 turns that flag off.
+.. flag:: Typeclasses Axioms Are Instances
+
+ .. deprecated:: 8.10
+
+ This flag (off by default since 8.8) automatically declares axioms
+ whose type is a typeclass at declaration time as instances of that
+ class.
+
Typeclasses eauto `:=`
~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/sphinx/practical-tools/coq-commands.rst b/doc/sphinx/practical-tools/coq-commands.rst
index 97e7af8cb4..514f5acc8e 100644
--- a/doc/sphinx/practical-tools/coq-commands.rst
+++ b/doc/sphinx/practical-tools/coq-commands.rst
@@ -354,11 +354,11 @@ within a section.
**Interaction with standard compilation**
When compiling a file ``foo.v`` using ``coqc`` in the standard way (i.e., without
-``-vos`` nor ``-vok``), an empty file ``foo.vos`` is created in addition to the
-regular output file ``foo.vo``. If ``coqc`` is subsequently invoked on some other
-file ``bar.v`` using option ``-vos`` or ``-vok``, and that ``bar.v`` requires
-``foo.v``, if |Coq| finds an empty file ``foo.vos``, then it will load
-``foo.vo`` instead of ``foo.vos``.
+``-vos`` nor ``-vok``), an empty file ``foo.vos`` and an empty file ``foo.vok``
+are created in addition to the regular output file ``foo.vo``.
+If ``coqc`` is subsequently invoked on some other file ``bar.v`` using option
+``-vos`` or ``-vok``, and that ``bar.v`` requires ``foo.v``, if |Coq| finds an
+empty file ``foo.vos``, then it will load ``foo.vo`` instead of ``foo.vos``.
The purpose of this feature is to allow users to benefit from the ``-vos``
option even if they depend on libraries that were compiled in the traditional
diff --git a/doc/sphinx/proof-engine/tactics.rst b/doc/sphinx/proof-engine/tactics.rst
index ad7f9af0f9..62d4aa704f 100644
--- a/doc/sphinx/proof-engine/tactics.rst
+++ b/doc/sphinx/proof-engine/tactics.rst
@@ -4237,7 +4237,13 @@ some incompatibilities.
.. tacv:: firstorder using {+ @qualid}
- Adds lemmas :n:`{+ @qualid}` to the proof-search environment. If :n:`@qualid`
+ .. deprecated:: 8.3
+
+ Use the syntax below instead (with commas).
+
+.. tacv:: firstorder using {+, @qualid}
+
+ Adds lemmas :n:`{+, @qualid}` to the proof-search environment. If :n:`@qualid`
refers to an inductive type, it is the collection of its constructors which are
added to the proof-search environment.
@@ -4246,7 +4252,7 @@ some incompatibilities.
Adds lemmas from :tacn:`auto` hint bases :n:`{+ @ident}` to the proof-search
environment.
-.. tacv:: firstorder @tactic using {+ @qualid} with {+ @ident}
+.. tacv:: firstorder @tactic using {+, @qualid} with {+ @ident}
This combines the effects of the different variants of :tacn:`firstorder`.