Merge PR #11119: 8.10-backportable part of #10575

Reviewed-by: cpitclaudel

2 files changed, 16 insertions, 2 deletions

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/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`.