From f71733e0a10728a006ce563bc84beabf790a41b2 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Wed, 24 Jul 2019 17:23:30 +0200
Subject: Document recommended syntax for `firstorder`

Only the deprecated one was documentated, and the deprecation was not
mentioned.
---
 doc/sphinx/proof-engine/tactics.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'doc')

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`.
 
-- 
cgit v1.2.3


From 6ffa4300ad8f693fd40c070e0d44b703325d375c Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Thu, 25 Jul 2019 18:50:18 +0200
Subject: Restore documentation of `Typeclasses Axioms Are Instances`

This documentation seems to have been lost after it was introduced by
0ad26633a4589d77de1f864733d1d953dab9ea91

We also document that this flag is deprecated.
---
 doc/sphinx/addendum/type-classes.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/sphinx/addendum/type-classes.rst b/doc/sphinx/addendum/type-classes.rst
index 1bbf988505..6d8de25e4c 100644
--- a/doc/sphinx/addendum/type-classes.rst
+++ b/doc/sphinx/addendum/type-classes.rst
@@ -563,6 +563,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 `:=`
 ~~~~~~~~~~~~~~~~~~~~~~
 
-- 
cgit v1.2.3