[Sphinx] Add chapter 8

Thanks to Heiko Becker and Nikita Zyuzin for porting this chapter.

2 files changed, 3571 insertions, 4614 deletions

diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index a83312d33..f8f7a9ed9 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -23,6 +23,8 @@ Table of contents
 .. toctree::
    :caption: The proof engine
 
+   proof-engine/tactics
+
 .. toctree::
    :caption: User extensions
 
diff --git a/doc/sphinx/proof-engine/tactics.rst b/doc/sphinx/proof-engine/tactics.rst
index 2597e3c37..da34e3b55 100644
--- a/doc/sphinx/proof-engine/tactics.rst
+++ b/doc/sphinx/proof-engine/tactics.rst
@@ -1,5397 +1,4352 @@
-% TODO: unify the use of \form and \type to mean a type
-% or use \form specifically for a type of type Prop
-\chapter{Tactics
-\index{Tactics}
-\label{Tactics}}
-%HEVEA\cutname{tactics.html}
+.. include:: ../preamble.rst
+.. include:: ../replaces.rst
+
+.. _tactics:
+
+Tactics
+========
 
 A deduction rule is a link between some (unique) formula, that we call
-the {\em conclusion} and (several) formulas that we call the {\em
-premises}. A deduction rule can be read in two ways. The first
-one says: {\it ``if I know this and this then I can deduce
-this''}. For instance, if I have a proof of $A$ and a proof of $B$
-then I have a proof of $A \land B$. This is forward reasoning from
-premises to conclusion. The other way says: {\it ``to prove this I
-have to prove this and this''}. For instance, to prove $A \land B$, I
-have to prove $A$ and I have to prove $B$. This is backward reasoning
-from conclusion to premises. We say that the conclusion
-is the {\em goal}\index{goal} to prove and premises are the {\em
-subgoals}\index{subgoal}.  The tactics implement {\em backward
-reasoning}. When applied to a goal, a tactic replaces this goal with
+the *conclusion* and (several) formulas that we call the *premises*. A
+deduction rule can be read in two ways. The first one says: “if I know
+this and this then I can deduce this”. For instance, if I have a proof
+of A and a proof of B then I have a proof of A ∧ B. This is forward
+reasoning from premises to conclusion. The other way says: “to prove
+this I have to prove this and this”. For instance, to prove A ∧ B, I
+have to prove A and I have to prove B. This is backward reasoning from
+conclusion to premises. We say that the conclusion is the *goal* to
+prove and premises are the *subgoals*. The tactics implement *backward
+reasoning*. When applied to a goal, a tactic replaces this goal with
 the subgoals it generates. We say that a tactic reduces a goal to its
 subgoal(s).
 
 Each (sub)goal is denoted with a number. The current goal is numbered
 1. By default, a tactic is applied to the current goal, but one can
-address a particular goal in the list by writing {\sl n:\tac} which
-means {\it ``apply tactic {\tac} to goal number {\sl n}''}.
-We can show the list of subgoals by typing {\tt Show} (see
-Section~\ref{Show}).
-
-Since not every rule applies to a given statement, every tactic cannot be
-used to reduce any goal. In other words, before applying a tactic to a
-given goal, the system checks that some {\em preconditions} are
+address a particular goal in the list by writing n:tactic which means
+“apply tactic tactic to goal number n”. We can show the list of
+subgoals by typing Show (see Section :ref:`TODO-7.3.1-Show`).
+
+Since not every rule applies to a given statement, every tactic cannot
+be used to reduce any goal. In other words, before applying a tactic
+to a given goal, the system checks that some *preconditions* are
 satisfied. If it is not the case, the tactic raises an error message.
 
 Tactics are built from atomic tactics and tactic expressions (which
 extends the folklore notion of tactical) to combine those atomic
 tactics. This chapter is devoted to atomic tactics. The tactic
-language will be described in Chapter~\ref{TacticLanguage}.
+language will be described in Chapter :ref:`TODO-9-Thetacticlanguage`.
 
-\section{Invocation of tactics
-\label{tactic-syntax}
-\index{tactic@{\tac}}}
+Invocation of tactics
+-------------------------
 
 A tactic is applied as an ordinary command. It may be preceded by a
-goal selector (see Section \ref{ltac:selector}).
-If no selector is specified, the default
-selector (see Section \ref{default-selector}) is used.
-
-\newcommand{\toplevelselector}{\nterm{toplevel\_selector}}
-\begin{tabular}{lcl}
-{\commandtac} & ::= & {\toplevelselector} {\tt :} {\tac} {\tt .}\\
- & $|$ & {\tac} {\tt .}
-\end{tabular}
-\subsection[\tt Set Default Goal Selector ``\toplevelselector''.]
-           {\tt Set Default Goal Selector ``\toplevelselector''.
-            \optindex{Default Goal Selector}
-            \label{default-selector}}
-After using this command, the default selector -- used when no selector
-is specified when applying a tactic -- is set to the chosen value. The
-initial value is $1$, hence the tactics are, by default, applied to
-the first goal. Using {\tt Set Default Goal Selector ``all''} will
-make is so that tactics are, by default, applied to every goal
-simultaneously. Then, to apply a tactic {\tt tac} to the first goal
-only, you can write {\tt 1:tac}. Although more selectors are available,
-only {\tt ``all''} or a single natural number are valid default
-goal selectors.
-
-\subsection[\tt Test Default Goal Selector.]
-           {\tt Test Default Goal Selector.}
+goal selector (see Section :ref:`TODO-9.2-Semantics`). If no selector is
+specified, the default selector (see Section
+:ref:`TODO-8.1.1-Setdefaultgoalselector`) is used.
+
+.. _tactic_invocation_grammar:
+
+  .. productionlist:: `sentence`
+     tactic_invocation : toplevel_selector : tactic.
+                       : |tactic .
+
+.. cmd:: Set Default Goal Selector @toplevel_selector.
+
+After using this command, the default selector – used when no selector
+is specified when applying a tactic – is set to the chosen value. The
+initial value is 1, hence the tactics are, by default, applied to the
+first goal. Using Set Default Goal Selector ‘‘all’’ will make is so
+that tactics are, by default, applied to every goal simultaneously.
+Then, to apply a tactic tac to the first goal only, you can write
+1:tac. Although more selectors are available, only ‘‘all’’ or a single
+natural number are valid default goal selectors.
+
+.. cmd:: Test Default Goal Selector.
+
 This command displays the current default selector.
 
-\subsection{Bindings list
-\index{Binding list}
-\label{Binding-list}}
-
-Tactics that take a term as argument may also support a bindings list, so
-as to instantiate some parameters of the term by name or position.
-The general form of a term equipped with a bindings list is {\tt
-{\term} with {\bindinglist}} where {\bindinglist} may be of two
-different forms:
-
-\begin{itemize}
-\item In a bindings list of the form {\tt (\vref$_1$ := \term$_1$)
-  \dots\ (\vref$_n$ := \term$_n$)}, {\vref} is either an {\ident} or a
-  {\num}. The references are determined according to the type of
-  {\term}. If \vref$_i$ is an identifier, this identifier has to be
-  bound in the type of {\term} and the binding provides the tactic
-  with an instance for the parameter of this name.  If \vref$_i$ is
-  some number $n$, this number denotes the $n$-th non dependent
-  premise of the {\term}, as determined by the type of {\term}.
-
-  \ErrMsg \errindex{No such binder}
-
-\item A bindings list can also be a simple list of terms {\tt
-  \term$_1$ \dots\ \term$_n$}. In that case the references to
-  which these terms correspond are determined by the tactic. In case
-  of {\tt induction}, {\tt destruct}, {\tt elim} and {\tt case} (see
-  Section~\ref{elim}) the terms have to provide instances for all the
-  dependent products in the type of \term\ while in the case of {\tt
-  apply}, or of {\tt constructor} and its variants, only instances for
-  the dependent products that are not bound in the conclusion of the
-  type are required.
-
-  \ErrMsg \errindex{Not the right number of missing arguments}
-\end{itemize}
-
-\subsection{Occurrences sets and occurrences clauses}
-\label{Occurrences_clauses}
-\index{Occurrences clauses}
+.. _bindingslist:
+
+Bindings list
+~~~~~~~~~~~~~~~~~~~
+
+Tactics that take a term as argument may also support a bindings list,
+so as to instantiate some parameters of the term by name or position.
+The general form of a term equipped with a bindings list is ``term with
+bindings_list`` where ``bindings_list`` may be of two different forms:
+
+.. _bindings_list_grammar:
+
+  .. productionlist:: `bindings_list`
+     bindings_list : (ref := `term`) ... (ref := `term`)
+                   : `term` ... `term`
+
++ In a bindings list of the form :n:`{* (ref:= term)}`, :n:`ref` is either an
+  :n:`@ident` or a :n:`@num`. The references are determined according to the type of
+  ``term``. If :n:`ref` is an identifier, this identifier has to be bound in the
+  type of ``term`` and the binding provides the tactic with an instance for the
+  parameter of this name. If :n:`ref` is some number ``n``, this number denotes
+  the ``n``-th non dependent premise of the ``term``, as determined by the type
+  of ``term``.
+
+  .. exn:: No such binder
+
++ A bindings list can also be a simple list of terms :n:`{* term}`.
+  In that case the references to which these terms correspond are
+  determined by the tactic. In case of ``induction``, ``destruct``, ``elim``
+  and ``case`` (see :ref:`TODO-9-Thetacticlanguage`) the terms have to
+  provide instances for all the dependent products in the type of term while in
+  the case of ``apply``, or of ``constructor`` and its variants, only instances
+  for the dependent products that are not bound in the conclusion of the type
+  are required.
+
+  .. exn:: Not the right number of missing arguments.
+
+.. _occurencessets:
+
+Occurrences sets and occurrences clauses
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 An occurrences clause is a modifier to some tactics that obeys the
 following syntax:
 
-\begin{tabular}{lcl}
-{\occclause} & ::= & {\tt in} {\occgoalset} \\
-{\occgoalset} & ::= &
-    \zeroonelax{{\ident$_1$} \zeroone{\atoccurrences} {\tt ,} \\
-&   & {\dots} {\tt ,}\\
-&   & {\ident$_m$} \zeroone{\atoccurrences}}\\
-&   & \zeroone{{\tt |-} \zeroone{{\tt *} \zeroone{\atoccurrences}}}\\
-& | &
-    {\tt *} {\tt |-} \zeroone{{\tt *} \zeroone{\atoccurrences}}\\
-& | &
-    {\tt *}\\
-{\atoccurrences} & ::= & {\tt at} {\occlist}\\
-{\occlist} & ::= & \zeroone{{\tt -}} {\num$_1$} \dots\ {\num$_n$}
-\end{tabular}
-
-The role of an occurrence clause is to select a set of occurrences of
-a {\term} in a goal. In the first case, the {{\ident$_i$}
-\zeroone{{\tt at} {\num$_1^i$} \dots\ {\num$_{n_i}^i$}}} parts
-indicate that occurrences have to be selected in the hypotheses named
-{\ident$_i$}.  If no numbers are given for hypothesis {\ident$_i$},
-then all the occurrences of {\term} in the hypothesis are selected. If
-numbers are given, they refer to occurrences of {\term} when the term
-is printed using option {\tt Set Printing All} (see
-Section~\ref{SetPrintingAll}), counting from left to right. In
-particular, occurrences of {\term} in implicit arguments (see
-Section~\ref{Implicit Arguments}) or coercions (see
-Section~\ref{Coercions}) are counted.
-
-If a minus sign is given between {\tt at} and the list of occurrences,
-it negates the condition so that the clause denotes all the occurrences except
-the ones explicitly mentioned after the minus sign.
-
-As an exception to the left-to-right order, the occurrences in the
-{\tt return} subexpression of a {\tt match} are considered {\em
-before} the occurrences in the matched term.
-
-In the second case, the {\tt *} on the left of {\tt |-} means that
-all occurrences of {\term} are selected in every hypothesis.
-
-In the first and second case, if {\tt *} is mentioned on the right of
-{\tt |-}, the occurrences of the conclusion of the goal have to be
-selected. If some numbers are given, then only the occurrences denoted
-by these numbers are selected. In no numbers are given, all
-occurrences of {\term} in the goal are selected.
-
-Finally, the last notation is an abbreviation for {\tt * |- *}. Note
-also that {\tt |-} is optional in the first case when no {\tt *} is
-given.
-
-Here are some tactics that understand occurrences clauses:
-{\tt set}, {\tt remember}, {\tt induction}, {\tt destruct}.
-
-\SeeAlso~Sections~\ref{tactic:set}, \ref{Tac-induction}, \ref{SetPrintingAll}.
-
-\section{Applying theorems}
-
-\subsection{\tt exact \term}
-\tacindex{exact}
-\label{exact}
+.. _tactic_occurence_grammar:
+
+  .. productionlist:: `sentence`
+     occurence_clause : in `goal_occurences`
+     goal_occurences : [ident [`at_occurences`], ... , ident [`at_occurences`] [|- [* [`at_occurences`]]]]
+                      :| * |- [* [`at_occurences`]]
+                      :| *
+     at_occurrences : at `occurrences`
+     occurences     : [-] `num` ... `num`
+
+The role of an occurrence clause is to select a set of occurrences of a term in
+a goal. In the first case, the :n:`@ident {? at {* num}}` parts indicate that
+occurrences have to be selected in the hypotheses named :n:`@ident`. If no numbers
+are given for hypothesis :n:`@ident`, then all the occurrences of `term` in the
+hypothesis are selected. If numbers are given, they refer to occurrences of
+`term` when the term is printed using option ``Set Printing All`` (see
+:ref:`TODO-2.9-Printingconstructionsinfull`), counting from left to right. In
+particular, occurrences of `term` in implicit arguments (see
+:ref:`TODO-2.7-Implicitarguments`) or coercions (see :ref:`TODO-2.8-Coercions`)
+are counted.
+
+If a minus sign is given between at and the list of occurrences, it
+negates the condition so that the clause denotes all the occurrences
+except the ones explicitly mentioned after the minus sign.
+
+As an exception to the left-to-right order, the occurrences in
+thereturn subexpression of a match are considered *before* the
+occurrences in the matched term.
+
+In the second case, the ``*`` on the left of ``|-`` means that all occurrences
+of term are selected in every hypothesis.
+
+In the first and second case, if ``*`` is mentioned on the right of ``|-``, the
+occurrences of the conclusion of the goal have to be selected. If some numbers
+are given, then only the occurrences denoted by these numbers are selected. If
+no numbers are given, all occurrences of :n:`@term` in the goal are selected.
+
+Finally, the last notation is an abbreviation for ``* |- *``. Note also
+that ``|-`` is optional in the first case when no ``*`` is given.
+
+Here are some tactics that understand occurrences clauses: ``set``, ``remember``
+, ``induction``, ``destruct``.
+
+
+See also: :ref:`TODO-8.3.7-Managingthelocalcontext`,
+:ref:`TODO-8.5.2-Caseanalysisandinduction`,
+:ref:`TODO-2.9-Printingconstructionsinfull`.
+
+
+Applying theorems
+---------------------
+
+.. tacn:: exact @term
+   :name: exact
 
 This tactic applies to any goal. It gives directly the exact proof
-term of the goal. Let {\T} be our goal, let {\tt p} be a term of type
-{\tt U} then {\tt exact p} succeeds iff {\tt T} and {\tt U} are
-convertible (see Section~\ref{conv-rules}).
-
-\begin{ErrMsgs}
-\item \errindex{Not an exact proof}
-\end{ErrMsgs}
-
-\begin{Variants}
-  \item \texttt{eexact \term}\tacindex{eexact}
-
-    This tactic behaves like \texttt{exact} but is able to handle terms
-    and goals with meta-variables.
-
-\end{Variants}
-
-\subsection{\tt assumption}
-\tacindex{assumption}
-
-This tactic looks in the local context for an
-hypothesis which type is equal to the goal.  If it is the case, the
-subgoal is proved. Otherwise, it fails.
-
-\begin{ErrMsgs}
-\item  \errindex{No such assumption}
-\end{ErrMsgs}
-
-\begin{Variants}
-\tacindex{eassumption}
-  \item \texttt{eassumption}
-
-    This tactic behaves like \texttt{assumption} but is able to handle
-    goals with meta-variables.
-
-\end{Variants}
-
-\subsection{\tt refine \term}
-\tacindex{refine}
-\label{refine}
-\label{refine-example}
-\index{?@{\texttt{?}}}
-
-This tactic applies to any goal. It behaves like {\tt exact} with a big
-difference: the user can leave some holes (denoted by \texttt{\_} or
-{\tt (\_:\type)}) in the term. {\tt refine} will generate as
-many subgoals as there are holes in the term. The type of holes must be
-either synthesized by the system or declared by an
-explicit cast like \verb|(_:nat->Prop)|. Any subgoal that occurs in other
-subgoals is automatically shelved, as if calling {\tt shelve\_unifiable}
-(see Section~\ref{shelve}).
-This low-level tactic can be useful to advanced users.
-
-\Example
-
-\begin{coq_example*}
-Inductive Option : Set :=
-  | Fail : Option
-  | Ok : bool -> Option.
-\end{coq_example}
-\begin{coq_example}
-Definition get : forall x:Option, x <> Fail -> bool.
-refine
- (fun x:Option =>
-    match x return x <> Fail -> bool with
-    | Fail => _
-    | Ok b => fun _ => b
-    end).
-intros; absurd (Fail = Fail); trivial.
-\end{coq_example}
-\begin{coq_example*}
-Defined.
-\end{coq_example*}
-
-\begin{ErrMsgs}
-\item \errindex{invalid argument}:
-  the tactic \texttt{refine} does not know what to do
-  with the term you gave.
-\item \texttt{Refine passed ill-formed term}: the term you gave is not
-  a valid proof (not easy to debug in general).
-  This message may also occur in higher-level tactics that call
-  \texttt{refine} internally.
-\item \errindex{Cannot infer a term for this placeholder}:
-  there is a hole in the term you gave
-  which type cannot be inferred. Put a cast around it.
-\end{ErrMsgs}
-
-\begin{Variants}
-\item {\tt simple refine \term}\tacindex{simple refine}
-
-  This tactic behaves like {\tt refine}, but it does not shelve any
-  subgoal. It does not perform any beta-reduction either.
-\item {\tt notypeclasses refine \term}\tacindex{notypeclasses refine}
-
-  This tactic behaves like {\tt refine} except it performs typechecking
-  without resolution of typeclasses.
-
-\item {\tt simple notypeclasses refine \term}\tacindex{simple
-    notypeclasses refine}
-
-  This tactic behaves like {\tt simple refine} except it performs typechecking
-  without resolution of typeclasses.
-\end{Variants}
-
-\subsection{\tt apply \term}
-\tacindex{apply}
-\label{apply}
-\label{eapply}
-
-This tactic applies to any goal.  The argument {\term} is a term
-well-formed in the local context.  The tactic {\tt apply} tries to
-match the current goal against the conclusion of the type of {\term}.
-If it succeeds, then the tactic returns as many subgoals as the number
-of non-dependent premises of the type of {\term}. If the conclusion of
-the type of {\term} does not match the goal {\em and} the conclusion
-is an inductive type isomorphic to a tuple type, then each component
-of the tuple is recursively matched to the goal in the left-to-right
-order.
-
-The tactic {\tt apply} relies on first-order unification with
-dependent types unless the conclusion of the type of {\term} is of the
-form {\tt ($P$ $t_1$ \dots\ $t_n$)} with $P$ to be instantiated.  In
-the latter case, the behavior depends on the form of the goal. If the
-goal is of the form {\tt (fun $x$ => $Q$)~$u_1$~\ldots~$u_n$} and the
-$t_i$ and $u_i$ unifies, then $P$ is taken to be {\tt (fun $x$ => $Q$)}.
-Otherwise, {\tt apply} tries to define $P$ by abstracting over
-$t_1$~\ldots ~$t_n$ in the goal. See {\tt pattern} in
-Section~\ref{pattern} to transform the goal so that it gets the form
-{\tt (fun $x$ => $Q$)~$u_1$~\ldots~$u_n$}.
-
-\begin{ErrMsgs}
-\item \errindex{Unable to unify \dots\ with \dots}
-
-  The {\tt apply}
-  tactic failed to match the conclusion of {\term} and the current goal.
-  You can help the {\tt apply} tactic by transforming your
-  goal with the {\tt change} or {\tt pattern} tactics (see
-  sections~\ref{pattern},~\ref{change}).
-
-\item \errindex{Unable to find an instance for the variables
-{\ident} \dots\ {\ident}}
-
-  This occurs when some instantiations of the premises of {\term} are not
-  deducible from the unification. This is the case, for instance, when
-  you want to apply a transitivity property. In this case, you have to
-  use one of the variants below:
-
-\end{ErrMsgs}
-
-\begin{Variants}
-
-\item{\tt apply {\term} with {\term$_1$} \dots\ {\term$_n$}}
-  \tacindex{apply \dots\ with}
-
-  Provides {\tt apply} with explicit instantiations for all dependent
-  premises of the type of {\term} that do not occur in the conclusion
-  and consequently cannot be found by unification. Notice that
-  {\term$_1$} \mbox{\dots} {\term$_n$} must be given according to the order
-  of these dependent premises of the type of {\term}.
-
-  \ErrMsg \errindex{Not the right number of missing arguments}
-
-\item{\tt apply {\term} with ({\vref$_1$} := {\term$_1$}) \dots\ ({\vref$_n$}
-    := {\term$_n$})}
-
-  This also provides {\tt apply} with values for instantiating
-  premises. Here, variables are referred by names and non-dependent
-  products by increasing numbers (see syntax in Section~\ref{Binding-list}).
-
-\item {\tt apply \term$_1$ , \mbox{\dots} , \term$_n$}
-
-  This is a shortcut for {\tt apply} {\term$_1$} {\tt ; [ ..~|}
-   \ldots~{\tt ; [ ..~| {\tt apply} {\term$_n$} ]} \ldots~{\tt ]}, i.e. for the
-   successive applications of {\term$_{i+1}$} on the last subgoal
-   generated by {\tt apply} {\term$_i$}, starting from the application
-   of {\term$_1$}.
-
-\item {\tt eapply \term}\tacindex{eapply}
-
-  The tactic {\tt eapply} behaves like {\tt apply} but it does not fail
-  when no instantiations are deducible for some variables in the
-  premises. Rather, it turns these variables into
-  existential variables which are variables still to instantiate (see
-  Section~\ref{evars}). The instantiation is intended to be found
-  later in the proof.
-
-\item {\tt simple apply {\term}} \tacindex{simple apply}
-
-  This behaves like {\tt apply} but it reasons modulo conversion only
-  on subterms that contain no variables to instantiate. For instance,
-  the following example does not succeed because it would require the
-  conversion of {\tt id ?foo} and {\tt O}.
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-\begin{coq_example*}
-Definition id (x : nat) := x.
-Hypothesis H : forall y, id y = y.
-Goal O = O.
-\end{coq_example*}
-\begin{coq_example}
-Fail simple apply H.
-\end{coq_example}
-
-  Because it reasons modulo a limited amount of conversion, {\tt
-  simple apply} fails quicker than {\tt apply} and it is then
-  well-suited for uses in used-defined tactics that backtrack often.
-  Moreover, it does not traverse tuples as {\tt apply} does.
-
-\item \zeroone{{\tt simple}} {\tt apply} {\term$_1$} \zeroone{{\tt with}
-  {\bindinglist$_1$}} {\tt ,} \ldots {\tt ,} {\term$_n$} \zeroone{{\tt with}
-  {\bindinglist$_n$}}\\
-  \zeroone{{\tt simple}} {\tt eapply} {\term$_1$} \zeroone{{\tt with}
-  {\bindinglist$_1$}} {\tt ,} \ldots {\tt ,} {\term$_n$} \zeroone{{\tt with}
-  {\bindinglist$_n$}}
-
-  This summarizes the different syntaxes for {\tt apply} and {\tt eapply}.
-
-\item {\tt lapply {\term}} \tacindex{lapply}
-
-  This tactic applies to any goal, say {\tt G}.  The argument {\term}
-  has to be well-formed in the current context, its type being
-  reducible to a non-dependent product {\tt A -> B} with {\tt B}
-  possibly containing products. Then it generates two subgoals {\tt
-  B->G} and {\tt A}. Applying {\tt lapply H} (where {\tt H} has type
-  {\tt A->B} and {\tt B} does not start with a product) does the same
-  as giving the sequence {\tt cut B. 2:apply H.} where {\tt cut} is
-  described below.
-
-  \Warning When {\term} contains more than one non
-  dependent product the tactic {\tt lapply} only takes into account the
-  first product.
-
-\end{Variants}
-
-\Example
-Assume we have a transitive relation {\tt R} on {\tt nat}:
-\label{eapply-example}
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-\begin{coq_example*}
-Variable R : nat -> nat -> Prop.
-Hypothesis Rtrans : forall x y z:nat, R x y -> R y z -> R x z.
-Variables n m p : nat.
-Hypothesis Rnm : R n m.
-Hypothesis Rmp : R m p.
-\end{coq_example*}
-
-Consider the goal {\tt (R n p)} provable using the transitivity of
-{\tt R}:
-
-\begin{coq_example*}
-Goal R n p.
-\end{coq_example*}
-
-The direct application of {\tt Rtrans} with {\tt apply} fails because
-no value for {\tt y} in {\tt Rtrans} is found by {\tt apply}:
-
-%\begin{coq_eval}
-%Set Printing Depth 50.
-%(********** The following is not correct and should produce **********)
-%(**** Error: generated subgoal (R n ?17) has metavariables in it *****)
-%\end{coq_eval}
-\begin{coq_example}
-Fail apply Rtrans.
-\end{coq_example}
-
-A solution is to apply {\tt (Rtrans n m p)} or {\tt (Rtrans n m)}.
-
-\begin{coq_example}
-apply (Rtrans n m p).
-\end{coq_example}
-
-\begin{coq_eval}
-Undo.
-\end{coq_eval}
-
-Note that {\tt n} can be inferred from the goal, so the following would
-work too.
-
-\begin{coq_example*}
-apply (Rtrans _ m).
-\end{coq_example*}
-\begin{coq_eval}
-Undo.
-\end{coq_eval}
-
-More elegantly, {\tt apply Rtrans with (y:=m)} allows only mentioning
-the unknown {\tt m}:
-
-\begin{coq_example*}
-apply Rtrans with (y := m).
-\end{coq_example*}
-\begin{coq_eval}
-Undo.
-\end{coq_eval}
-
-Another solution is to mention the proof of {\tt (R x y)} in {\tt
-Rtrans} \ldots
-
-\begin{coq_example}
-apply Rtrans with (1 := Rnm).
-\end{coq_example}
-\begin{coq_eval}
-Undo.
-\end{coq_eval}
-
-\ldots or the proof of {\tt (R y z)}.
-
-\begin{coq_example}
-apply Rtrans with (2 := Rmp).
-\end{coq_example}
-\begin{coq_eval}
-Undo.
-\end{coq_eval}
-
-On the opposite, one can use {\tt eapply} which postpones the problem
-of finding {\tt m}. Then one can apply the hypotheses {\tt Rnm} and {\tt
-Rmp}. This instantiates the existential variable and completes the proof.
-
-\begin{coq_example}
-eapply Rtrans.
-apply Rnm.
-apply Rmp.
-\end{coq_example}
-
-\begin{coq_eval}
-Reset R.
-\end{coq_eval}
-
-\noindent {\bf Remark: } When the conclusion of the type of the term
-to apply is an inductive type isomorphic to a tuple type and {\em apply}
-looks recursively whether a component of the tuple matches the goal,
-it excludes components whose statement would result in applying an
-universal lemma of the form {\tt forall A, ... -> A}. Excluding this
-kind of lemma can be avoided by setting the following option:
-
-\begin{quote}
-\optindex{Universal Lemma Under Conjunction}
-{\tt Set Universal Lemma Under Conjunction}
-\end{quote}
-
-This option, which preserves compatibility with versions of {\Coq}
-prior to 8.4 is also available for {\tt apply {\term} in {\ident}}
-(see Section~\ref{apply-in}).
-
-\subsection{\tt apply {\term} in {\ident}}
-\label{apply-in}
-\tacindex{apply \dots\ in}
-
-This tactic applies to any goal.  The argument {\term} is a term
-well-formed in the local context and the argument {\ident} is an
-hypothesis of the context.  The tactic {\tt apply {\term} in {\ident}}
-tries to match the conclusion of the type of {\ident} against a
-non-dependent premise of the type of {\term}, trying them from right to
-left.  If it succeeds, the statement of hypothesis {\ident} is
-replaced by the conclusion of the type of {\term}. The tactic also
-returns as many subgoals as the number of other non-dependent premises
-in the type of {\term} and of the non-dependent premises of the type
-of {\ident}.  If the conclusion of the type of {\term} does not match
-the goal {\em and} the conclusion is an inductive type isomorphic to a
-tuple type, then the tuple is (recursively) decomposed and the first
-component of the tuple of which a non-dependent premise matches the
-conclusion of the type of {\ident}. Tuples are decomposed in a
-width-first left-to-right order (for instance if the type of {\tt H1}
-is a \verb=A <-> B= statement, and the type of {\tt H2} is \verb=A=
-then {\tt apply H1 in H2} transforms the type of {\tt H2} into {\tt
-  B}). The tactic {\tt apply} relies on first-order pattern-matching
-with dependent types.
-
-\begin{ErrMsgs}
-\item \errindex{Statement without assumptions}
-
-This happens if the type of {\term} has no non dependent premise.
-
-\item \errindex{Unable to apply}
-
-This happens if the conclusion of {\ident} does not match any of the
-non dependent premises of the type of {\term}.
-\end{ErrMsgs}
-
-\begin{Variants}
-\item {\tt apply \nelist{\term}{,} in {\ident}}
-
-This applies each of {\term} in sequence in {\ident}.
+term of the goal. Let ``T`` be our goal, let ``p`` be a term of type ``U`` then
+``exact p`` succeeds iff ``T`` and ``U`` are convertible (see
+:ref:`TODO-4.3-Conversionrules`).
+
+.. exn:: Not an exact proof.
+
+.. tacv:: eexact @term.
+
+This tactic behaves like exact but is able to handle terms and goals with
+meta-variables.
+
+.. tacn:: assumption
+   :name: assumption
+
+This tactic looks in the local context for an hypothesis which type is equal to
+the goal. If it is the case, the subgoal is proved. Otherwise, it fails.
+
+.. exn:: No such assumption.
+
+.. tacv:: eassumption
+
+This tactic behaves like assumption but is able to handle goals with
+meta-variables.
+
+.. tacn:: refine @term
+   :name: refine
+
+This tactic applies to any goal. It behaves like exact with a big
+difference: the user can leave some holes (denoted by ``_`` or``(_:type)``) in
+the term. refine will generate as many subgoals as there are holes in
+the term. The type of holes must be either synthesized by the system
+or declared by an explicit cast like ``(_:nat->Prop)``. Any subgoal that
+occurs in other subgoals is automatically shelved, as if calling
+shelve_unifiable (see Section 8.17.4). This low-level tactic can be
+useful to advanced users.
+
+.. example::
+  .. coqtop:: reset all
+
+     Inductive Option : Set :=
+     | Fail : Option
+     | Ok : bool -> Option.
+
+     Definition get : forall x:Option, x <> Fail -> bool.
+
+     refine
+       (fun x:Option =>
+          match x return x <> Fail -> bool with
+          | Fail => _
+          | Ok b => fun _ => b
+          end).
+
+     intros; absurd (Fail = Fail); trivial.
+
+     Defined.
+
+.. exn:: invalid argument
+
+   The tactic ``refine`` does not know what to do with the term you gave.
+
+.. exn:: Refine passed ill-formed term
+
+   The term you gave is not a valid proof (not easy to debug in general). This
+   message may also occur in higher-level tactics that call ``refine``
+   internally.
+
+.. exn:: Cannot infer a term for this placeholder
+
+   There is a hole in the term you gave which type cannot be inferred. Put a
+   cast around it.
+
+.. tacv:: simple refine @term
+
+   This tactic behaves like refine, but it does not shelve any subgoal. It does
+   not perform any beta-reduction either.
+
+.. tacv:: notypeclasses refine @term
+
+   This tactic behaves like ``refine`` except it performs typechecking without
+   resolution of typeclasses.
+
+.. tacv:: simple notypeclasses refine @term
+
+   This tactic behaves like ``simple refine`` except it performs typechecking
+   without resolution of typeclasses.
+
+.. tacv:: apply @term
+   :name: apply
+
+This tactic applies to any goal. The argument term is a term well-formed in the
+local context. The tactic apply tries to match the current goal against the
+conclusion of the type of term. If it succeeds, then the tactic returns as many
+subgoals as the number of non-dependent premises of the type of term. If the
+conclusion of the type of term does not match the goal *and* the conclusion is
+an inductive type isomorphic to a tuple type, then each component of the tuple
+is recursively matched to the goal in the left-to-right order.
+
+The tactic ``apply`` relies on first-order unification with dependent types
+unless the conclusion of the type of ``term`` is of the form :g:`P (t`:sub:`1`
+:g:`...` :g:`t`:sub:`n` :g:`)` with `P` to be instantiated. In the latter case, the behavior
+depends on the form of the goal. If the goal is of the form
+:g:`(fun x => Q) u`:sub:`1` :g:`...` :g:`u`:sub:`n` and the :g:`t`:sub:`i` and
+:g:`u`:sub:`i` unifies, then :g:`P` is taken to be :g:`(fun x => Q)`. Otherwise,
+``apply`` tries to define :g:`P` by abstracting over :g:`t`:sub:`1`  :g:`...`
+:g:`t`:sub:`n` in the goal. See :tacn:`pattern` to transform the goal so that it
+gets the form :g:`(fun x => Q) u`:sub:`1` :g:`...`  :g:`u`:sub:`n`.
+
+.. exn:: Unable to unify ... with ... .
+
+The apply tactic failed to match the conclusion of term and the current goal.
+You can help the apply tactic by transforming your goal with the
+:ref:`change <change_term>` or :tacn:`pattern` tactics.
+
+.. exn:: Unable to find an instance for the variables {+ @ident}.
+
+This occurs when some instantiations of the premises of term are not deducible
+from the unification. This is the case, for instance, when you want to apply a
+transitivity property. In this case, you have to use one of the variants below:
+
+.. cmd:: apply @term with {+ @term}
+
+Provides apply with explicit instantiations for all dependent premises of the
+type of term that do not occur in the conclusion and consequently cannot be
+found by unification. Notice that the collection :n:`{+ @term}` must be given
+according to the order of these dependent premises of the type of term.
+
+.. exn:: Not the right number of missing arguments.
+
+.. tacv:: apply @term with @bindings_list
+
+This also provides apply with values for instantiating premises. Here, variables
+are referred by names and non-dependent products by increasing numbers (see
+:ref:`bindings list <bindingslist>`).
+
+.. tacv:: apply {+, @term}
+
+This is a shortcut for ``apply term``:sub:`1`
+``; [.. | ... ; [ .. | apply`` ``term``:sub:`n` ``] ... ]``,
+i.e. for the successive applications of ``term``:sub:`i+1` on the last subgoal
+generated by ``apply term``:sub:`i` , starting from the application of
+``term``:sub:`1`.
+
+.. tacv:: eapply @term
+   :name: eapply
+
+The tactic ``eapply`` behaves like ``apply`` but it does not fail when no
+instantiations are deducible for some variables in the premises. Rather, it
+turns these variables into existential variables which are variables still to
+instantiate (see :ref:`TODO-2.11-ExistentialVariables`). The instantiation is
+intended to be found later in the proof.
+
+.. tacv:: simple apply @term.
+
+This behaves like ``apply`` but it reasons modulo conversion only on subterms
+that contain no variables to instantiate. For instance, the following example
+does not succeed because it would require the conversion of ``id ?foo`` and
+``O``.
+
+.. example::
+
+   .. coqtop:: all
+
+      Definition id (x : nat) := x.
+      Hypothesis H : forall y, id y = y.
+      Goal O = O.
+      Fail simple apply H.
+
+Because it reasons modulo a limited amount of conversion, ``simple apply`` fails
+quicker than ``apply`` and it is then well-suited for uses in user-defined
+tactics that backtrack often. Moreover, it does not traverse tuples as ``apply``
+does.
+
+.. tacv:: {? simple} apply {+, @term {? with @bindings_list}}
+.. tacv:: {? simple} eapply {+, @term {? with @bindings_list}}
+
+This summarizes the different syntaxes for ``apply`` and ``eapply``.
+
+.. tacv:: lapply @term
+   :name: `lapply
+
+This tactic applies to any goal, say :g:`G`. The argument term has to be
+well-formed in the current context, its type being reducible to a non-dependent
+product :g:`A -> B` with :g:`B` possibly containing products. Then it generates
+two subgoals :g:`B->G` and :g:`A`. Applying ``lapply H`` (where :g:`H` has type
+:g:`A->B` and :g:`B` does not start with a product) does the same as giving the
+sequence ``cut B. 2:apply H.`` where ``cut`` is described below.
+
+.. warn:: When @term contains more than one non dependent product the tactic lapply only takes into account the first product.
+
+.. example::
+   Assume we have a transitive relation ``R`` on ``nat``:
+
+   .. coqtop:: reset in
+
+      Variable R : nat -> nat -> Prop.
+
+      Hypothesis Rtrans : forall x y z:nat, R x y -> R y z -> R x z.
+
+      Variables n m p : nat.
+
+      Hypothesis Rnm : R n m.
+
+      Hypothesis Rmp : R m p.
+
+   Consider the goal ``(R n p)`` provable using the transitivity of ``R``:
+
+   .. coqtop:: in
+
+      Goal R n p.
+
+   The direct application of ``Rtrans`` with ``apply`` fails because no value
+   for ``y`` in ``Rtrans`` is found by ``apply``:
+
+   .. coqtop:: all
+
+      Fail apply Rtrans.
+
+   A solution is to ``apply (Rtrans n m p)`` or ``(Rtrans n m)``.
+
+   .. coqtop:: all undo
+
+      apply (Rtrans n m p).
+
+   Note that ``n`` can be inferred from the goal, so the following would work
+   too.
+
+   .. coqtop:: in undo
+
+      apply (Rtrans _ m).
+
+   More elegantly, ``apply Rtrans with (y:=m)`` allows only mentioning the
+   unknown m:
+
+   .. coqtop:: in undo
+
+      apply Rtrans with (y := m).
+
+   Another solution is to mention the proof of ``(R x y)`` in ``Rtrans``
+
+   .. coqtop:: all undo
+
+      apply Rtrans with (1 := Rnm).
+
+   ... or the proof of ``(R y z)``.
+
+   .. coqtop:: all undo
+
+      apply Rtrans with (2 := Rmp).
+
+   On the opposite, one can use ``eapply`` which postpones the problem of
+   finding ``m``. Then one can apply the hypotheses ``Rnm`` and ``Rmp``. This
+   instantiates the existential variable and completes the proof.
+
+   .. coqtop:: all
 
-\item {\tt apply \nelist{{\term} with {\bindinglist}}{,} in {\ident}}
+      eapply Rtrans.
 
-This does the same but uses the bindings in each {\bindinglist} to
-instantiate the parameters of the corresponding type of {\term}
-(see syntax of bindings in Section~\ref{Binding-list}).
-
-\item {\tt eapply \nelist{{\term} with {\bindinglist}}{,} in {\ident}}
-\tacindex{eapply \dots\ in}
+      apply Rnm.
 
-This works as {\tt apply \nelist{{\term} with {\bindinglist}}{,} in
-{\ident}} but turns unresolved bindings into existential variables, if
-any, instead of failing.
+      apply Rmp.
 
-\item {\tt apply \nelist{{\term} with {\bindinglist}}{,} in {\ident} as {\intropattern}}
+.. note::
+   When the conclusion of the type of the term to ``apply`` is an inductive
+   type isomorphic to a tuple type and ``apply`` looks recursively whether a
+   component of the tuple matches the goal, it excludes components whose
+   statement would result in applying an universal lemma of the form
+   ``forall A, ... -> A``. Excluding this kind of lemma can be avoided by
+   setting the following option:
 
-This works as {\tt apply \nelist{{\term} with {\bindinglist}}{,} in
-{\ident}} then applies the {\intropattern} to the hypothesis {\ident}.
+.. opt:: Set Universal Lemma Under Conjunction.
 
-\item {\tt eapply \nelist{{\term} with {\bindinglist}}{,} in {\ident} as {\intropattern}}
+   This option, which preserves compatibility with versions of Coq prior to
+   8.4 is also available for :n:`apply @term in @ident` (see :tacn:`apply ... in`).
 
-This works as {\tt apply \nelist{{\term} with {\bindinglist}}{,} in {\ident} as {\intropattern}} but using {\tt eapply}.
+.. tacn:: apply @term in @ident
+   :name: apply ... in
 
-\item {\tt simple apply {\term} in {\ident}}
-\tacindex{simple apply \dots\ in}
-\tacindex{simple eapply \dots\ in}
+   This tactic applies to any goal. The argument ``term`` is a term well-formed in
+   the local context and the argument :n:`@ident` is an hypothesis of the context.
+   The tactic ``apply term in ident`` tries to match the conclusion of the type
+   of :n:`@ident` against a non-dependent premise of the type of ``term``, trying
+   them from right to left. If it succeeds, the statement of hypothesis
+   :n:`@ident` is replaced by the conclusion of the type of ``term``. The tactic
+   also returns as many subgoals as the number of other non-dependent premises
+   in the type of ``term`` and of the non-dependent premises of the type of
+   :n:`@ident`. If the conclusion of the type of ``term`` does not match the goal
+   *and* the conclusion is an inductive type isomorphic to a tuple type, then
+   the tuple is (recursively) decomposed and the first component of the tuple
+   of which a non-dependent premise matches the conclusion of the type of
+   :n:`@ident`. Tuples are decomposed in a width-first left-to-right order (for
+   instance if the type of :g:`H1` is a :g:`A <-> B` statement, and the type of
+   :g:`H2` is :g:`A` then ``apply H1 in H2`` transforms the type of :g:`H2`
+   into :g:`B`). The tactic ``apply`` relies on first-order pattern-matching
+   with dependent types.
 
-This behaves like {\tt apply {\term} in {\ident}} but it reasons
-modulo conversion only on subterms that contain no variables to
-instantiate. For instance, if {\tt id := fun x:nat => x} and {\tt H :
-  forall y, id y = y -> True} and {\tt H0 :\ O = O} then {\tt simple
-  apply H in H0} does not succeed because it would require the
-conversion of {\tt id ?1234} and {\tt O} where {\tt ?1234} is a variable to
-instantiate.  Tactic {\tt simple apply {\term} in {\ident}} does not
-either traverse tuples as {\tt apply {\term} in {\ident}} does.
+.. exn:: Statement without assumptions.
 
-\item {\tt \zeroone{simple} apply \nelist{{\term} \zeroone{with {\bindinglist}}}{,} in {\ident} \zeroone{as {\intropattern}}}\\
-{\tt \zeroone{simple} eapply \nelist{{\term} \zeroone{with {\bindinglist}}}{,} in {\ident} \zeroone{as {\intropattern}}}
+   This happens if the type of ``term`` has no non dependent premise.
 
-This summarizes the different syntactic variants of {\tt apply {\term}
-  in {\ident}} and {\tt eapply {\term} in {\ident}}.
-\end{Variants}
+.. exn:: Unable to apply.
 
-\subsection{\tt constructor \num}
-\label{constructor}
-\tacindex{constructor}
+   This happens if the conclusion of :n:`@ident` does not match any of the non
+   dependent premises of the type of ``term``.
 
-This tactic applies to a goal such that its conclusion is
-an inductive type (say {\tt I}).  The argument {\num} must be less
-or equal to the numbers of constructor(s) of {\tt I}. Let {\tt ci} be
-the {\tt i}-th constructor of {\tt I}, then {\tt constructor i} is
-equivalent to {\tt intros; apply ci}.
+.. tacv:: apply {+, @term} in @ident
 
-\begin{ErrMsgs}
-\item \errindex{Not an inductive product}
-\item \errindex{Not enough constructors}
-\end{ErrMsgs}
+   This applies each of ``term`` in sequence in :n:`@ident`.
 
-\begin{Variants}
-\item \texttt{constructor}
+.. tacv:: apply {+, @term with @bindings_list} in @ident
 
-  This tries \texttt{constructor 1} then \texttt{constructor 2},
-  \dots\ , then \texttt{constructor} \textit{n} where \textit{n} is
-  the number of constructors of the head of the goal.
+   This does the same but uses the bindings in each :n:`(@id := @ val)` to
+   instantiate the parameters of the corresponding type of ``term`` (see
+   :ref:`bindings list <bindingslist>`).
 
-\item {\tt constructor \num~with} {\bindinglist}
+.. tacv:: eapply {+, @term with @bindings_list} in @ident
 
-  Let {\tt ci} be the {\tt i}-th constructor of {\tt I}, then {\tt
-    constructor i with \bindinglist} is equivalent to {\tt intros;
-    apply ci with \bindinglist}.
+   This works as :tacn:`apply ... in` but turns unresolved bindings into
+   existential variables, if any, instead of failing.
 
-  \Warning the terms in the \bindinglist\ are checked
-  in the context where {\tt constructor} is executed and not in the
-  context where {\tt apply} is executed (the introductions are not
-  taken into account).
+.. tacv:: apply {+, @term with @bindings_list} in @ident as @intro_pattern
+   :name: apply ... in ... as
 
-% To document?
-% \item {\tt constructor {\tactic}}
+   This works as :tacn:`apply ... in` then applies the
+   :n:`@intro_pattern` to the hypothesis :n:`@ident`.
 
-\item {\tt split}\tacindex{split}
+.. tacv:: eapply {+, @term with @bindings_list} in @ident as @intro_pattern.
 
-  This applies only if {\tt I} has a single constructor. It is then
-  equivalent to {\tt constructor 1}. It is typically used in the case
-  of a conjunction $A\land B$.
+   This works as :tacn:`apply ... in as`  but using ``eapply``.
 
-  \ErrMsg \errindex{Not an inductive goal with 1 constructor}
+.. tacv:: simple apply @term in @ident
 
-\item {\tt exists {\bindinglist}}\tacindex{exists}
+   This behaves like :tacn:`apply ... in` but it reasons modulo conversion only
+   on subterms that contain no variables to instantiate. For instance, if
+   :g:`id := fun x:nat => x` and :g:`H: forall y, id y = y -> True` and
+   :g:`H0 : O = O` then ``simple apply H in H0`` does not succeed because it
+   would require the conversion of :g:`id ?1234` and :g:`O` where :g:`?1234` is
+   a variable to instantiate. Tactic :n:`simple apply @term in @ident` does not
+   either traverse tuples as :n:`apply @term in @ident` does.
 
-  This applies only if {\tt I} has a single constructor. It is then
-  equivalent to {\tt intros; constructor 1 with \bindinglist}. It is
-  typically used in the case of an existential quantification $\exists
-  x, P(x)$.
+.. tacv:: {? simple} apply {+, @term {? with @bindings_list}} in @ident {? as @intro_pattern}
+.. tacv:: {? simple} eapply {+, @term {? with @bindings_list}} in @ident {? as @intro_pattern}
 
-  \ErrMsg \errindex{Not an inductive goal with 1 constructor}
+   This summarizes the different syntactic variants of :n:`apply @term in
+   @ident` and :n:`eapply @term in @ident`.
 
-\item {\tt exists \nelist{\bindinglist}{,}}
+.. tacn:: constructor @num
+   :name: constructor
 
-  This iteratively applies {\tt exists {\bindinglist}}.
+   This tactic applies to a goal such that its conclusion is an inductive
+   type (say :g:`I`). The argument :n:`@num` must be less or equal to the
+   numbers of constructor(s) of :g:`I`. Let :g:`c`:sub:`i` be the i-th
+   constructor of :g:`I`, then ``constructor i`` is equivalent to
+   ``intros; apply c``:sub:`i`.
 
-\item {\tt left}\tacindex{left}\\
-      {\tt right}\tacindex{right}
+.. exn:: Not an inductive product.
+.. exn:: Not enough constructors.
 
-  These tactics apply only if {\tt I} has two constructors, for instance
-  in the case of a
-  disjunction $A\lor B$. Then, they are respectively equivalent to {\tt
-    constructor 1} and {\tt constructor 2}.
+.. tacv:: constructor
 
-  \ErrMsg \errindex{Not an inductive goal with 2 constructors}
+   This tries :g:`constructor`:sub:`1` then :g:`constructor`:sub:`2`, ..., then
+   :g:`constructor`:sub:`n` where `n` is the number of constructors of the head
+   of the goal.
 
-\item {\tt left with \bindinglist}\\
-      {\tt right with \bindinglist}\\
-      {\tt split with \bindinglist}
+.. tacv:: constructor @num with @bindings_list
 
-  As soon as the inductive type has the right number of constructors,
-    these expressions are equivalent to calling {\tt
-    constructor $i$ with \bindinglist} for the appropriate $i$.
+   Let ``c`` be the i-th constructor of :g:`I`, then
+   :n:`constructor i with @bindings_list` is equivalent to
+   :n:`intros; apply c with @bindings_list`.
 
-\item \texttt{econstructor}\tacindex{econstructor}\\
-      \texttt{eexists}\tacindex{eexists}\\
-      \texttt{esplit}\tacindex{esplit}\\
-      \texttt{eleft}\tacindex{eleft}\\
-      \texttt{eright}\tacindex{eright}
-
-  These tactics and their variants behave like \texttt{constructor},
-  \texttt{exists}, \texttt{split}, \texttt{left}, \texttt{right} and
-  their variants but they introduce existential variables instead of
-  failing when the instantiation of a variable cannot be found (cf
-  \texttt{eapply} and Section~\ref{eapply-example}).
+ .. warn::
+    The terms in the @bindings_list are checked in the context where constructor is executed and not in the context where @apply is executed (the introductions are not taken into account).
 
-\end{Variants}
+.. tacv:: split
 
-\section{Managing the local context}
+   This applies only if :g:`I` has a single constructor. It is then
+   equivalent to :n:`constructor 1.`. It is typically used in the case of a
+   conjunction :g:`A` :math:`\wedge` :g:`B`.
 
-\subsection{\tt intro}
-\tacindex{intro}
-\label{intro}
+.. exn:: Not an inductive goal with 1 constructor.
 
-This tactic applies to a goal that is either a product or starts with
-a let binder. If the goal is a product, the tactic implements the
-``Lam''\index{Typing rules!Lam} rule given in
-Section~\ref{Typed-terms}\footnote{Actually, only the second subgoal will be
-generated since the other one can be automatically checked.}.  If the
-goal starts with a let binder, then the tactic implements a mix of the
-``Let''\index{Typing rules!Let} and ``Conv''\index{Typing rules!Conv}.
+.. tacv:: exists @val
 
-If the current goal is a dependent product $\forall x:T,~U$ (resp {\tt
-let $x$:=$t$ in $U$}) then {\tt intro} puts {\tt $x$:$T$} (resp {\tt $x$:=$t$})
- in the local context.
-% Obsolete (quantified names already avoid hypotheses names):
-% Otherwise, it puts
-% {\tt x}{\it n}{\tt :T} where {\it n} is such that {\tt x}{\it n} is a
-%fresh name.
-The new subgoal is $U$.
-% If the {\tt x} has been renamed {\tt x}{\it n} then it is replaced
-% by {\tt x}{\it n} in {\tt U}.
+   This applies only if :g:`I` has a single constructor. It is then equivalent
+   to :n:`intros; constructor 1 with @bindings_list.` It is typically used in
+   the case of an existential quantification :math:`\exists`:g:`x, P(x).`
 
-If the goal is a non-dependent product $T \to U$, then it puts
-in the local context either {\tt H}{\it n}{\tt :$T$} (if $T$ is of
-type {\tt Set} or {\tt Prop}) or {\tt X}{\it n}{\tt :$T$} (if the type
-of $T$ is {\tt Type}). The optional index {\it n} is such that {\tt
-H}{\it n} or {\tt X}{\it n} is a fresh identifier.
-In both cases, the new subgoal is $U$.
+.. exn:: Not an inductive goal with 1 constructor.
+
+.. tacv:: exists @bindings_list
+
+   This iteratively applies :n:`exists @bindings_list`.
+
+.. tacv:: left
+.. tacv:: right
+
+   These tactics apply only if :g:`I` has two constructors, for
+   instance in the case of a disjunction :g:`A` :math:`\vee` :g:`B`.
+   Then, they are respectively equivalent to ``constructor 1`` and
+   ``constructor 2``.
+
+.. exn:: Not an inductive goal with 2 constructors.
+
+.. tacv:: left with @bindings_list
+.. tacv:: right with @bindings_list
+.. tacv:: split with @bindings_list
+
+   As soon as the inductive type has the right number of constructors, these
+   expressions are equivalent to calling :n:`constructor i with @bindings_list`
+   for the appropriate ``i``.
+
+.. tacv:: econstructor
+.. tacv:: eexists
+.. tacv:: esplit
+.. tacv:: eleft
+.. tacv:: eright
+
+   These tactics and their variants behave like ``constructor``, ``exists``,
+   ``split``, ``left``, ``right`` and their variants but they introduce
+   existential variables instead of failing when the instantiation of a
+   variable cannot be found (cf. :tacn:`eapply` and :tacn:`apply`).
+
+
+.. _managingthelocalcontext:
+
+Managing the local context
+------------------------------
+
+.. tacn:: intro
+   :name: intro
+
+This tactic applies to a goal that is either a product or starts with a let
+binder. If the goal is a product, the tactic implements the "Lam" rule given in
+:ref:`TODO-4.2-Typing-rules` [1]_. If the goal starts with a let binder, then the
+tactic implements a mix of the "Let" and "Conv".
+
+If the current goal is a dependent product :math:`\forall` :g:`x:T, U` (resp
+:g:`let x:=t in U`) then ``intro`` puts :g:`x:T` (resp :g:`x:=t`) in the local
+context. The new subgoal is :g:`U`.
+
+If the goal is a non-dependent product :g:`T`:math:`\rightarrow`:g:`U`, then it
+puts in the local context either :g:`Hn:T` (if :g:`T` is of type :g:`Set` or
+:g:`Prop`) or Xn:T (if the type of :g:`T` is :g:`Type`). The optional index
+``n`` is such that ``Hn`` or ``Xn`` is a fresh identifier. In both cases, the
+new subgoal is :g:`U`.
 
 If the goal is neither a product nor starting with a let definition,
-the tactic {\tt intro} applies the tactic {\tt hnf} until the tactic
-{\tt intro} can be applied or the goal is not head-reducible.
+the tactic ``intro`` applies the tactic ``hnf`` until the tactic ``intro`` can
+be applied or the goal is not head-reducible.
+
+.. exn:: No product even after head-reduction.
+.. exn:: ident is already used.
+
+.. tacv:: intros
+
+   This repeats ``intro`` until it meets the head-constant. It never
+   reduces head-constants and it never fails.
+
+.. tac:: intro @ident
+
+   This applies ``intro`` but forces :n:`@ident` to be the name of the
+   introduced hypothesis.
+
+.. exn:: name @ident is already used
+
+.. note:: If a name used by intro hides the base name of a global
+   constant then the latter can still be referred to by a qualified name
+   (see :ref:`TODO-2.6.2-Qualified-names`).
+.. tacv:: intros {+ @ident}.
+
+   This is equivalent to the composed tactic
+   :n:`intro @ident; ... ; intro @ident`. More generally, the ``intros`` tactic
+   takes a pattern as argument in order to introduce names for components
+   of an inductive definition or to clear introduced hypotheses. This is
+   explained in :ref:`TODO-8.3.2`.
+
+.. tacv:: intros until @ident
+
+   This repeats intro until it meets a premise of the goal having form
+   `(@ident:term)` and discharges the variable named `ident` of the current
+   goal.
+
+.. exn:: No such hypothesis in current goal
+
+.. tacv:: intros until @num
+
+   This repeats intro until the `num`-th non-dependent product. For instance,
+   on the subgoal :g:`forall x y:nat, x=y -> y=x` the tactic
+   :n:`intros until 1` is equivalent to :n:`intros x y H`, as :g:`x=y -> y=x`
+   is the first non-dependent product. And on the subgoal :g:`forall x y
+   z:nat, x=y -> y=x` the tactic :n:`intros until 1` is equivalent to
+   :n:`intros x y z` as the product on :g:`z` can be rewritten as a
+   non-dependent product: :g:`forall x y:nat, nat -> x=y -> y=x`
 
-\begin{ErrMsgs}
-\item \errindex{No product even after head-reduction}
-\item \errindexbis{{\ident} is already used}{is already used}
-\end{ErrMsgs}
+.. exn:: No such hypothesis in current goal.
 
-\begin{Variants}
+   This happens when `num` is 0 or is greater than the number of non-dependent
+   products of the goal.
 
-\item {\tt intros}\tacindex{intros}
-
-  This repeats {\tt intro} until it meets the head-constant. It never reduces
-  head-constants and it never fails.
-
-\item {\tt intro {\ident}}
-
-  This applies {\tt intro} but forces {\ident} to be the name of the
-  introduced hypothesis.
-
-  \ErrMsg \errindex{name {\ident} is already used}
-
-  \Rem If a name used by {\tt intro} hides the base name of a global
-  constant then the latter can still be referred to by a qualified name
-  (see \ref{LongNames}).
-
-\item {\tt intros \ident$_1$ \dots\ \ident$_n$}
-
-  This is equivalent to the composed tactic {\tt intro \ident$_1$; \dots\ ;
-    intro \ident$_n$}.
-
-  More generally, the \texttt{intros} tactic takes a pattern as
-  argument in order to introduce names for components of an inductive
-  definition or to clear introduced hypotheses. This is explained
-  in~\ref{intros-pattern}.
-
-\item {\tt intros until {\ident}} \tacindex{intros until}
-
-  This repeats {\tt intro} until it meets a premise of the goal having form
-  {\tt (} {\ident}~{\tt :}~{\term} {\tt )} and discharges the variable
-  named {\ident} of the current goal.
-
-  \ErrMsg \errindex{No such hypothesis in current goal}
-
-\item {\tt intros until {\num}}  \tacindex{intros until}
-
-  This repeats {\tt intro} until the {\num}-th non-dependent product. For
-  instance, on the subgoal %
-  \verb+forall x y:nat, x=y -> y=x+ the tactic \texttt{intros until 1}
-  is equivalent to \texttt{intros x y H}, as \verb+x=y -> y=x+ is the
-  first non-dependent product. And on the subgoal %
-  \verb+forall x y z:nat, x=y -> y=x+ the tactic \texttt{intros until 1}
-  is equivalent to \texttt{intros x y z} as the product on \texttt{z}
-  can be rewritten as a non-dependent product: %
-  \verb+forall x y:nat, nat -> x=y -> y=x+
-
-
-  \ErrMsg \errindex{No such hypothesis in current goal}
-
-  This happens when {\num} is 0 or is greater than the number of non-dependent
-  products of the goal.
-
-\item {\tt intro after \ident} \tacindex{intro after}\\
-      {\tt intro before \ident} \tacindex{intro before}\\
-      {\tt intro at top} \tacindex{intro at top}\\
-      {\tt intro at bottom} \tacindex{intro at bottom}
-
-  These tactics apply {\tt intro} and move the freshly introduced hypothesis
-  respectively after the hypothesis \ident{}, before the hypothesis
-  \ident{}, at the top of the local context, or at the bottom of the
-  local context. All hypotheses on which the new hypothesis depends
-  are moved too so as to respect the order of dependencies between
-  hypotheses. Note that {\tt intro at bottom} is a synonym for {\tt
-  intro} with no argument.
-
-  \ErrMsg \errindex{No such hypothesis} : {\ident}
-
-\item {\tt intro \ident$_1$ after \ident$_2$}\\
-      {\tt intro \ident$_1$ before \ident$_2$}\\
-      {\tt intro \ident$_1$ at top}\\
-      {\tt intro \ident$_1$ at bottom}
-
-  These tactics behave as previously but naming the introduced hypothesis
-  \ident$_1$.  It is equivalent to {\tt intro \ident$_1$} followed by
-  the appropriate call to {\tt move}~(see Section~\ref{move}).
-
-\end{Variants}
-
-\subsection{\tt intros {\intropatternlist}}
-\label{intros-pattern}
-\tacindex{intros \intropattern}
-\index{Introduction patterns}
-\index{Naming introduction patterns}
-\index{Disjunctive/conjunctive introduction patterns}
-\index{Disjunctive/conjunctive introduction patterns}
-\index{Equality introduction patterns}
-
-This extension of the tactic {\tt intros} allows to apply tactics on
-the fly on the variables or hypotheses which have been introduced. An
-{\em introduction pattern list} {\intropatternlist} is a list of
-introduction patterns possibly containing the filling introduction
-patterns {\tt *} and {\tt **}. An {\em introduction pattern} is
-either:
-\begin{itemize}
-\item a {\em naming introduction pattern}, i.e. either one of:
-  \begin{itemize}
-  \item the pattern \texttt{?}
-  \item the pattern \texttt{?\ident}
-  \item an identifier
-  \end{itemize}
-\item an {\em action introduction pattern} which itself classifies into:
-  \begin{itemize}
-  \item a {\em disjunctive/conjunctive introduction pattern}, i.e. either one of:
-    \begin{itemize}
-    \item a disjunction of lists of patterns:
-      {\tt [$\intropatternlist_1$ | \dots\ | $\intropatternlist_n$]}
-    \item a conjunction of patterns: {\tt ($p_1$ , \dots\ , $p_n$)}
-    \item a list of patterns {\tt ($p_1$ \&\ \dots\ \&\ $p_n$)}
-      for sequence of right-associative binary constructs
-    \end{itemize}
-  \item an {\em equality introduction pattern}, i.e. either one of:
-    \begin{itemize}
-    \item a pattern for decomposing an equality: {\tt [= $p_1$ \dots\ $p_n$]}
-    \item the rewriting orientations: {\tt ->} or {\tt <-}
-    \end{itemize}
-  \item the on-the-fly application of lemmas: $p${\tt \%{\term$_1$}}
-    \ldots {\tt \%{\term$_n$}} where $p$ itself is not a pattern for
-    on-the-fly application of lemmas (note: syntax is in experimental stage)
-  \end{itemize}
-\item the wildcard: {\tt \_}
-\end{itemize}
-
-Assuming a goal of type $Q \to P$ (non-dependent product), or
-of type $\forall x:T,~P$ (dependent product), the behavior of
-{\tt intros $p$} is defined inductively over the structure of the
-introduction pattern~$p$:
-\begin{itemize}
-\item introduction on \texttt{?} performs the introduction, and lets {\Coq}
-  choose a fresh name for the variable;
-\item introduction on \texttt{?\ident} performs the introduction, and
-  lets {\Coq} choose a fresh name for the variable based on {\ident};
-\item introduction on \texttt{\ident} behaves as described in
-  Section~\ref{intro};
-\item introduction over a disjunction of list of patterns {\tt
-  [$\intropatternlist_{1}$ | \dots\ | $\intropatternlist_n$]} expects
-  the product to be over an inductive type whose number of
-  constructors is $n$ (or more generally over a type of conclusion an
-  inductive type built from $n$ constructors, e.g. {\tt C ->
-    A\textbackslash/B} with $n=2$ since {\tt A\textbackslash/B} has 2
-  constructors): it destructs the introduced hypothesis as {\tt
-    destruct} (see Section~\ref{destruct}) would and applies on each
-  generated subgoal the corresponding tactic;
-  \texttt{intros}~$\intropatternlist_i$. The introduction patterns in
-  $\intropatternlist_i$ are expected to consume no more than the
-  number of arguments of the $i^{\mbox{\scriptsize th}}$
-  constructor. If it consumes less, then {\Coq} completes the pattern
-  so that all the arguments of the constructors of the inductive type
-  are introduced (for instance, the list of patterns {\tt [$\;$|$\;$]
-    H} applied on goal {\tt forall x:nat, x=0 -> 0=x} behaves the same
-  as the list of patterns {\tt [$\,$|$\,$?$\,$] H});
-\item introduction over a conjunction of patterns {\tt ($p_1$, \ldots,
-  $p_n$)} expects the goal to be a product over an inductive type $I$ with a
-  single constructor that itself has at least $n$ arguments: it
-  performs a case analysis over the hypothesis, as {\tt destruct}
-  would, and applies the patterns $p_1$~\ldots~$p_n$ to the arguments
-  of the constructor of $I$ (observe that {\tt ($p_1$, {\ldots},
-  $p_n$)} is an alternative notation for {\tt [$p_1$ {\ldots}
-  $p_n$]});
-\item introduction via {\tt ($p_1$ \& \dots\ \& $p_n$)}
-  is a shortcut for introduction via
-  {\tt ($p_1$,(\ldots,(\dots,$p_n$)\ldots))}; it expects the
-  hypothesis to be a sequence of right-associative binary inductive
-  constructors such as {\tt conj} or {\tt ex\_intro}; for instance, an
-  hypothesis with type {\tt A\verb|/\|(exists x, B\verb|/\|C\verb|/\|D)} can be
-  introduced via pattern {\tt (a \& x \& b \& c \& d)};
-\item if the product is over an equality type, then a pattern of the
-  form {\tt [= $p_{1}$ \dots\ $p_n$]} applies either {\tt injection}
-  (see Section~\ref{injection}) or {\tt discriminate} (see
-  Section~\ref{discriminate}) instead of {\tt destruct}; if {\tt
-    injection} is applicable, the patterns $p_1$, \ldots, $p_n$ are
-  used on the hypotheses generated by {\tt injection}; if the number
-  of patterns is smaller than the number of hypotheses generated, the
-  pattern \texttt{?} is used to complete the list;
-  %TODO!
-  %if {\tt discriminate} is applicable, the list of patterns $p_{1}$
-  %\dots\ $p_n$ is supposed to be empty;
-\item introduction over {\tt ->} (respectively {\tt <-}) expects the
-  hypothesis to be an equality and the right-hand-side (respectively
-  the left-hand-side) is replaced by the left-hand-side (respectively
-  the right-hand-side) in the conclusion of the goal; the hypothesis
-  itself is erased; if the term to substitute is a variable, it is
-  substituted also in the context of goal and the variable is removed
-  too;
-\item introduction over a pattern $p${\tt \%{\term$_1$}} \ldots {\tt
-  \%{\term$_n$}} first applies {\term$_1$},\ldots, {\term$_n$} on the
-  hypothesis to be introduced (as in {\tt apply }{\term}$_1$, \ldots,
-  {\term}$_n$ {\tt in}) prior to the application of the introduction
-  pattern $p$;
-\item introduction on the wildcard depends on whether the product is
-  dependent or not: in the non-dependent case, it erases the
-  corresponding hypothesis (i.e. it behaves as an {\tt intro} followed
-  by a {\tt clear}, cf Section~\ref{clear}) while in the dependent
-  case, it succeeds and erases the variable only if the wildcard is
-  part of a more complex list of introduction patterns that also
-  erases the hypotheses depending on this variable;
-\item introduction over {\tt *} introduces all forthcoming quantified
-  variables appearing in a row; introduction over {\tt **} introduces
-  all forthcoming quantified variables or hypotheses until the goal is
-  not any more a quantification or an implication.
-\end{itemize}
-
-\Example
-
-\begin{coq_example}
-Goal forall A B C:Prop, A \/ B /\ C -> (A -> C) -> C.
-intros * [a | (_,c)] f.
-\end{coq_example}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-\Rem {\tt intros $p_1~\ldots~p_n$} is not equivalent to \texttt{intros
-  $p_1$;\ldots; intros $p_n$} for the following reason: If one of the
-$p_i$ is a wildcard pattern, he might succeed in the first case
-because the further hypotheses it depends in are eventually erased too
-while it might fail in the second case because of dependencies in
-hypotheses which are not yet introduced (and a fortiori not yet
-erased).
-
-\Rem In {\tt intros $\intropatternlist$}, if the last introduction
-pattern is a disjunctive or conjunctive pattern {\tt
-  [$\intropatternlist_1$ | \dots\ | $\intropatternlist_n$]}, the
-completion of $\intropatternlist_i$ so that all the arguments of the
-$i^{\mbox{\scriptsize th}}$ constructors of the corresponding
-inductive type are introduced can be controlled with the
-following option:
-\optindex{Bracketing Last Introduction Pattern}
-
-\begin{quote}
-{\tt Set Bracketing Last Introduction Pattern}
-\end{quote}
-
-Force completion, if needed, when the last introduction pattern is a
-disjunctive or conjunctive pattern (this is the default).
-
-\begin{quote}
-{\tt Unset Bracketing Last Introduction Pattern}
-\end{quote}
-
-Deactivate completion when the last introduction pattern is a disjunctive
-or conjunctive pattern.
-
-
-
-\subsection{\tt clear \ident}
-\tacindex{clear}
-\label{clear}
-
-This tactic erases the hypothesis named {\ident} in the local context
-of the current goal. As a consequence, {\ident} is no more displayed and no more
-usable in the proof development.
-
-\begin{ErrMsgs}
-\item \errindex{No such hypothesis}
-\item \errindexbis{{\ident} is used in the conclusion}{is used in the
-    conclusion}
-\item \errindexbis{{\ident} is used in the hypothesis {\ident'}}{is
-    used in the hypothesis}
-\end{ErrMsgs}
-
-\begin{Variants}
-
-\item {\tt clear {\ident$_1$} \dots\ {\ident$_n$}}
-
-  This is equivalent to {\tt clear {\ident$_1$}. {\ldots} clear
-    {\ident$_n$}.}
+.. tacv:: intro after @ident
+.. tacv:: intro before @ident
+.. tacv:: intro at top
+.. tacv:: intro at bottom
 
-\item {\tt clearbody {\ident}}\tacindex{clearbody}
+   These tactics apply :n:`intro` and move the freshly introduced hypothesis
+   respectively after the hypothesis :n:`@ident`, before the hypothesis
+   :n:`@ident`, at the top of the local context, or at the bottom of the local
+   context. All hypotheses on which the new hypothesis depends are moved
+   too so as to respect the order of dependencies between hypotheses.
+   Note that :n:`intro at bottom` is a synonym for :n:`intro` with no argument.
 
-  This tactic expects {\ident} to be a local definition then clears
-  its body. Otherwise said, this tactic turns a definition into an
-  assumption.
+.. exn:: No such hypothesis : @ident.
 
-  \ErrMsg \errindexbis{{\ident} is not a local definition}{is not a local definition}
+.. tacv:: intro @ident after @ident
+.. tacv:: intro @ident before @ident
+.. tacv:: intro @ident at top
+.. tacv:: intro @ident at bottom
 
-\item \texttt{clear - {\ident$_1$} \dots\ {\ident$_n$}}
+   These tactics behave as previously but naming the introduced hypothesis
+   :n:`@ident`. It is equivalent to :n:`intro @ident` followed by the
+   appropriate call to move (see :tacn:`move ... after`).
 
-  This tactic clears all the hypotheses except the ones depending in
-  the hypotheses named {\ident$_1$} {\ldots} {\ident$_n$} and in the
-  goal.
+.. tacn:: intros @intro_pattern_list
+   :name: intros ...
 
-\item \texttt{clear}
+   This extension of the tactic :n:`intros` allows to apply tactics on the fly
+   on the variables or hypotheses which have been introduced. An
+   *introduction pattern list* :n:`@intro_pattern_list` is a list of
+   introduction patterns possibly containing the filling introduction
+   patterns `*` and `**`. An *introduction pattern* is either:
 
-  This tactic clears all the hypotheses except the ones the goal depends on.
+   + a *naming introduction pattern*, i.e. either one of:
 
-\item {\tt clear dependent \ident \tacindex{clear dependent}}
+     + the pattern :n:`?`
 
- This clears the hypothesis \ident\ and all the hypotheses
- that depend on it.
+     + the pattern :n:`?ident`
 
-\end{Variants}
+     + an identifier
 
-\subsection{\tt revert \ident$_1$ \dots\ \ident$_n$}
-\tacindex{revert}
-\label{revert}
+   + an *action introduction pattern* which itself classifies into:
 
-This applies to any goal with variables \ident$_1$ \dots\ \ident$_n$.
-It moves the hypotheses (possibly defined) to the goal, if this respects
-dependencies. This tactic is the inverse of {\tt intro}.
+     + a *disjunctive/conjunctive introduction pattern*, i.e. either one of
 
-\begin{ErrMsgs}
-\item \errindex{No such hypothesis}
-\item \errindexbis{{\ident} is used in the hypothesis {\ident'}}{is
-    used in the hypothesis}
-\end{ErrMsgs}
+       + a disjunction of lists of patterns
+         :n:`[@intro_pattern_list | ... | @intro_pattern_list]`
 
-\begin{Variants}
-\item {\tt revert dependent \ident \tacindex{revert dependent}}
+       + a conjunction of patterns: :n:`({+, p})`
 
- This moves to the goal the hypothesis {\ident} and all the hypotheses
- that depend on it.
+       + a list of patterns
+         :n:`({+& p})`
+         for sequence of right-associative binary constructs
 
-\end{Variants}
+     + an *equality introduction pattern*, i.e. either one of:
 
-\subsection{\tt move {\ident$_1$} after {\ident$_2$}}
-\tacindex{move}
-\label{move}
+       + a pattern for decomposing an equality: :n:`[= {+ p}]`
+       + the rewriting orientations: :n:`->` or :n:`<-`
 
-This moves the hypothesis named {\ident$_1$} in the local context
-after the hypothesis named {\ident$_2$}, where ``after'' is in
-reference to the direction of the move. The proof term is not changed.
+     + the on-the-fly application of lemmas: :n:`p{+ %term}` where :n:`p`
+       itself is not a pattern for on-the-fly application of lemmas (note:
+       syntax is in experimental stage)
 
-If {\ident$_1$} comes before {\ident$_2$} in the order of
-dependencies, then all the hypotheses between {\ident$_1$} and
-{\ident$_2$} that (possibly indirectly) depend on {\ident$_1$} are
-moved too, and all of them are thus moved after {\ident$_2$} in the
-order of dependencies.
+   + the wildcard: :n:`_`
 
-If {\ident$_1$} comes after {\ident$_2$} in the order of dependencies,
-then all the hypotheses between {\ident$_1$} and {\ident$_2$} that
-(possibly indirectly) occur in the type of {\ident$_1$} are moved
-too, and all of them are thus moved before {\ident$_2$} in the order
-of dependencies.
 
-\begin{Variants}
+   Assuming a goal of type :g:`Q → P` (non-dependent product), or of type
+   :math:`\forall`:g:`x:T, P` (dependent product), the behavior of
+   :n:`intros p` is defined inductively over the structure of the introduction
+   pattern :n:`p`:
 
-\item {\tt move {\ident$_1$} before {\ident$_2$}}
+Introduction on :n:`?` performs the introduction, and lets Coq choose a fresh
+name for the variable;
 
-This moves {\ident$_1$} towards and just before the hypothesis named
-{\ident$_2$}. As for {\tt move {\ident$_1$} after {\ident$_2$}},
-dependencies over {\ident$_1$} (when {\ident$_1$} comes before
-{\ident$_2$} in the order of dependencies) or in the type of
-{\ident$_1$} (when {\ident$_1$} comes after {\ident$_2$} in the order
-of dependencies) are moved too.
+Introduction on :n:`?ident` performs the introduction, and lets Coq choose a
+fresh name for the variable based on :n:`@ident`;
 
-\item {\tt move {\ident} at top}
+Introduction on :n:`@ident` behaves as described in :tacn:`intro`
 
-This moves {\ident} at the top of the local context (at the beginning of the context).
+Introduction over a disjunction of list of patterns
+:n:`[@intro_pattern_list | ... | @intro_pattern_list ]` expects the product
+to be over an inductive type whose number of constructors is `n` (or more
+generally over a type of conclusion an inductive type built from `n`
+constructors, e.g. :g:`C -> A\/B` with `n=2` since :g:`A\/B` has `2`
+constructors): it destructs the introduced hypothesis as :n:`destruct` (see
+:tacn:`destruct`) would and applies on each generated subgoal the
+corresponding tactic;
 
-\item {\tt move {\ident} at bottom}
+.. tacv:: intros @intro_pattern_list
 
-This moves {\ident} at the bottom of the local context (at the end of the context).
+   The introduction patterns in :n:`@intro_pattern_list` are expected to consume
+   no more than the number of arguments of the `i`-th constructor. If it
+   consumes less, then Coq completes the pattern so that all the arguments of
+   the constructors of the inductive type are introduced (for instance, the
+   list of patterns :n:`[ | ] H` applied on goal :g:`forall x:nat, x=0 -> 0=x`
+   behaves the same as the list of patterns :n:`[ | ? ] H`);
 
-\end{Variants}
+Introduction over a conjunction of patterns :n:`({+, p})` expects
+the goal to be a product over an inductive type :g:`I` with a single
+constructor that itself has at least `n` arguments: It performs a case
+analysis over the hypothesis, as :n:`destruct` would, and applies the
+patterns :n:`{+ p}` to the arguments of the constructor of :g:`I` (observe
+that :n:`({+ p})` is an alternative notation for :n:`[{+ p}]`);
 
-\begin{ErrMsgs}
+Introduction via :n:`({+& p})` is a shortcut for introduction via
+:n:`(p,( ... ,( ..., p ) ... ))`; it expects the hypothesis to be a sequence of
+right-associative binary inductive constructors such as :g:`conj` or
+:g:`ex_intro`; for instance, an hypothesis with type
+:g:`A /\(exists x, B /\ C /\ D)` can be introduced via pattern
+:n:`(a & x & b & c & d)`;
 
-\item \errindex{No such hypothesis}
+If the product is over an equality type, then a pattern of the form
+:n:`[= {+ p}]` applies either :tacn:`injection` or :tacn:`discriminate`
+instead of :tacn:`destruct`; if :tacn:`injection` is applicable, the patterns
+:n:`{+, p}` are used on the hypotheses generated by :tacn:`injection`; if the
+number of patterns is smaller than the number of hypotheses generated, the
+pattern :n:`?` is used to complete the list;
 
-\item \errindex{Cannot move {\ident$_1$} after {\ident$_2$}:
-                   it occurs in the type of {\ident$_2$}}
+.. tacv:: introduction over ->
+.. tacv:: introduction over <-
 
-\item \errindex{Cannot move {\ident$_1$} after {\ident$_2$}:
-                   it depends on {\ident$_2$}}
+   expects the hypothesis to be an equality and the right-hand-side
+   (respectively the left-hand-side) is replaced by the left-hand-side
+   (respectively the right-hand-side) in the conclusion of the goal;
+   the hypothesis itself is erased; if the term to substitute is a variable, it
+   is substituted also in the context of goal and the variable is removed too;
 
-\end{ErrMsgs}
+Introduction over a pattern :n:`p{+ %term}` first applies :n:`{+ term}`
+on the hypothesis to be introduced (as in :n:`apply {+, term}`) prior to the
+application of the introduction pattern :n:`p`;
 
-\Example
+Introduction on the wildcard depends on whether the product is dependent or not:
+in the non-dependent case, it erases the corresponding hypothesis (i.e. it
+behaves as an :tacn:`intro` followed by a :tacn:`clear`) while in the
+dependent case, it succeeds and erases the variable only if the wildcard is part
+of a more complex list of introduction patterns that also erases the hypotheses
+depending on this variable;
 
-\begin{coq_example}
-Goal forall x :nat, x = 0 -> forall z y:nat, y=y-> 0=x.
-intros x H z y H0.
-move x after H0.
-Undo.
-move x before H0.
-Undo.
-move H0 after H.
-Undo.
-move H0 before H.
-\end{coq_example}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
+Introduction over :n:`*` introduces all forthcoming quantified variables
+appearing in a row; introduction over :n:`**` introduces all forthcoming
+quantified variables or hypotheses until the goal is not any more a
+quantification or an implication.
 
-\subsection{\tt rename {\ident$_1$} into {\ident$_2$}}
-\tacindex{rename}
+.. example::
+   .. coqtop:: all
 
-This renames hypothesis {\ident$_1$} into {\ident$_2$} in the current
-context. The name of the hypothesis in the proof-term, however, is left
-unchanged.
+      Goal forall A B C:Prop, A \/ B /\ C -> (A -> C) -> C.
+      intros * [a | (_,c)] f.
 
-\begin{Variants}
+.. note::
+   :n:`intros {+ p}` is not equivalent to :n:`intros p; ... ; intros p`
+   for the following reason: If one of the :n:`p` is a wildcard pattern, it
+   might succeed in the first case because the further hypotheses it
+   depends in are eventually erased too while it might fail in the second
+   case because of dependencies in hypotheses which are not yet
+   introduced (and a fortiori not yet erased).
 
-\item {\tt rename {\ident$_1$} into {\ident$_2$}, \ldots,
-    {\ident$_{2k-1}$} into {\ident$_{2k}$}}
+.. note::
+   In :n:`intros @intro_pattern_list`, if the last introduction pattern
+   is a disjunctive or conjunctive pattern
+   :n:`[{+| @intro_pattern_list}]`, the completion of :n:`@intro_pattern_list`
+   so that all the arguments of the i-th constructors of the corresponding
+   inductive type are introduced can be controlled with the following option:
 
-This renames the variables {\ident$_1$} \ldots {\ident$_2k-1$} into respectively
-{\ident$_2$} \ldots {\ident$_2k$} in parallel. In particular, the target
-identifiers may contain identifiers that exist in the source context, as long
-as the latter are also renamed by the same tactic.
+   .. cmd:: Set Bracketing Last Introduction Pattern.
 
-\end{Variants}
+   Force completion, if needed, when the last introduction pattern is a
+   disjunctive or conjunctive pattern (this is the default).
 
-\begin{ErrMsgs}
-\item \errindex{No such hypothesis}
-\item \errindexbis{{\ident$_2$} is already used}{is already used}
-\end{ErrMsgs}
+   .. cmd:: Unset Bracketing Last Introduction Pattern.
 
-\subsection{\tt set ( {\ident} := {\term} )}
-\label{tactic:set}
-\tacindex{set}
+   Deactivate completion when the last introduction pattern is a disjunctive or
+   conjunctive pattern.
 
-This replaces {\term} by {\ident} in the conclusion of the current goal
-and adds the new definition {\tt {\ident} := \term} to the local context.
+.. tacn:: clear @ident
+   :name: clear
 
-If {\term} has holes (i.e. subexpressions of the form ``\_''), the
-tactic first checks that all subterms matching the pattern are
-compatible before doing the replacement using the leftmost subterm
-matching the pattern.
+   This tactic erases the hypothesis named :n:`@ident` in the local context of
+   the current goal. As a consequence, :n:`@ident` is no more displayed and no
+   more usable in the proof development.
 
-\begin{ErrMsgs}
-\item \errindex{The variable {\ident} is already defined}
-\end{ErrMsgs}
+.. exn:: No such hypothesis.
 
-\begin{Variants}
+.. exn:: @ident is used in the conclusion.
 
-\item {\tt set ( {\ident} := {\term} ) in {\occgoalset}}
+.. exn:: @ident is used in the hypothesis @ident.
 
-This notation allows specifying which occurrences of {\term} have to
-be substituted in the context. The {\tt in {\occgoalset}} clause is an
-occurrence clause whose syntax and behavior are described in
-Section~\ref{Occurrences_clauses}.
+.. tacv:: clear {+ @ident}
 
-\item {\tt set ( {\ident} \nelistnosep{\binder} := {\term} )}
+   This is equivalent to :n:`clear @ident. ... clear @ident.`
 
-  This is equivalent to {\tt set ( {\ident} := fun
-  \nelistnosep{\binder} => {\term} )}.
+.. tacv:: clearbody @ident
 
-\item {\tt set \term}
+   This tactic expects :n:`@ident` to be a local definition then clears its
+   body. Otherwise said, this tactic turns a definition into an assumption.
 
-  This behaves as {\tt set (} {\ident} := {\term} {\tt )} but {\ident}
-  is generated by {\Coq}. This variant also supports an occurrence clause.
+.. exn:: @ident is not a local definition
 
-\item {\tt set ( {\ident$_0$} \nelistnosep{\binder} := {\term} ) in {\occgoalset}}\\
-      {\tt set {\term} in {\occgoalset}}
+.. tacv:: clear - {+ @ident}
 
-  These are the general forms that combine the previous possibilities.
+   This tactic clears all the hypotheses except the ones depending in the
+   hypotheses named :n:`{+ @ident}` and in the goal.
 
-\item {\tt eset ( {\ident$_0$} \nelistnosep{\binder} := {\term} ) in {\occgoalset}}\tacindex{eset}\\
-      {\tt eset {\term} in {\occgoalset}}
+.. tacv:: clear
 
-  While the different variants of \texttt{set} expect that no
-  existential variables are generated by the tactic, \texttt{eset}
-  removes this constraint. In practice, this is relevant only when
-  \texttt{eset} is used as a synonym of \texttt{epose}, i.e. when the
-  term does not occur in the goal.
+   This tactic clears all the hypotheses except the ones the goal depends on.
 
-\item {\tt remember {\term} as {\ident}}\tacindex{remember}
+.. tacv:: clear dependent @ident
 
-  This behaves as {\tt set ( {\ident} := {\term} ) in *} and using a
-  logical (Leibniz's) equality instead of a local definition.
+   This clears the hypothesis :n:`@ident` and all the hypotheses that depend on
+   it.
 
-\item {\tt remember {\term} as {\ident} eqn:{\ident}}
+.. tacn:: revert {+ @ident}
+   :name: revert ...
 
-  This behaves as {\tt remember {\term} as {\ident}}, except
-  that the name of the generated equality is also given.
+This applies to any goal with variables :n:`{+ @ident}`. It moves the hypotheses
+(possibly defined) to the goal, if this respects dependencies. This tactic is
+the inverse of :tacn:`intro`.
 
-\item {\tt remember {\term} as {\ident} in {\occgoalset}}
+.. exn:: No such hypothesis.
 
-  This is a more general form of {\tt remember} that remembers the
-  occurrences of {\term} specified by an occurrences set.
+.. exn:: @ident is used in the hypothesis @ident.
 
-\item
-  {\tt eremember {\term} as {\ident}}\tacindex{eremember}\\
-  {\tt eremember {\term} as {\ident} in {\occgoalset}}\\
-  {\tt eremember {\term} as {\ident} eqn:{\ident}}
+.. tac:: revert dependent @ident
 
-  While the different variants of \texttt{remember} expect that no
-  existential variables are generated by the tactic, \texttt{eremember}
-  removes this constraint.
+   This moves to the goal the hypothesis :n:`@ident` and all the hypotheses that
+   depend on it.
 
-\item {\tt pose ( {\ident} := {\term} )}\tacindex{pose}
+.. tacn:: move @ident after @ident
+   :name: move .. after ...
 
-  This adds the local definition {\ident} := {\term} to the current
-  context without performing any replacement in the goal or in the
-  hypotheses. It is equivalent to {\tt set ( {\ident} {\tt :=}
-  {\term} {\tt ) in |-}}.
+   This moves the hypothesis named :n:`@ident` in the local context after the
+   hypothesis named :n:`@ident`, where “after” is in reference to the
+   direction of the move. The proof term is not changed.
 
-\item {\tt pose ( {\ident} \nelistnosep{\binder} := {\term} )}
+   If :n:`@ident` comes before :n:`@ident` in the order of dependencies, then
+   all the hypotheses between :n:`@ident` and :n:`ident@` that (possibly
+   indirectly) depend on :n:`@ident` are moved too, and all of them are thus
+   moved after :n:`@ident` in the order of dependencies.
 
-  This is equivalent to {\tt pose (} {\ident} {\tt :=} {\tt fun}
-  \nelistnosep{\binder} {\tt =>} {\term} {\tt )}.
+   If :n:`@ident` comes after :n:`@ident` in the order of dependencies, then all
+   the hypotheses between :n:`@ident` and :n:`@ident` that (possibly indirectly)
+   occur in the type of :n:`@ident` are moved too, and all of them are thus
+   moved before :n:`@ident` in the order of dependencies.
 
-\item{\tt pose {\term}}
+.. tacv:: move @ident before @ident
 
-  This behaves as {\tt pose ( {\ident} := {\term} )} but
-  {\ident} is generated by {\Coq}.
+   This moves :n:`@ident` towards and just before the hypothesis named
+   :n:`@ident`.  As for :tacn:`move ... after ...`, dependencies over
+   :n:`@ident` (when :n:`@ident` comes before :n:`@ident` in the order of
+   dependencies) or in the type of :n:`@ident` (when :n:`@ident` comes after
+   :n:`@ident` in the order of dependencies) are moved too.
 
-\item {\tt epose ( {\ident} := {\term} )}\tacindex{epose}\\
-      {\tt epose ( {\ident} \nelistnosep{\binder} := {\term} )}\\
-      {\tt epose {\term}}
+.. tacv:: move @ident at top
 
-  While the different variants of \texttt{pose} expect that no
-  existential variables are generated by the tactic, \texttt{epose}
-  removes this constraint.
+   This moves :n:`@ident` at the top of the local context (at the beginning of
+   the context).
 
-\end{Variants}
+.. tacv:: move @ident at bottom
 
-\subsection{\tt decompose [ {\qualid$_1$} \dots\ {\qualid$_n$} ] \term}
-\label{decompose}
-\tacindex{decompose}
+   This moves ident at the bottom of the local context (at the end of the
+   context).
 
-This tactic recursively decomposes a
-complex proposition in order to obtain atomic ones.
+.. exn:: No such hypothesis
+.. exn:: Cannot move @ident after @ident : it occurs in the type of @ident
+.. exn:: Cannot move @ident after @ident : it depends on @ident
 
-\Example
+.. example::
+   .. coqtop:: all
 
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-\begin{coq_example}
-Goal forall A B C:Prop, A /\ B /\ C \/ B /\ C \/ C /\ A -> C.
-intros A B C H; decompose [and or] H; assumption.
-\end{coq_example}
-\begin{coq_example*}
-Qed.
-\end{coq_example*}
+      Goal forall x :nat, x = 0 -> forall z y:nat, y=y-> 0=x.
+      intros x H z y H0.
+      move x after H0.
+      Undo.
+      move x before H0.
+      Undo.
+      move H0 after H.
+      Undo.
+      move H0 before H.
 
-{\tt decompose} does not work on right-hand sides of implications or products.
+.. tacn:: rename @ident into @ident
+   :name: rename ... into ...
 
-\begin{Variants}
+This renames hypothesis :n:`@ident` into :n:`@ident` in the current context.
+The name of the hypothesis in the proof-term, however, is left unchanged.
 
-\item {\tt decompose sum \term}\tacindex{decompose sum}
+.. tacv:: rename {+, @ident into  @ident}
 
-  This decomposes sum types (like \texttt{or}).
+   This renames the variables :n:`@ident` into :n:`@ident` in parallel. In
+   particular, the target identifiers may contain identifiers that exist in the
+   source context, as long as the latter are also renamed by the same tactic.
 
-\item {\tt decompose record \term}\tacindex{decompose record}
+.. exn:: No such hypothesis
+.. exn:: @ident is already used
 
-  This decomposes record types (inductive types with one constructor,
-  like \texttt{and} and \texttt{exists} and those defined with the
-  \texttt{Record} macro, see Section~\ref{Record}).
+.. tacn:: set (@ident := @term)
+   :name: set
 
-\end{Variants}
+   This replaces :n:`@term` by :n:`@ident` in the conclusion of the current goal
+   and adds the new definition :g:`ident := term` to the local context.
 
-\section{Controlling the proof flow}
+   If :n:`@term` has holes (i.e. subexpressions of the form “`_`”), the tactic
+   first checks that all subterms matching the pattern are compatible before
+   doing the replacement using the leftmost subterm matching the pattern.
 
-\subsection{\tt assert ( {\ident} :\ {\form} )}
-\tacindex{assert}
+.. exn:: The variable @ident is already defined
 
-This tactic applies to any goal. {\tt assert (H : U)} adds a new
-hypothesis of name \texttt{H} asserting \texttt{U} to the current goal
-and opens a new subgoal \texttt{U}\footnote{This corresponds to the
-  cut rule of sequent calculus.}. The subgoal {\texttt U} comes first
-in the list of subgoals remaining to prove.
+.. tacv:: set (@ident := @term ) in @goal_occurrences
 
-\begin{ErrMsgs}
-\item \errindex{Not a proposition or a type}
+   This notation allows  specifying which occurrences of :n:`@term` have to be
+   substituted in the context. The :n:`in @goal_occurrences` clause is an
+   occurrence clause whose syntax and behavior are described in
+   :ref:`goal occurences <occurencessets>`.
 
-  Arises when the argument {\form} is neither of type {\tt Prop}, {\tt
-    Set} nor {\tt Type}.
+.. tacv:: set (@ident {+ @binder} := @term )
 
-\end{ErrMsgs}
+   This is equivalent to :n:`set (@ident := funbinder {+ binder} => @term )`.
 
-\begin{Variants}
+.. tacv:: set term
+   This behaves as :n:`set(@ident := @term)` but :n:`@ident` is generated by
+   Coq. This variant also supports an occurrence clause.
 
-\item{\tt assert {\form}}
+.. tacv:: set (@ident {+ @binder} := @term) in @goal_occurrences
+.. tacv:: set @term in @goal_occurrences
 
-  This behaves as {\tt assert ( {\ident} :\ {\form} )} but
-  {\ident} is generated by {\Coq}.
+   These are the general forms that combine the previous possibilities.
 
-\item \texttt{assert {\form} by {\tac}}\tacindex{assert by}
+.. tacv:: eset (@ident {+ @binder} := @term ) in @goal_occurrences
+.. tacv:: eset @term in @goal_occurrences
 
-  This tactic behaves like \texttt{assert} but applies {\tac}
-  to solve the subgoals generated by \texttt{assert}.
+   While the different variants of :tacn:`set` expect that no existential
+   variables are generated by the tactic, :n:`eset` removes this constraint. In
+   practice, this is relevant only when :n:`eset` is used as a synonym of
+   :tacn:`epose`, i.e. when the :`@term` does not occur in the goal.
 
-  \ErrMsg \errindex{Proof is not complete}
+.. tacv:: remember @term as @ident
 
-\item \texttt{assert {\form} as {\intropattern}\tacindex{assert as}}
+   This behaves as :n:`set (@ident:= @term ) in *` and using a logical
+   (Leibniz’s) equality instead of a local definition.
 
-  If {\intropattern} is a naming introduction pattern (see
-  Section~\ref{intros-pattern}), the hypothesis is named after this
-  introduction pattern (in particular, if {\intropattern} is {\ident},
-  the tactic behaves like \texttt{assert ({\ident} :\ {\form})}).
+.. tacv:: remember @term as @ident eqn:@ident
 
-  If {\intropattern} is an action introduction pattern, the tactic
-  behaves like \texttt{assert {\form}} followed by the action done by
-  this introduction pattern.
+   This behaves as :n:`remember @term as @ident`, except that the name of the
+   generated equality is also given.
 
-\item \texttt{assert {\form} as {\intropattern} by {\tac}}
+.. tacv:: remember @term as @ident in @goal_occurrences
 
-  This combines the two previous variants of {\tt assert}.
+   This is a more general form of :n:`remember` that remembers the occurrences
+   of term specified by an occurrences set.
 
-\item{\tt assert ( {\ident} := {\term} )}
+.. tacv:: eremember @term as @ident
+.. tacv:: eremember @term as @ident in @goal_occurrences
+.. tacv:: eremember @term as @ident eqn:@ident
+   While the different variants of :n:`remember` expect that no existential
+   variables are generated by the tactic, :n:`eremember` removes this constraint.
 
-  This behaves as {\tt assert ({\ident} :\ {\type}) by exact {\term}}
-  where {\type} is the type of {\term}. This is deprecated in favor of
-  {\tt pose proof}.
+.. tacv:: pose ( @ident := @term )
+   :name: pose
 
-  If the head of {\term} is {\ident}, the tactic behaves as
-  {\tt specialize \term}.
+   This adds the local definition :n:`@ident := @term` to the current context
+   without performing any replacement in the goal or in the hypotheses. It is
+   equivalent to :n:`set ( @ident := @term ) in |-`.
 
-  \ErrMsg \errindex{Variable {\ident} is already declared}
+.. tacv:: pose ( @ident {+ @binder} := @term )
 
-\item \texttt{eassert {\form} as {\intropattern} by {\tac}}\tacindex{eassert}\tacindex{eassert as}\tacindex{eassert by}\\
-  {\tt assert ( {\ident} := {\term} )}
+   This is equivalent to :n:`pose (@ident := funbinder {+ binder} => @term)`.
 
-  While the different variants of \texttt{assert} expect that no
-  existential variables are generated by the tactic, \texttt{eassert}
-  removes this constraint. This allows not to specify the asserted
-  statement completely before starting to prove it.
+.. tacv:: pose @term
 
-\item \texttt{pose proof {\term} \zeroone{as {\intropattern}}\tacindex{pose proof}}
+   This behaves as :n:`pose (@ident := @term )` but :n:`@ident` is generated by
+   Coq.
 
-  This tactic behaves like \texttt{assert T \zeroone{as {\intropattern}} by
-  exact {\term}} where \texttt{T} is the type of {\term}.
+.. tacv:: epose (@ident := @term )
+.. tacv:: epose (@ident {+ @binder} := @term )
+.. tacv:: epose term
+   :name: epose
 
-  In particular, \texttt{pose proof {\term} as {\ident}} behaves as
-  \texttt{assert ({\ident} := {\term})} and \texttt{pose proof {\term}
-    as {\intropattern}} is the same as applying
-  the {\intropattern} to {\term}.
+   While the different variants of :tacn:`pose` expect that no
+   existential variables are generated by the tactic, epose removes this
+   constraint.
 
-\item \texttt{epose proof {\term} \zeroone{as {\intropattern}}\tacindex{epose proof}}
+.. tacn:: decompose [{+ @qualid}] @term
+   :name: decompose
 
-  While \texttt{pose proof} expects that no existential variables are generated by the tactic,
-  \texttt{epose proof} removes this constraint.
+   This tactic recursively decomposes a complex proposition in order to
+   obtain atomic ones.
 
-\item \texttt{enough ({\ident} :\ {\form})}\tacindex{enough}
+.. example::
+   .. coqtop:: all
 
-  This adds a new hypothesis of name {\ident} asserting {\form} to the
-  goal the tactic \texttt{enough} is applied to. A new subgoal stating
-  \texttt{\form} is inserted after the initial goal rather than before
-  it as \texttt{assert} would do.
+      Goal forall A B C:Prop, A /\ B /\ C \/ B /\ C \/ C /\ A -> C.
+      intros A B C H; decompose [and or] H; assumption.
+      Qed.
 
-\item \texttt{enough {\form}}\tacindex{enough}
+:n:`decompose` does not work on right-hand sides of implications or products.
 
-  This behaves like \texttt{enough ({\ident} :\ {\form})} with the name
-  {\ident} of the hypothesis generated by {\Coq}.
+.. tacv:: decompose sum @term
 
-\item \texttt{enough {\form} as {\intropattern}\tacindex{enough as}}
+   This decomposes sum types (like or).
 
-  This behaves like \texttt{enough} {\form} using {\intropattern} to
-  name or destruct the new hypothesis.
+.. tacv:: decompose record @term
 
-\item \texttt{enough ({\ident} :\ {\form}) by {\tac}}\tacindex{enough by}\\
- \texttt{enough {\form} by {\tac}}\tacindex{enough by}\\
- \texttt{enough {\form} as {\intropattern} by {\tac}}
+   This decomposes record types (inductive types with one constructor, like
+   "and" and "exists" and those defined with the Record macro, see
+   :ref:`TODO-2.1`).
 
-  This behaves as above but with {\tac} expected to solve the initial
-  goal after the extra assumption {\form} is added and possibly
-  destructed. If the \texttt{as} {\intropattern} clause generates more
-  than one subgoal, {\tac} is applied to all of them.
+.. _controllingtheproofflow:
 
-\item \texttt{eenough ({\ident} :\ {\form}) by {\tac}}\tacindex{eenough}\tacindex{eenough as}\tacindex{eenough by}\\
- \texttt{eenough {\form} by {\tac}}\tacindex{enough by}\\
- \texttt{eenough {\form} as {\intropattern} by {\tac}}
+Controlling the proof flow
+------------------------------
 
-  While the different variants of \texttt{enough} expect that no
-  existential variables are generated by the tactic, \texttt{eenough}
-  removes this constraint.
+.. tacn:: assert (@ident : form)
+   :name: assert
 
-\item {\tt cut {\form}}\tacindex{cut}
+   This tactic applies to any goal. :n:`assert (H : U)` adds a new hypothesis
+   of name :n:`H` asserting :g:`U` to the current goal and opens a new subgoal
+   :g:`U` [2]_. The subgoal :g:`U` comes first in the list of subgoals remaining to
+   prove.
 
-  This tactic applies to any goal. It implements the non-dependent
-  case of the ``App''\index{Typing rules!App} rule given in
-  Section~\ref{Typed-terms}. (This is Modus Ponens inference rule.)
-  {\tt cut U} transforms the current goal \texttt{T} into the two
-  following subgoals: {\tt U -> T} and \texttt{U}.  The subgoal {\tt U
-    -> T} comes first in the list of remaining subgoal to prove.
+.. exn:: Not a proposition or a type
 
-\item {\tt specialize ({\ident} \term$_1$ \dots\ \term$_n$)\tacindex{specialize} \zeroone{as \intropattern}}\\
-      {\tt specialize {\ident} with {\bindinglist} \zeroone{as \intropattern}}
+   Arises when the argument form is neither of type :g:`Prop`, :g:`Set` nor
+   :g:`Type`.
 
-      The tactic {\tt specialize} works on local hypothesis \ident.
-      The premises of this hypothesis (either universal
-      quantifications or non-dependent implications) are instantiated
-      by concrete terms coming either from arguments \term$_1$
-      $\ldots$ \term$_n$ or from a bindings list (see
-      Section~\ref{Binding-list} for more about bindings lists).
-      In the first form the application to \term$_1$ {\ldots}
-      \term$_n$ can be partial. The first form is equivalent to
-      {\tt assert ({\ident} := {\ident} {\term$_1$} \dots\ \term$_n$)}.
+.. tacv:: assert form
 
-      In the second form, instantiation elements can also be partial.
-      In this case the uninstantiated arguments are inferred by
-      unification if possible or left quantified in the hypothesis
-      otherwise.
+   This behaves as :n:`assert (@ident : form ) but :n:`@ident` is generated by
+   Coq.
 
-      With the {\tt as} clause, the local hypothesis {\ident} is left
-      unchanged and instead, the modified hypothesis is introduced as
-      specified by the {\intropattern}.
+.. tacv:: assert form by tactic
 
-      The name {\ident} can also refer to a global lemma or
-      hypothesis. In this case, for compatibility reasons, the
-      behavior of {\tt specialize} is close to that of {\tt
-        generalize}: the instantiated statement becomes an additional
-      premise of the goal. The {\tt as} clause is especially useful
-      in this case to immediately introduce the instantiated statement
-      as a local hypothesis.
+   This tactic behaves like :n:`assert` but applies tactic to solve the subgoals
+   generated by assert.
 
-  \begin{ErrMsgs}
-  \item \errindexbis{{\ident} is used in hypothesis \ident'}{is used in hypothesis}
-  \item \errindexbis{{\ident} is used in conclusion}{is used in conclusion}
-  \end{ErrMsgs}
+   .. exn:: Proof is not complete
 
-%% Moreover, the old syntax allows the use of a number after {\tt specialize}
-%% for controlling the number of premises to instantiate. Giving this
-%% number should not be mandatory anymore (automatic detection of how
-%% many premises can be eaten without leaving meta-variables). Hence
-%% no documentation for this integer optional argument of specialize
+.. tacv:: assert form as intro_pattern
 
-\end{Variants}
+   If :n:`intro_pattern` is a naming introduction pattern (see :tacn:`intro`),
+   the hypothesis is named after this introduction pattern (in particular, if
+   :n:`intro_pattern` is :n:`@ident`, the tactic behaves like
+   :n:`assert (@ident : form)`). If :n:`intro_pattern` is an action
+   introduction pattern, the tactic behaves like :n:`assert form` followed by
+   the action done by this introduction pattern.
 
-\subsection{\tt generalize \term}
-\tacindex{generalize}
-\label{generalize}
+.. tacv:: assert form as intro_pattern by tactic
 
-This tactic applies to any goal. It generalizes the conclusion with
-respect to some term.
+   This combines the two previous variants of :n:`assert`.
 
-\Example
+.. tacv:: assert (@ident := @term )
 
-\begin{coq_eval}
-Goal forall x y:nat, (0 <= x + y + y).
-intros.
-\end{coq_eval}
-\begin{coq_example}
-Show.
-generalize (x + y + y).
-\end{coq_example}
+   This behaves as :n:`assert (@ident : type) by exact @term` where :g:`type` is
+   the type of :g:`term`. This is deprecated in favor of :n:`pose proof`. If the
+   head of term is :n:`@ident`, the tactic behaves as :n:`specialize @term`.
 
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
+   .. exn:: Variable @ident is already declared
 
-If the goal is $G$ and $t$ is a subterm of type $T$ in the goal, then
-{\tt generalize} \textit{t} replaces the goal by {\tt forall (x:$T$), $G'$}
-where $G'$ is obtained from $G$ by replacing all occurrences of $t$ by
-{\tt x}. The name of the variable (here {\tt n}) is chosen based on $T$.
+.. tacv:: eassert form as intro_pattern by tactic
 
-\begin{Variants}
-\item {\tt generalize {\term$_1$ , \dots\ , \term$_n$}}
+.. tacv:: assert (@ident := @term)
 
-  This is equivalent to {\tt generalize \term$_n$; \dots\ ; generalize
-    \term$_1$}. Note that the sequence of \term$_i$'s are processed
-  from $n$ to $1$.
+   While the different variants of :n:`assert` expect that no existential
+   variables are generated by the tactic, :n:`eassert` removes this constraint.
+   This allows not to specify the asserted statement completeley before starting
+   to prove it.
 
-\item {\tt generalize {\term} at {\num$_1$ \dots\ \num$_i$}}
+.. tacv:: pose proof @term {? as intro_pattern}
 
-  This is equivalent to {\tt generalize \term} but it generalizes only over
-  the specified occurrences of {\term} (counting from left to right on the
-  expression printed using option {\tt Set Printing All}).
+   This tactic behaves like :n:`assert T {? as intro_pattern} by exact @term`
+   where :g:`T` is the type of :g:`term`. In particular,
+   :n:`pose proof @term as @ident` behaves as :n:`assert (@ident := @term)`
+   and :n:`pose proof @term as intro_pattern` is the same as applying the
+   intro_pattern to :n:`@term`.
 
-\item {\tt generalize {\term} as {\ident}}
+.. tacv:: epose proof term {? as intro_pattern}
 
-  This is equivalent to {\tt generalize \term} but it uses {\ident} to name the
-  generalized hypothesis.
+   While :n:`pose proof` expects that no existential variables are generated by
+   the tactic, :n:`epose proof` removes this constraint.
 
-\item {\tt generalize {\term$_1$} at {\num$_{11}$ \dots\ \num$_{1i_1}$}
-                      as {\ident$_1$}
-                      , {\ldots} ,
-                      {\term$_n$} at {\num$_{n1}$ \mbox{\dots} \num$_{ni_n}$}
-                      as {\ident$_2$}}
+.. tacv:: enough (@ident : form)
 
-  This is the most general form of {\tt generalize} that combines the
-  previous behaviors.
+   This adds a new hypothesis of name :n:`@ident` asserting :n:`form` to the
+   goal the tactic :n:`enough` is applied to. A new subgoal stating :n:`form` is
+   inserted after the initial goal rather than before it as :n:`assert` would do.
 
-\item {\tt generalize dependent \term} \tacindex{generalize dependent}
+.. tacv:: enough form
 
-  This generalizes {\term} but also {\em all} hypotheses that depend
-  on {\term}. It clears the generalized hypotheses.
+   This behaves like :n:`enough (@ident : form)` with the name :n:`@ident` of
+   the hypothesis generated by Coq.
 
-\end{Variants}
+.. tacv:: enough form as intro_pattern
 
-\subsection{\tt evar ( {\ident} :\ {\term} )}
-\tacindex{evar}
-\label{evar}
+   This behaves like :n:`enough form` using :n:`intro_pattern` to name or
+   destruct the new hypothesis.
 
-The {\tt evar} tactic creates a new local definition named \ident\ with
-type \term\ in the context. The body of this binding is a fresh
-existential variable.
+.. tacv:: enough (@ident : form) by tactic
+.. tacv:: enough form by tactic
+.. tacv:: enough form as intro_pattern by tactic
 
-\subsection{\tt instantiate ( {\ident} := {\term} )}
-\tacindex{instantiate}
-\label{instantiate}
+   This behaves as above but with :n:`tactic` expected to solve the initial goal
+   after the extra assumption :n:`form` is added and possibly destructed. If the
+   :n:`as intro_pattern` clause generates more than one subgoal, :n:`tactic` is
+   applied to all of them.
 
-The {\tt instantiate} tactic refines (see Section~\ref{refine})
-an existential variable {\ident} with the term {\term}.
-It is equivalent to {\tt only [\ident]: refine \term} (preferred alternative).
+.. tacv:: eenough (@ident : form) by tactic
+.. tacv:: eenough form by tactic
+.. tacv:: eenough form as intro_pattern by tactic
 
-\begin{Remarks}
-\item To be able to refer to an existential variable by name, the
-user must have given the name explicitly (see~\ref{ExistentialVariables}).
+   While the different variants of :n:`enough` expect that no existential
+   variables are generated by the tactic, :n:`eenough` removes this constraint.
 
-\item When you are referring to hypotheses which you did not name
-explicitly, be aware that Coq may make a different decision on how to
-name the variable in the current goal and in the context of the
-existential variable. This can lead to surprising behaviors.
-\end{Remarks}
+.. tacv:: cut form
 
-\begin{Variants}
+   This tactic applies to any goal. It implements the non-dependent case of
+   the “App” rule given in :ref:`TODO-4.2`. (This is Modus Ponens inference
+   rule.) :n:`cut U` transforms the current goal :g:`T` into the two following
+   subgoals: :g:`U -> T` and :g:`U`. The subgoal :g:`U -> T` comes first in the
+   list of remaining subgoal to prove.
 
-  \item {\tt instantiate ( {\num} := {\term} )}
-  This variant allows to refer to an existential variable which was not
-  named by the user. The {\num} argument is the position of the
-  existential variable from right to left in the goal.
-  Because this variant is not robust to slight changes in the goal,
-  its use is strongly discouraged.
+.. tacv:: specialize (ident {* @term}) {? as intro_pattern}
+.. tacv:: specialize ident with @bindings_list {? as intro_pattern}
 
-  \item {\tt instantiate ( {\num} := {\term} ) in \ident}
+   The tactic :n:`specialize` works on local hypothesis :n:`@ident`. The
+   premises of this hypothesis (either universal quantifications or
+   non-dependent implications) are instantiated by concrete terms coming either
+   from arguments :n:`{* @term}` or from a :ref:`bindings list <bindingslist>`.
+   In the first form the application to :n:`{* @term}`  can be partial. The
+   first form is equivalent to :n:`assert (@ident := @ident {* @term})`. In the
+   second form, instantiation elements can also be partial. In this case the
+   uninstantiated arguments are inferred by unification if possible or left
+   quantified in the hypothesis otherwise. With the :n:`as` clause, the local
+   hypothesis :n:`@ident` is left unchanged and instead, the modified hypothesis
+   is introduced as specified by the :n:`intro_pattern`. The name :n:`@ident`
+   can also refer to a global lemma or hypothesis. In this case, for
+   compatibility reasons, the behavior of :n:`specialize` is close to that of
+   :n:`generalize`: the instantiated statement becomes an additional premise of
+   the goal. The :n:`as` clause is especially useful in this case to immediately
+   introduce the instantiated statement as a local hypothesis.
 
-  \item {\tt instantiate ( {\num} := {\term} ) in ( Value of {\ident} )}
+   .. exn:: @ident is used in hypothesis @ident
+   .. exn:: @ident is used in conclusion
 
-  \item {\tt instantiate ( {\num} := {\term} ) in ( Type of {\ident} )}
+.. tacn:: generalize @term
+   :name: generalize
 
-These allow to refer respectively to existential variables occurring in
-a hypothesis or in the body or the type of a local definition.
+   This tactic applies to any goal. It generalizes the conclusion with
+   respect to some term.
 
-  \item {\tt instantiate}
+.. example::
+   .. coqtop:: reset none
 
-    Without argument, the {\tt instantiate} tactic tries to solve as
-    many existential variables as possible, using information gathered
-    from other tactics in the same tactical. This is automatically
-    done after each complete tactic (i.e. after a dot in proof mode),
-    but not, for example, between each tactic when they are sequenced
-    by semicolons.
+      Goal forall x y:nat, 0 <= x + y + y.
+      Proof. intros *.
 
-\end{Variants}
+   .. coqtop:: all
 
-\subsection{\tt admit}
-\tacindex{admit}
-\tacindex{give\_up}
-\label{admit}
+      Show.
+      generalize (x + y + y).
 
-The {\tt admit} tactic allows temporarily skipping a subgoal so as to
-progress further in the rest of the proof.  A proof containing
-admitted goals cannot be closed with {\tt Qed} but only with
-{\tt Admitted}.
+If the goal is :g:`G` and :g:`t` is a subterm of type :g:`T` in the goal,
+then :n:`generalize t` replaces the goal by :g:`forall (x:T), G′` where :g:`G′`
+is obtained from :g:`G` by replacing all occurrences of :g:`t` by :g:`x`. The
+name of the variable (here :g:`n`) is chosen based on :g:`T`.
 
-\begin{Variants}
+.. tacv:: generalize {+ @term}
 
-  \item {\tt give\_up}
+   This is equivalent to :n:`generalize @term; ... ; generalize @term`.
+   Note that the sequence of term :sub:`i` 's are processed from n to 1.
 
-    Synonym of {\tt admit}.
+.. tacv:: generalize @term at {+ @num}
 
-\end{Variants}
+   This is equivalent to :n:`generalize @term` but it generalizes only over the
+   specified occurrences of :n:`@term` (counting from left to right on the
+   expression printed using option :g:`Set Printing All`).
 
-\subsection{\tt absurd \term}
-\tacindex{absurd}
-\label{absurd}
+.. tacv:: generalize @term as @ident
 
-This tactic applies to any goal. The argument {\term} is any
-proposition {\tt P} of type {\tt Prop}. This tactic applies {\tt
-  False} elimination, that is it deduces the current goal from {\tt
-  False}, and generates as subgoals {\tt $\sim$P} and {\tt P}. It is
-very useful in proofs by cases, where some cases are impossible. In
-most cases, \texttt{P} or $\sim$\texttt{P} is one of the hypotheses of
-the local context.
+   This is equivalent to :n:`generalize @term` but it uses :n:`@ident` to name
+   the generalized hypothesis.
 
-\subsection{\tt contradiction}
-\label{contradiction}
-\tacindex{contradiction}
+.. tacv:: generalize {+, @term at {+ @num} as @ident}
 
-This tactic applies to any goal. The {\tt contradiction} tactic
-attempts to find in the current context (after all {\tt intros}) an
-hypothesis that is equivalent to an empty inductive type (e.g. {\tt
-  False}), to the negation of a singleton inductive type (e.g. {\tt
-  True} or {\tt x=x}), or two contradictory hypotheses.
+   This is the most general form of :n:`generalize` that combines the previous
+   behaviors.
 
-\begin{ErrMsgs}
-\item \errindex{No such assumption}
-\end{ErrMsgs}
+.. tacv:: generalize dependent @term
 
-\begin{Variants}
-\item {\tt contradiction \ident}
+   This generalizes term but also *all* hypotheses that depend on :n:`@term`. It
+   clears the generalized hypotheses.
 
-The proof of {\tt False} is searched in the hypothesis named \ident.
-\end{Variants}
+.. tacn:: evar (@ident : @term)
+   :name: evar
 
-\subsection{\tt contradict \ident}
-\label{contradict}
-\tacindex{contradict}
+   The :n:`evar` tactic creates a new local definition named :n:`@ident` with type
+   :n:`@term` in the context. The body of this binding is a fresh existential
+   variable.
 
-This tactic allows manipulating negated hypothesis and goals. The
-name \ident\ should correspond to a hypothesis. With
-{\tt contradict H}, the current goal and context is transformed in
-the following way:
-\begin{itemize}
-\item  {\tt H:$\neg$A $\vd$  B} \ becomes \ {\tt $\vd$ A}
-\item  {\tt H:$\neg$A $\vd$ $\neg$B} \  becomes \ {\tt H: B $\vd$  A }
-\item  {\tt H: A $\vd$  B} \ becomes \ {\tt $\vd$ $\neg$A}
-\item  {\tt H: A $\vd$ $\neg$B} \ becomes \ {\tt H: B $\vd$ $\neg$A}
-\end{itemize}
+.. tacn:: instantiate (@ident := @term )
+   :name: instantiate
 
-\subsection{\tt exfalso}
-\label{exfalso}
-\tacindex{exfalso}
+   The instantiate tactic refines (see :tacn:`refine`) an existential variable
+   :n:`@ident` with the term :n:`@term`. It is equivalent to only [ident]:
+   :n:`refine @term` (preferred alternative).
 
-This tactic implements the ``ex falso quodlibet'' logical principle:
-an elimination of {\tt False} is performed on the current goal, and the
-user is then required to prove that {\tt False} is indeed provable in
-the current context. This tactic is a macro for {\tt elimtype False}.
+   .. note:: To be able to refer to an existential variable by name, the user
+             must have given the name explicitly (see :ref:`TODO-2.11`).
 
-\section{Case analysis and induction}
+   .. note:: When you are referring to hypotheses which you did not name
+             explicitly, be aware that Coq may make a different decision on how to
+             name the variable in the current goal and in the context of the
+             existential variable. This can lead to surprising behaviors.
+
+.. tacv:: instantiate (@num := @term)
+
+   This variant allows to refer to an existential variable which was not named
+   by the user. The :n:`@num` argument is the position of the existential variable
+   from right to left in the goal. Because this variant is not robust to slight
+   changes in the goal, its use is strongly discouraged.
+
+.. tacv:: instantiate ( @num := @term ) in @ident
+.. tacv:: instantiate ( @num := @term ) in ( Value of @ident )
+.. tacv:: instantiate ( @num := @term ) in ( Type of @ident )
+
+   These allow to refer respectively to existential variables occurring in a
+   hypothesis or in the body or the type of a local definition.
+
+.. tacv:: instantiate
+
+   Without argument, the instantiate tactic tries to solve as many existential
+   variables as possible, using information gathered from other tactics in the
+   same tactical. This is automatically done after each complete tactic (i.e.
+   after a dot in proof mode), but not, for example, between each tactic when
+   they are sequenced by semicolons.
+
+.. tacn:: admit
+   :name: admit
+
+The admit tactic allows temporarily skipping a subgoal so as to
+progress further in the rest of the proof. A proof containing admitted
+goals cannot be closed with :g:`Qed` but only with :g:`Admitted`.
+
+.. tacv:: give_up
+
+   Synonym of :n:`admit`.
+
+.. tacn:: absurd @term
+   :name: absurd
+
+   This tactic applies to any goal. The argument term is any proposition
+   :g:`P` of type :g:`Prop`. This tactic applies False elimination, that is it
+   deduces the current goal from False, and generates as subgoals :g:`∼P` and
+   :g:`P`. It is very useful in proofs by cases, where some cases are
+   impossible. In most cases, :g:`P` or :g:`∼P` is one of the hypotheses of the
+   local context.
+
+.. tacn:: contradiction
+   :name: contradiction
+
+   This tactic applies to any goal. The contradiction tactic attempts to
+   find in the current context (after all intros) an hypothesis that is
+   equivalent to an empty inductive type (e.g. :g:`False`), to the negation of
+   a singleton inductive type (e.g. :g:`True` or :g:`x=x`), or two contradictory
+   hypotheses.
+
+.. exn:: No such assumption
+
+.. tacv:: contradiction @ident
+
+   The proof of False is searched in the hypothesis named :n:`@ident`.
+
+.. tacn:: contradict @ident
+   :name: contradict
+
+   This tactic allows manipulating negated hypothesis and goals. The name
+   :n:`@ident` should correspond to a hypothesis. With :n:`contradict H`, the
+   current goal and context is transformed in the following way:
+
+   + H:¬A ⊢ B becomes ⊢ A
+   + H:¬A ⊢ ¬B becomes H: B ⊢ A
+   + H: A ⊢ B becomes ⊢ ¬A
+   + H: A ⊢ ¬B becomes H: B ⊢ ¬A
+
+.. tacn:: exfalso
+   :name: exfalso
+
+   This tactic implements the “ex falso quodlibet” logical principle: an
+   elimination of False is performed on the current goal, and the user is
+   then required to prove that False is indeed provable in the current
+   context. This tactic is a macro for :n:`elimtype False`.
+
+Case analysis and induction
+-------------------------------
 
 The tactics presented in this section implement induction or case
-analysis on inductive or co-inductive objects (see
-Section~\ref{Cic-inductive-definitions}).
+analysis on inductive or co-inductive objects (see :ref:`TODO-4.5`).
+
+.. tacn:: destruct @term
+   :name: destruct
+
+   This tactic applies to any goal. The argument :n:`@term` must be of
+   inductive or co-inductive type and the tactic generates subgoals, one
+   for each possible form of :n:`@term`, i.e. one for each constructor of the
+   inductive or co-inductive type. Unlike :n:`induction`, no induction
+   hypothesis is generated by :n:`destruct`.
+
+   There are special cases:
+
+   + If :n:`@term` is an identifier :n:`@ident` denoting a quantified variable
+     of the conclusion of the goal, then :n:`destruct @ident` behaves as
+     :n:`intros until @ident; destruct @ident`. If :n:`@ident` is not anymore
+     dependent in the goal after application of :n:`destruct`, it is erased
+     (to avoid erasure, use parentheses, as in :n:`destruct (@ident)`).
+
+     + If term is a num, then destruct num behaves asintros until num
+       followed by destruct applied to the last introduced hypothesis.
+
+     .. note::
+        For destruction of a numeral, use syntax destruct (num) (not
+        very interesting anyway).
+
+   + In case term is an hypothesis :n:`@ident` of the context, and :n:`@ident`
+     is not anymore dependent in the goal after application of :n:`destruct`, it
+     is erased (to avoid erasure, use parentheses, as in :n:`destruct (@ident)`).
+
+   + The argument :n:`@term` can also be a pattern of which holes are denoted
+     by “_”. In this case, the tactic checks that all subterms matching the
+     pattern in the conclusion and the hypotheses are compatible and
+     performs case analysis using this subterm.
+
+.. tacv:: destruct {+, @term}
+
+   This is a shortcut for :n:`destruct term; ...; destruct term`.
+
+.. tacv:: destruct @term as @disj_conj_intro_pattern
+
+   This behaves as :n:`destruct @term` but uses the names in :n:`@intro_pattern`
+   to name the variables introduced in the context. The :n:`@intro_pattern` must
+   have the form :n:`[p11 ... p1n | ... | pm1 ... pmn ]` with `m` being the
+   number of constructors of the type of :n:`@term`. Each variable introduced
+   by :n:`destruct` in the context of the `i`-th goal gets its name from the
+   list :n:`pi1 ... pin` in order. If there are not enough names,
+   :n:`@destruct` invents names for the remaining variables to introduce. More
+   generally, the :n:`pij` can be any introduction pattern (see
+   :tacn:`intros`). This provides a concise notation for chaining destruction of
+   an hypothesis.
+
+.. tacv:: destruct @term eqn:@naming_intro_pattern
+
+   This behaves as :n:`destruct @term` but adds an equation between :n:`@term`
+   and the value that :n:`@term` takes in each of the possible cases. The name
+   of the equation is specified by :n:`@naming_intro_pattern` (see
+   :tacn:`intros`), in particular `?` can be used to let Coq generate a fresh
+   name.
+
+.. tacv:: destruct @term with @bindings_list
+
+   This behaves like :n:`destruct @term` providing explicit instances for the
+   dependent premises of the type of :n:`@term` (see :ref:`syntax of bindings <bindingslist>`).
+
+.. tacv:: edestruct @term
+
+   This tactic behaves like :n:`destruct @term` except that it does not fail if
+   the instance of a dependent premises of the type of :n:`@term` is not
+   inferable. Instead, the unresolved instances are left as existential
+   variables to be inferred later, in the same way as :tacn:`eapply` does.
+
+.. tacv:: destruct @term using @term
+.. tacv:: destruct @term using @term with @bindings_list
+
+   These are synonyms of :n:`induction @term using @term` and
+   :n:`induction @term using @term with @bindings_list`.
+
+.. tacv:: destruct @term in @goal_occurrences
+
+   This syntax is used for selecting which occurrences of :n:`@term` the case
+   analysis has to be done on. The :n:`in @goal_occurrences` clause is an
+   occurrence clause whose syntax and behavior is described in
+   :ref:`occurences sets <occurencessets>`.
+
+.. tacv:: destruct @term with @bindings_list as @disj_conj_intro_pattern eqn:@naming_intro_pattern using @term with @bindings_list in @goal_occurrences
+.. tacv:: edestruct @term with @bindings_list as @disj_conj_intro_pattern eqn:@naming_intro_pattern using @term with @bindings_list in @goal_occurrences
+
+   These are the general forms of :n:`destruct` and :n:`edestruct`. They combine
+   the effects of the `with`, `as`, `eqn:`, `using`, and `in` clauses.
+
+.. tacv:: case term
+
+   The tactic :n:`case` is a more basic tactic to perform case analysis without
+   recursion. It behaves as :n:`elim @term` but using a case-analysis
+   elimination principle and not a recursive one.
+
+.. tacv:: case @term with @bindings_list
+
+   Analogous to :n:`elim @term with @bindings_list` above.
+
+.. tacv:: ecase @term
+.. tacv:: ecase @term with @bindings_list
+
+   In case the type of :n:`@term` has dependent premises, or dependent premises
+   whose values are not inferable from the :n:`with @bindings_list` clause,
+   :n:`ecase` turns them into existential variables to be resolved later on.
+
+.. tacv:: simple destruct @ident
+
+   This tactic behaves as :n:`intros until @ident; case @ident` when :n:`@ident`
+   is a quantified variable of the goal.
+
+.. tacv:: simple destruct @num
+
+   This tactic behaves as :n:`intros until @num; case @ident` where :n:`@ident`
+   is the name given by :n:`intros until @num` to the :n:`@num` -th
+   non-dependent premise of the goal.
+
+.. tacv:: case_eq @term
+
+   The tactic :n:`case_eq` is a variant of the :n:`case` tactic that allow to
+   perform case analysis on a term without completely forgetting its original
+   form. This is done by generating equalities between the original form of the
+   term and the outcomes of the case analysis.
+
+.. tacn:: induction @term
+   :name: induction
+
+   This tactic applies to any goal. The argument :n:`@term` must be of
+   inductive type and the tactic :n:`induction` generates subgoals, one for
+   each possible form of :n:`@term`, i.e. one for each constructor of the
+   inductive type.
+
+   If the argument is dependent in either the conclusion or some
+   hypotheses of the goal, the argument is replaced by the appropriate
+   constructor form in each of the resulting subgoals and induction
+   hypotheses are added to the local context using names whose prefix
+   is **IH**.
+
+   There are particular cases:
+
+   + If term is an identifier :n:`@ident` denoting a quantified variable of the
+     conclusion of the goal, then inductionident behaves as :n:`intros until
+     @ident; induction @ident`. If :n:`@ident` is not anymore dependent in the
+     goal after application of :n:`induction`, it is erased (to avoid erasure,
+     use parentheses, as in :n:`induction (@ident)`).
+   + If :n:`@term` is a :n:`@num`, then :n:`induction @num` behaves as
+     :n:`intros until @num` followed by :n:`induction` applied to the last
+     introduced hypothesis.
+
+     .. note::
+        For simple induction on a numeral, use syntax induction (num)
+        (not very interesting anyway).
+
+   + In case term is an hypothesis :n:`@ident` of the context, and :n:`@ident`
+     is not anymore dependent in the goal after application of :n:`induction`,
+     it is erased (to avoid erasure, use parentheses, as in
+     :n:`induction (@ident)`).
+   + The argument :n:`@term` can also be a pattern of which holes are denoted
+     by “_”. In this case, the tactic checks that all subterms matching the
+     pattern in the conclusion and the hypotheses are compatible and
+     performs induction using this subterm.
+
+.. example::
+   .. coqtop:: reset all
+
+      Lemma induction_test : forall n:nat, n = n -> n <= n.
+      intros n H.
+      induction n.
+
+.. exn:: Not an inductive product
+
+.. exn:: Unable to find an instance for the variables @ident ... @ident
+
+   Use in this case the variant :tacn:`elim ... with` below.
+
+.. tacv:: induction @term as @disj_conj_intro_pattern
+
+   This behaves as :tacn:`induction` but uses the names in
+   :n:`@disj_conj_intro_pattern` to name the variables introduced in the
+   context. The :n:`@disj_conj_intro_pattern` must typically be of the form
+   :n:`[ p` :sub:`11` :n:`... p` :sub:`1n` :n:`| ... | p`:sub:`m1` :n:`... p`:sub:`mn` :n:`]`
+   with :n:`m` being the number of constructors of the type of :n:`@term`. Each
+   variable introduced by induction in the context of the i-th goal gets its
+   name from the list :n:`p`:sub:`i1` :n:`... p`:sub:`in` in order. If there are
+   not enough names, induction invents names for the remaining variables to
+   introduce. More generally, the :n:`p`:sub:`ij` can be any
+   disjunctive/conjunctive introduction pattern (see :tacn:`intros ...`). For
+   instance, for an inductive type with  one constructor, the pattern notation
+   :n:`(p`:sub:`1` :n:`, ... , p`:sub:`n` :n:`)` can be used instead of
+   :n:`[ p`:sub:`1` :n:`... p`:sub:`n` :n:`]`.
+
+.. tacv:: induction @term with @bindings_list
+
+   This behaves like :tacn:`induction` providing explicit instances for the
+   premises of the type of :n:`term` (see :ref:`bindings list <bindingslist>`).
+
+.. tacv:: einduction @term
+
+   This tactic behaves like :tacn:`induction` except that it does not fail if
+   some dependent premise of the type of :n:`@term` is not inferable. Instead,
+   the unresolved premises are posed as existential variables to be inferred
+   later, in the same way as :tacn:`eapply` does.
+
+.. tacv:: induction @term using @term
+   :name: induction ... using ...
+
+   This behaves as :tacn:`induction`  but using :n:`@term` as induction scheme.
+   It does not expect the conclusion of the type of the first :n:`@term` to be
+   inductive.
+
+.. tacv:: induction @term using @term with @bindings_list
+
+   This behaves as :tacn:`induction ... using ...` but also providing instances
+   for the premises of the type of the second :n:`@term`.
+
+.. tacv:: induction {+, @term} using @qualid
+
+   This syntax is used for the case :n:`@qualid` denotes an induction principle
+   with complex predicates as the induction principles generated by
+   ``Function`` or ``Functional Scheme`` may be.
+
+.. tacv:: induction @term in @goal_occurrences
+
+   This syntax is used for selecting which occurrences of :n:`@term` the
+   induction has to be carried on. The :n:`in @goal_occurrences` clause is an
+   occurrence clause whose syntax and behavior is described in
+   :ref:`occurences sets <occurencessets>`. If variables or hypotheses not
+   mentioning :n:`@term` in their type are listed in :n:`@goal_occurrences`,
+   those are generalized as well in the statement to prove.
+
+   .. example::
+      .. coqtop:: reset all
+
+         Lemma comm x y : x + y = y + x.
+         induction y in x |-   *.
+         Show 2.
 
-\subsection{\tt destruct \term}
-\tacindex{destruct}
-\label{destruct}
+.. tacv:: induction @term with @bindings_list as @disj_conj_intro_pattern using @term with @bindings_list in @goal_occurrences
 
-This tactic applies to any goal. The argument {\term} must be of
-inductive or co-inductive type and the tactic generates subgoals, one
-for each possible form of {\term}, i.e. one for each constructor of
-the inductive or co-inductive type. Unlike {\tt induction}, no
-induction hypothesis is generated by {\tt destruct}.
+.. tacv:: einduction @term with @bindings_list as @disj_conj_intro_pattern using @term with @bindings_list in @goal_occurrences
 
-There are special cases:
+   These are the most general forms of ``induction`` and ``einduction``. It combines the
+   effects of the with, as, using, and in clauses.
 
-\begin{itemize}
+.. tacv:: elim @term
+   :name: elim
 
-\item If {\term} is an identifier {\ident} denoting a quantified
-  variable of the conclusion of the goal, then {\tt destruct {\ident}}
-  behaves as {\tt intros until {\ident}; destruct {\ident}}. If
-  {\ident} is not anymore dependent in the goal after application of
-  {\tt destruct}, it is erased (to avoid erasure, use
-  parentheses, as in {\tt destruct ({\ident})}).
+   This is a more basic induction tactic. Again, the type of the argument
+   :n:`@term` must be an inductive type. Then, according to the type of the
+   goal, the tactic ``elim`` chooses the appropriate destructor and applies it
+   as the tactic :tacn:`apply` would do. For instance, if the proof context
+   contains :g:`n:nat` and the current goal is :g:`T` of type :g:`Prop`, then
+   :n:`elim n` is equivalent to :n:`apply nat_ind with (n:=n)`. The tactic
+   ``elim`` does not modify the context of the goal, neither introduces the
+   induction loading into the context of hypotheses. More generally,
+   :n:`elim @term` also works when the type of :n:`@term` is a statement
+   with premises and whose conclusion is inductive. In that case the tactic
+   performs induction on the conclusion of the type of :n:`@term` and leaves the
+   non-dependent premises of the type as subgoals. In the case of dependent
+   products, the tactic tries to find an instance for which the elimination
+   lemma applies and fails otherwise.
 
-\item If {\term} is a {\num}, then {\tt destruct {\num}} behaves as
-{\tt intros until {\num}} followed by {\tt destruct} applied to the
-last introduced hypothesis. Remark: For destruction of a numeral, use
-syntax {\tt destruct ({\num})} (not very interesting anyway).
+.. tacv:: elim @term with @bindings_list
+   :name: elim ... with
 
-\item In case {\term} is an hypothesis {\ident} of the context,
-  and {\ident} is not anymore dependent in the goal after
-  application of {\tt destruct}, it is erased (to avoid erasure, use
-  parentheses, as in {\tt destruct ({\ident})}).
+   Allows to give explicit instances to the premises of the type of :n:`@term`
+   (see :ref:`bindings list <bindingslist>`).
 
-\item The argument {\term} can also be a pattern of which holes are
-  denoted by ``\_''. In this case, the tactic checks that all subterms
-  matching the pattern in the conclusion and the hypotheses are
-  compatible and performs case analysis using this subterm.
+.. tacv:: eelim @term
 
-\end{itemize}
+   In case the type of :n:`@term` has dependent premises, this turns them into
+   existential variables to be resolved later on.
 
-\begin{Variants}
-\item{\tt destruct \term$_1$, \ldots, \term$_n$}
+.. tacv:: elim @term using @term
+.. tacv:: elim @term using @term with @bindings_list
 
-  This is a shortcut for {\tt destruct \term$_1$; \ldots; destruct \term$_n$}.
+   Allows the user to give explicitly an elimination predicate :n:`@term` that
+   is not the standard one for the underlying inductive type of :n:`@term`. The
+   :n:`@bindings_list` clause allows instantiating premises of the type of
+   :n:`@term`.
 
-\item{\tt destruct {\term} as {\disjconjintropattern}}
+.. tacv:: elim @term with @bindings_list using @term with @bindings_list
+.. tacv:: eelim @term with @bindings_list using @term with @bindings_list
 
-  This behaves as {\tt destruct {\term}} but uses the names in
-  {\intropattern} to name the variables introduced in the context.
-  The {\intropattern} must have the form {\tt [} $p_{11}$ \ldots
-    $p_{1n_1}$ {\tt |} {\ldots} {\tt |} $p_{m1}$ \ldots $p_{mn_m}$
-    {\tt ]} with $m$ being the number of constructors of the type of
-  {\term}. Each variable introduced by {\tt destruct} in the context
-  of the $i^{th}$ goal gets its name from the list $p_{i1}$ \ldots
-  $p_{in_i}$ in order. If there are not enough names, {\tt destruct}
-  invents names for the remaining variables to introduce. More
-  generally, the $p_{ij}$ can be any introduction pattern (see
-  Section~\ref{intros-pattern}). This provides a concise notation for
-  chaining destruction of an hypothesis.
+   These are the most general forms of ``elim`` and ``eelim``. It combines the
+   effects of the ``using`` clause and of the two uses of the ``with`` clause.
 
-%  It is recommended to use this variant of {\tt destruct} for
-%  robust proof scripts.
+.. tacv:: elimtype form
 
-\item{\tt destruct {\term} eqn:{\namingintropattern}}
+   The argument :n:`form` must be inductively defined. :n:`elimtype I` is
+   equivalent to :n:`cut I. intro Hn; elim Hn; clear Hn.` Therefore the
+   hypothesis :g:`Hn` will not appear in the context(s) of the subgoal(s).
+   Conversely, if :g:`t` is a :n:`@term` of (inductive) type :g:`I` that does
+   not occur in the goal, then :n:`elim t` is equivalent to
+   :n:`elimtype I; 2:exact t.`
 
-  This behaves as {\tt destruct {\term}} but adds an equation between
-  {\term} and the value that {\term} takes in each of the possible
-  cases.  The name of the equation is specified by {\namingintropattern}
-  (see Section~\ref{intros-pattern}), in particular {\tt ?} can be
-  used to let Coq generate a fresh name.
+.. tacv:: simple induction @ident
 
-\item{\tt destruct {\term} with \bindinglist}
+   This tactic behaves as :n:`intros until @ident; elim @ident` when
+   :n:`@ident` is a quantified variable of the goal.
 
-  This behaves like \texttt{destruct {\term}} providing explicit
-  instances for the dependent premises of the type of {\term} (see
-  syntax of bindings in Section~\ref{Binding-list}).
+.. tacv:: simple induction @num
 
-\item{\tt edestruct {\term}\tacindex{edestruct}}
+   This tactic behaves as :n:`intros until @num; elim @ident` where :n:`@ident`
+   is the name given by :n:`intros until @num` to the :n:`@num`-th non-dependent
+   premise of the goal.
 
-  This tactic behaves like \texttt{destruct {\term}} except that it
-  does not fail if the instance of a dependent premises of the type of
-  {\term} is not inferable. Instead, the unresolved instances are left
-  as existential variables to be inferred later, in the same way as
-  {\tt eapply} does (see Section~\ref{eapply-example}).
+.. tacn:: double induction @ident @ident
+   :name: double induction
 
-\item{\tt destruct {\term$_1$} using {\term$_2$}}\\
-     {\tt destruct {\term$_1$} using {\term$_2$} with {\bindinglist}}
+   This tactic is deprecated and should be replaced by
+   :n:`induction @ident; induction @ident` (or
+   :n:`induction @ident ; destruct @ident` depending on the exact needs).
 
-  These are synonyms of {\tt induction {\term$_1$} using {\term$_2$}} and
-  {\tt induction {\term$_1$} using {\term$_2$} with {\bindinglist}}.
+.. tacv:: double induction num1 num2
 
-\item \texttt{destruct {\term} in {\occgoalset}}
+   This tactic is deprecated and should be replaced by
+   :n:`induction num1; induction num3` where :n:`num3` is the result
+   of :n:`num2 - num1`
 
-  This syntax is used for selecting which occurrences of {\term} the
-  case analysis has to be done on. The {\tt in {\occgoalset}} clause is an
-  occurrence clause whose syntax and behavior is described in
-  Section~\ref{Occurrences_clauses}.
+.. tacn:: dependent induction @ident
+   :name: dependent induction
 
-\item{\tt destruct {\term$_1$} with {\bindinglist$_1$}
-        as {\disjconjintropattern} eqn:{\namingintropattern}
-        using {\term$_2$} with {\bindinglist$_2$} in {\occgoalset}}\\
-     {\tt edestruct {\term$_1$} with {\bindinglist$_1$}
-        as {\disjconjintropattern} eqn:{\namingintropattern}
-        using {\term$_2$} with {\bindinglist$_2$} in {\occgoalset}}
+   The *experimental* tactic dependent induction performs induction-
+   inversion on an instantiated inductive predicate. One needs to first
+   require the Coq.Program.Equality module to use this tactic. The tactic
+   is based on the BasicElim tactic by Conor McBride
+   :cite:`DBLP:conf/types/McBride00` and the work of Cristina Cornes around
+   inversion :cite:`DBLP:conf/types/CornesT95`. From an instantiated
+   inductive predicate and a goal, it generates an equivalent goal where
+   the hypothesis has been generalized over its indexes which are then
+   constrained by equalities to be the right instances. This permits to
+   state lemmas without resorting to manually adding these equalities and
+   still get enough information in the proofs.
 
-  These are the general forms of {\tt destruct} and {\tt edestruct}.
-  They combine the effects of the {\tt with}, {\tt as}, {\tt eqn:}, {\tt using},
-  and {\tt in} clauses.
+.. example::
+   .. coqtop:: reset all
 
-\item{\tt case \term}\label{case}\tacindex{case}
+      Lemma le_minus : forall n:nat, n < 1 -> n = 0.
+      intros n H ; induction H.
 
-  The tactic {\tt case} is a more basic tactic to perform case
-  analysis without recursion. It behaves as {\tt elim \term} but using
-  a case-analysis elimination principle and not a recursive one.
+   Here we did not get any information on the indexes to help fulfill
+   this proof. The problem is that, when we use the ``induction`` tactic, we
+   lose information on the hypothesis instance, notably that the second
+   argument is 1 here. Dependent induction solves this problem by adding
+   the corresponding equality to the context.
 
-\item {\tt case {\term} with {\bindinglist}}
+   .. coqtop:: reset all
+
+      Require Import Coq.Program.Equality.
+      Lemma le_minus : forall n:nat, n < 1 -> n = 0.
+      intros n H ; dependent induction H.
 
-  Analogous to {\tt elim {\term} with {\bindinglist}} above.
+   The subgoal is cleaned up as the tactic tries to automatically
+   simplify the subgoals with respect to the generated equalities. In
+   this enriched context, it becomes possible to solve this subgoal.
 
-\item{\tt ecase {\term}\tacindex{ecase}}\\
-  {\tt ecase {\term} with {\bindinglist}}
+   .. coqtop:: all
 
-  In case the type of {\term} has dependent premises, or dependent
-  premises whose values are not inferable from the {\tt with
-  {\bindinglist}} clause, {\tt ecase} turns them into existential
-  variables to be resolved later on.
+      reflexivity.
 
-\item {\tt simple destruct \ident}\tacindex{simple destruct}
-
-  This tactic behaves as {\tt intros until
-    {\ident}; case {\tt {\ident}}} when {\ident} is a quantified
-  variable of the goal.
+   Now we are in a contradictory context and the proof can be solved.
 
-\item {\tt simple destruct {\num}}
+   .. coqtop:: all
 
-  This tactic behaves as {\tt intros until
-    {\num}; case {\tt {\ident}}} where {\ident} is the name given by
-  {\tt intros until {\num}} to the {\num}-th non-dependent premise of
-  the goal.
-
-\item{\tt case\_eq \term}\label{case_eq}\tacindex{case\_eq}
-
- The tactic {\tt case\_eq} is a variant of the {\tt case} tactic that
- allow to perform case analysis on a term without completely
- forgetting its original form. This is done by generating equalities
- between the original form of the term and the outcomes of the case
- analysis.
-
-% The effect of this tactic is similar to the effect of {\tt
-% destruct {\term} in |- *} with the exception that no new hypotheses
-% are introduced in the context.
+      inversion H.
 
-\end{Variants}
+   This technique works with any inductive predicate. In fact, the
+   ``dependent induction`` tactic is just a wrapper around the ``induction``
+   tactic. One can make its own variant by just writing a new tactic
+   based on the definition found in ``Coq.Program.Equality``.
+
+.. tacv:: dependent induction @ident generalizing {+ @ident}
+
+   This performs dependent induction on the hypothesis :n:`@ident` but first
+   generalizes the goal by the given variables so that they are universally
+   quantified in the goal. This is generally what one wants to do with the
+   variables that are inside some constructors in the induction hypothesis. The
+   other ones need not be further generalized.
 
-\subsection{\tt induction \term}
-\tacindex{induction}
-\label{Tac-induction}
+.. tacv:: dependent destruction @ident
+
+   This performs the generalization of the instance :n:`@ident` but uses
+   ``destruct`` instead of induction on the generalized hypothesis. This gives
+   results equivalent to ``inversion`` or ``dependent inversion`` if the
+   hypothesis is dependent.
 
-This tactic applies to any goal. The argument {\term} must be of
-inductive type and the tactic {\tt induction} generates subgoals,
-one for each possible form of {\term}, i.e. one for each constructor
-of the inductive type.
+See also :ref:`TODO-10.1-dependentinduction` for a larger example of ``dependent induction``
+and an explanation of the underlying technique.
+
+.. tacn:: function induction (@qualid {+ @term})
+   :name: function induction
 
-If the argument is dependent in either the conclusion or some
-hypotheses of the goal, the argument is replaced by the appropriate
-constructor form in each of the resulting subgoals and induction
-hypotheses are added to the local context using names whose prefix is
-{\tt IH}.
+   The tactic functional induction performs case analysis and induction
+   following the definition of a function. It makes use of a principle
+   generated by ``Function`` (see :ref:`TODO-2.3-Advancedrecursivefunctions`) or
+   ``Functional Scheme`` (see :ref:`TODO-13.2-Generationofinductionschemeswithfunctionalscheme`).
+   Note that this tactic is only available after a
 
-There are particular cases:
+.. example::
+   .. coqtop:: reset all
 
-\begin{itemize}
+      Require Import FunInd.
+      Functional Scheme minus_ind := Induction for minus Sort Prop.
+      Check minus_ind.
+      Lemma le_minus (n m:nat) : n - m <= n.
+      functional induction (minus n m) using minus_ind; simpl; auto.
+      Qed.
 
-\item If {\term} is an identifier {\ident} denoting a quantified
-  variable of the conclusion of the goal, then {\tt induction
-    {\ident}} behaves as {\tt intros until {\ident}; induction
-    {\ident}}.  If {\ident} is not anymore dependent in the goal
-  after application of {\tt induction}, it is erased (to avoid
-  erasure, use parentheses, as in {\tt induction ({\ident})}).
+.. note::
+   :n:`(@qualid {+ @term})` must be a correct full application
+   of :n:`@qualid`. In particular, the rules for implicit arguments are the
+   same as usual. For example use :n:`@qualid` if you want to write implicit
+   arguments explicitly.
+
+.. note::
+   Parentheses over :n:`@qualid {+ @term}` are mandatory.
+
+.. note::
+   :n:`functional induction (f x1 x2 x3)` is actually a wrapper for
+   :n:`induction x1, x2, x3, (f x1 x2 x3) using @qualid` followed by a cleaning
+   phase, where :n:`@qualid` is the induction principle registered for :g:`f`
+   (by the ``Function`` (see :ref:`TODO-2.3-Advancedrecursivefunctions`) or
+   ``Functional Scheme`` (see :ref:`TODO-13.2-Generationofinductionschemeswithfunctionalscheme`)
+   command) corresponding to the sort of the goal. Therefore
+   ``functional induction`` may fail if the induction scheme :n:`@qualid` is not
+   defined. See also :ref:`TODO-2.3-Advancedrecursivefunctions` for the function
+   terms accepted by ``Function``.
 
-\item If {\term} is a {\num}, then {\tt induction {\num}} behaves as
-{\tt intros until {\num}} followed by {\tt induction} applied to the
-last introduced hypothesis. Remark: For simple induction on a numeral,
-use syntax {\tt induction ({\num})} (not very interesting anyway).
+.. note::
+   There is a difference between obtaining an induction scheme
+   for a function by using :g:`Function` (see :ref:`TODO-2.3-Advancedrecursivefunctions`)
+   and by using :g:`Functional Scheme` after a normal definition using
+   :g:`Fixpoint` or :g:`Definition`. See :ref:`TODO-2.3-Advancedrecursivefunctions`
+   for details.
+
+See also: :ref:`TODO-2.3-Advancedrecursivefunctions`
+  :ref:`TODO-13.2-Generationofinductionschemeswithfunctionalscheme`
+  :tacn:`inversion`
 
-\item In case {\term} is an hypothesis {\ident} of the context,
-  and {\ident} is not anymore dependent in the goal after
-  application of {\tt induction}, it is erased (to avoid erasure, use
-  parentheses, as in {\tt induction ({\ident})}).
+.. exn:: Cannot find induction information on @qualid
+.. exn:: Not the right number of induction arguments
+
+.. tacv:: functional induction (@qualid {+ @term}) as @disj_conj_intro_pattern using @term with @bindings_list
+
+   Similarly to :tacn:`induction` and :tacn:`elim`, this allows giving
+   explicitly the name of the introduced variables, the induction principle, and
+   the values of dependent premises of the elimination scheme, including
+   *predicates* for mutual induction when :n:`@qualid` is part of a mutually
+   recursive definition.
+
+.. tacn:: discriminate @term
+   :name: discriminate
+
+   This tactic proves any goal from an assumption stating that two
+   structurally different :n:`@terms` of an inductive set are equal. For
+   example, from :g:`(S (S O))=(S O)` we can derive by absurdity any
+   proposition.
+
+   The argument :n:`@term` is assumed to be a proof of a statement of
+   conclusion :n:`@term = @term` with the two terms being elements of an
+   inductive set. To build the proof, the tactic traverses the normal forms
+   [3]_ of the terms looking for a couple of subterms :g:`u` and :g:`w` (:g:`u`
+   subterm of the normal form of :n:`@term` and :g:`w` subterm of the normal
+   form of :n:`@term`), placed at the same positions and whose head symbols are
+   two different constructors. If such a couple of subterms exists, then the
+   proof of the current goal is completed, otherwise the tactic fails.
+
+.. note::
+   The syntax :n:`discriminate @ident` can be used to refer to a hypothesis
+   quantified in the goal. In this case, the quantified hypothesis whose name is
+   :n:`@ident` is first introduced in the local context using
+   :n:`intros until @ident`.
+
+.. exn:: No primitive equality found
+.. exn:: Not a discriminable equality
+
+.. tacv:: discriminate @num
+
+   This does the same thing as :n:`intros until @num` followed by
+   :n:`discriminate @ident` where :n:`@ident` is the identifier for the last
+   introduced hypothesis.
+
+.. tacv:: discriminate @term with @bindings_list
+
+   This does the same thing as :n:`discriminate @term` but using the given
+   bindings to instantiate parameters or hypotheses of :n:`@term`.
+
+.. tacv:: ediscriminate @num
+.. tacv:: ediscriminate @term {? with @bindings_list}
+
+   This works the same as ``discriminate`` but if the type of :n:`@term`, or the
+   type of the hypothesis referred to by :n:`@num`, has uninstantiated
+   parameters, these parameters are left as existential variables.
+
+.. tacv:: discriminate
+
+   This behaves like :n:`discriminate @ident` if ident is the name of an
+   hypothesis to which ``discriminate`` is applicable; if the current goal is of
+   the form :n:`@term <> @term`, this behaves as
+   :n:`intro @ident; discriminate @ident`.
+
+   .. exn:: No discriminable equalities
+
+.. tacn:: injection @term
+   :name: injection
+
+   The injection tactic exploits the property that constructors of
+   inductive types are injective, i.e. that if :g:`c` is a constructor of an
+   inductive type and :g:`c t`:sub:`1` and :g:`c t`:sub:`2` are equal then
+   :g:`t`:sub:`1` and :g:`t`:sub:`2` are equal too.
+
+   If :n:`@term` is a proof of a statement of conclusion :n:`@term = @term`,
+   then ``injection`` applies the injectivity of constructors as deep as
+   possible to derive the equality of all the subterms of :n:`@term` and
+   :n:`@term` at positions where the terms start to differ. For example, from
+   :g:`(S p, S n) = (q, S (S m))` we may derive :g:`S p = q` and
+   :g:`n = S m`. For this tactic to work, the terms should be typed with an
+   inductive type and they should be neither convertible, nor having a different
+   head constructor. If these conditions are satisfied, the tactic derives the
+   equality of all the subterms at positions where they differ and adds them as
+   antecedents to the conclusion of the current goal.
+
+.. example::
+
+   Consider the following goal:
+
+   .. coqtop:: reset all
+
+      Inductive list : Set :=
+      | nil : list
+      | cons : nat -> list -> list.
+      Variable P : list -> Prop.
+      Goal forall l n, P nil -> cons n l = cons 0 nil -> P l.
+      intros.
+      injection H0.
+
+
+Beware that injection yields an equality in a sigma type whenever the
+injected object has a dependent type :g:`P` with its two instances in
+different types :g:`(P t`:sub:`1` :g:`... t`:sub:`n` :g:`)` and
+:g:`(P u`:sub:`1` :g:`... u`:sub:`n` :sub:`)`. If :g:`t`:sub:`1` and
+:g:`u`:sub:`1` are the same and have for type an inductive type for which a decidable
+equality has been declared using the command ``Scheme Equality`` (see :ref:`TODO-13.1-GenerationofinductionprincipleswithScheme`),
+the use of a sigma type is avoided.
+
+.. note::
+   If some quantified hypothesis of the goal is named :n:`@ident`,
+   then :n:`injection @ident` first introduces the hypothesis in the local
+   context using :n:`intros until @ident`.
+
+.. exn:: Not a projectable equality but a discriminable one
+.. exn:: Nothing to do, it is an equality between convertible @terms
+.. exn:: Not a primitive equality
+.. exn:: Nothing to inject
+
+.. tacv:: injection @num
+
+   This does the same thing as :n:`intros until @num` followed by
+   :n:`injection @ident` where :n:`@ident` is the identifier for the last
+   introduced hypothesis.
+
+.. tacv:: injection @term with @bindings_list
+
+   This does the same as :n:`injection @term` but using the given bindings to
+   instantiate parameters or hypotheses of :n:`@term`.
+
+.. tacv:: einjection @num
+.. tacv:: einjection @term {? with @bindings_list}
+
+   This works the same as :n:`injection` but if the type of :n:`@term`, or the
+   type of the hypothesis referred to by :n:`@num`, has uninstantiated
+   parameters, these parameters are left as existential variables.
+
+.. tacv:: injection
+
+   If the current goal is of the form :n:`@term <> @term` , this behaves as
+   :n:`intro @ident; injection @ident`.
+
+   .. exn:: goal does not satisfy the expected preconditions
+
+.. tacv:: injection @term {? with @bindings_list} as {+ @intro_pattern}
+.. tacv:: injection @num as {+ intro_pattern}
+.. tacv:: injection as {+ intro_pattern}
+.. tacv:: einjection @term {? with @bindings_list} as {+ intro_pattern}
+.. tacv:: einjection @num as {+ intro_pattern}
+.. tacv:: einjection as {+ intro_pattern}
+
+   These variants apply :n:`intros {+ @intro_pattern}` after the call to
+   ``injection`` or ``einjection`` so that all equalities generated are moved in
+   the context of hypotheses. The number of :n:`@intro_pattern` must not exceed
+   the number of equalities newly generated. If it is smaller, fresh
+   names are automatically generated to adjust the list of :n:`@intro_pattern`
+   to the number of new equalities. The original equality is erased if it
+   corresponds to an hypothesis.
+
+It is possible to ensure that :n:`injection @term` erases the original
+hypothesis and leaves the generated equalities in the context rather
+than putting them as antecedents of the current goal, as if giving
+:n:`injection @term as` (with an empty list of names). To obtain this
+behavior, the option ``Set Structural Injection`` must be activated. This
+option is off by default.
+
+By default, ``injection`` only creates new equalities between :n:`@terms` whose
+type is in sort :g:`Type` or :g:`Set`, thus implementing a special behavior for
+objects that are proofs of a statement in :g:`Prop`. This behavior can be
+turned off by setting the option ``Set Keep Proof Equalities``.
+
+.. tacn:: inversion @ident
+   :name: inversion
+
+   Let the type of :n:`@ident` in the local context be :g:`(I t)`, where :g:`I`
+   is a (co)inductive predicate. Then, ``inversion`` applied to :n:`@ident`
+   derives for each possible constructor :g:`c i` of :g:`(I t)`, all the
+   necessary conditions that should hold for the instance :g:`(I t)` to be
+   proved by :g:`c i`.
+
+.. note::
+   If :n:`@ident` does not denote a hypothesis in the local context but
+   refers to a hypothesis quantified in the goal, then the latter is
+   first introduced in the local context using :n:`intros until @ident`.
 
-\item The argument {\term} can also be a pattern of which holes are
-  denoted by ``\_''. In this case, the tactic checks that all subterms
-  matching the pattern in the conclusion and the hypotheses are
-  compatible and performs induction using this subterm.
+.. note::
+   As ``inversion`` proofs may be large in size, we recommend the
+   user to stock the lemmas whenever the same instance needs to be
+   inverted several times. See :ref:`TODO-13.3-Generationofinversionprincipleswithderiveinversion`.
 
-\end{itemize}
+.. note::
+   Part of the behavior of the ``inversion`` tactic is to generate
+   equalities between expressions that appeared in the hypothesis that is
+   being processed. By default, no equalities are generated if they
+   relate two proofs (i.e. equalities between :n:`@terms` whose type is in sort
+   :g:`Prop`). This behavior can be turned off by using the option ``Set Keep
+   Proof Equalities``.
 
-\Example
+.. tacv:: inversion @num
 
-\begin{coq_example}
-Lemma induction_test : forall n:nat, n = n -> n <= n.
-intros n H.
-induction n.
-\end{coq_example}
+   This does the same thing as :n:`intros until @num` then :n:`inversion @ident`
+   where :n:`@ident` is the identifier for the last introduced hypothesis.
 
-\begin{ErrMsgs}
-\item \errindex{Not an inductive product}
-\item \errindex{Unable to find an instance for the variables
-{\ident} \ldots {\ident}}
+.. tacv:: inversion_clear @ident
 
-  Use in this case
-  the variant {\tt elim \dots\ with \dots} below.
-\end{ErrMsgs}
+   This behaves as :n:`inversion` and then erases :n:`@ident` from the context.
 
-\begin{Variants}
-\item{\tt induction {\term} as {\disjconjintropattern}}
+.. tacv:: inversion @ident as @intro_pattern
 
-  This behaves as {\tt induction {\term}} but uses the names in
-  {\disjconjintropattern} to name the variables introduced in the context.
-  The {\disjconjintropattern} must typically be of the form
-  {\tt [} $p_{11}$ {\ldots}
-  $p_{1n_1}$ {\tt |} {\ldots} {\tt |} $p_{m1}$ {\ldots} $p_{mn_m}$ {\tt
-    ]} with $m$ being the number of constructors of the type of
-  {\term}. Each variable introduced by {\tt induction} in the context
-  of the $i^{th}$ goal gets its name from the list $p_{i1}$ {\ldots}
-  $p_{in_i}$ in order. If there are not enough names, {\tt induction}
-  invents names for the remaining variables to introduce. More
-  generally, the $p_{ij}$ can be any disjunctive/conjunctive
-  introduction pattern (see Section~\ref{intros-pattern}). For instance,
-  for an inductive type with one constructor, the pattern notation
-  {\tt (}$p_{1}$ {\tt ,} {\ldots} {\tt ,} $p_{n}${\tt )} can be used instead of
-  {\tt [} $p_{1}$ {\ldots} $p_{n}$ {\tt ]}.
-
-%% \item{\tt induction {\term} eqn:{\namingintropattern}}
-
-%%   This behaves as {\tt induction {\term}} but adds an equation between
-%%   {\term} and the value that {\term} takes in each of the induction
-%%   case.  The name of the equation is built according to
-%%   {\namingintropattern} which can be an identifier, a ``?'', etc, as
-%%   indicated in Section~\ref{intros-pattern}.
-
-%% \item{\tt induction {\term} as {\disjconjintropattern} eqn:{\namingintropattern}}
-
-%%   This combines the two previous forms.
-
-\item{\tt induction {\term} with \bindinglist}
-
-  This behaves like \texttt{induction {\term}} providing explicit
-  instances for the premises of the type of {\term} (see the syntax of
-  bindings in Section~\ref{Binding-list}).
-
-\item{\tt einduction {\term}\tacindex{einduction}}
-
-  This tactic behaves like \texttt{induction {\term}} excepts that it
-  does not fail if some dependent premise of the type of {\term} is
-  not inferable. Instead, the unresolved premises are posed as
-  existential variables to be inferred later, in the same way as {\tt
-  eapply} does (see Section~\ref{eapply-example}).
-
-\item {\tt induction {\term$_1$} using {\term$_2$}}
-
-  This behaves as {\tt induction {\term$_1$}} but using {\term$_2$} as
-  induction scheme. It does not expect the conclusion of the type of
-  {\term$_1$} to be inductive.
-
-\item {\tt induction {\term$_1$} using {\term$_2$} with {\bindinglist}}
-
-  This behaves as {\tt induction {\term$_1$} using {\term$_2$}} but
-  also providing instances for the premises of the type of {\term$_2$}.
-
-\item \texttt{induction {\term}$_1$, {\ldots}, {\term}$_n$ using {\qualid}}
-
-  This syntax is used for the case {\qualid} denotes an induction principle
-  with complex predicates as the induction principles generated by
-  {\tt Function} or {\tt Functional Scheme} may be.
-
-\item \texttt{induction {\term} in {\occgoalset}}
-
-  This syntax is used for selecting which occurrences of {\term} the
-  induction has to be carried on. The {\tt in \occgoalset} clause is
-  an occurrence clause whose syntax and behavior is described in
-  Section~\ref{Occurrences_clauses}. If variables or hypotheses not
-  mentioning {\term} in their type are listed in {\occgoalset}, those
-  are generalized as well in the statement to prove.
+   This generally behaves as inversion but using names in :n:`@intro_pattern`
+   for naming hypotheses. The :n:`@intro_pattern` must have the form
+   :n:`[p`:sub:`11` :n:`... p`:sub:`1n` :n:`| ... | p`:sub:`m1` :n:`... p`:sub:`mn` :n:`]`
+   with `m` being the number of constructors of the type of :n:`@ident`. Be
+   careful that the list must be of length `m` even if ``inversion`` discards
+   some cases (which is precisely one of its roles): for the discarded
+   cases, just use an empty list (i.e. `n = 0`).The arguments of the i-th
+   constructor and the equalities that ``inversion`` introduces in the
+   context of the goal corresponding to the i-th constructor, if it
+   exists, get their names from the list :n:`p`:sub:`i1` :n:`... p`:sub:`in` in
+   order. If there are not enough names, ``inversion`` invents names for the
+   remaining variables to introduce. In case an equation splits into several
+   equations (because ``inversion`` applies ``injection`` on the equalities it
+   generates), the corresponding name :n:`p`:sub:`ij` in the list must be
+   replaced by a sublist of the form :n:`[p`:sub:`ij1` :n:`... p`:sub:`ijq` :n:`]`
+   (or, equivalently, :n:`(p`:sub:`ij1` :n:`, ..., p`:sub:`ijq` :n:`)`) where
+   `q` is the number of subequalities obtained from splitting the original
+   equation. Here is an example. The ``inversion ... as`` variant of
+   ``inversion`` generally behaves in a slightly more expectable way than
+   ``inversion`` (no artificial duplication of some hypotheses referring to
+   other hypotheses). To take benefit of these improvements, it is enough to use
+   ``inversion ... as []``, letting the names being finally chosen by Coq.
 
-\Example
+   .. example::
 
-\begin{coq_example}
-Lemma comm x y : x + y = y + x.
-induction y in x |- *.
-Show 2.
-\end{coq_example}
+      .. coqtop:: reset all
 
-\item {\tt induction {\term$_1$} with {\bindinglist$_1$}
-       as {\disjconjintropattern} %% eqn:{\namingintropattern}
-       using {\term$_2$} with {\bindinglist$_2$} in {\occgoalset}}\\
-     {\tt einduction {\term$_1$} with {\bindinglist$_1$}
-       as {\disjconjintropattern} %% eqn:{\namingintropattern}
-       using {\term$_2$} with {\bindinglist$_2$} in {\occgoalset}}
+         Inductive contains0 : list nat -> Prop :=
+         | in_hd : forall l, contains0 (0 :: l)
+         | in_tl : forall l b, contains0 l -> contains0 (b :: l).
+         Goal forall l:list nat, contains0 (1 :: l) -> contains0 l.
+         intros l H; inversion H as [ | l' p Hl' [Heqp Heql'] ].
 
-  These are the most general forms of {\tt induction} and {\tt
-  einduction}.  It combines the effects of the {\tt with}, {\tt as}, %%{\tt eqn:},
-  {\tt using}, and {\tt in} clauses.
+.. tacv:: inversion @num as @intro_pattern
 
-\item {\tt elim \term}\label{elim}
+   This allows naming the hypotheses introduced by :n:`inversion @num` in the
+   context.
 
-  This is a more basic induction tactic.  Again, the type of the
-  argument {\term} must be an inductive type. Then, according to
-  the type of the goal, the tactic {\tt elim} chooses the appropriate
-  destructor and applies it as the tactic {\tt apply}
-  would do. For instance, if the proof context contains {\tt
-  n:nat} and the current goal is {\tt T} of type {\tt
-  Prop}, then {\tt elim n} is equivalent to {\tt apply nat\_ind with
-  (n:=n)}.  The tactic {\tt elim} does not modify the context of
-  the goal, neither introduces the induction loading into the context
-  of hypotheses.
+.. tacv:: inversion_clear @ident as @intro_pattern
 
-  More generally, {\tt elim \term} also works when the type of {\term}
-  is a statement with premises and whose conclusion is inductive.  In
-  that case the tactic performs induction on the conclusion of the
-  type of {\term} and leaves the non-dependent premises of the type as
-  subgoals.  In the case of dependent products, the tactic tries to
-  find an instance for which the elimination lemma applies and fails
-  otherwise.
+   This allows naming the hypotheses introduced by ``inversion_clear`` in the
+   context. Notice that hypothesis names can be provided as if ``inversion``
+   were called, even though the ``inversion_clear`` will eventually erase the
+   hypotheses.
 
-\item {\tt elim {\term} with {\bindinglist}}
+.. tacv:: inversion @ident in {+ @ident}
 
-  Allows to give explicit instances to the premises of the type
-  of {\term} (see Section~\ref{Binding-list}).
+   Let :n:`{+ @ident}` be identifiers in the local context. This tactic behaves as
+   generalizing :n:`{+ @ident}`, and then performing ``inversion``.
 
-\item{\tt eelim {\term}\tacindex{eelim}}
+.. tacv:: inversion @ident as @intro_pattern in {+ @ident}
 
-  In case the type of {\term} has dependent premises, this turns them into
-  existential variables to be resolved later on.
+   This allows naming the hypotheses introduced in the context by
+   :n:`inversion @ident in {+ @ident}`.
 
-\item{\tt elim {\term$_1$} using {\term$_2$}}\\
-     {\tt elim {\term$_1$} using {\term$_2$} with {\bindinglist}\tacindex{elim \dots\ using}}
+.. tacv:: inversion_clear @ident in {+ @ident}
 
-Allows the user to give explicitly an elimination predicate
-{\term$_2$} that is not the standard one for the underlying inductive
-type of {\term$_1$}. The {\bindinglist} clause allows
-instantiating premises of the type of {\term$_2$}.
+   Let :n:`{+ @ident}` be identifiers in the local context. This tactic behaves
+   as generalizing :n:`{+ @ident}`, and then performing ``inversion_clear``.
 
-\item{\tt elim {\term$_1$} with {\bindinglist$_1$} using {\term$_2$} with {\bindinglist$_2$}}\\
-     {\tt eelim {\term$_1$} with {\bindinglist$_1$} using {\term$_2$} with {\bindinglist$_2$}}
+.. tacv:: inversion_clear @ident as @intro_pattern in {+ @ident}
 
-  These are the most general forms of {\tt elim} and {\tt eelim}.  It
-  combines the effects of the {\tt using} clause and of the two uses
-  of the {\tt with} clause.
+   This allows naming the hypotheses introduced in the context by
+   :n:`inversion_clear @ident in {+ @ident}`.
 
-\item {\tt elimtype \form}\tacindex{elimtype}
+.. tacv:: dependent inversion @ident
+   :name: dependent inversion
 
-  The argument {\form} must be inductively defined. {\tt elimtype I}
-  is equivalent to {\tt cut I. intro H{\rm\sl n}; elim H{\rm\sl n};
-    clear H{\rm\sl n}}. Therefore the hypothesis {\tt H{\rm\sl n}} will
-  not appear in the context(s) of the subgoal(s).  Conversely, if {\tt
-    t} is a term of (inductive) type {\tt I} that does not occur
-  in the goal, then {\tt elim t} is equivalent to {\tt elimtype I; 2:
-    exact t.}
-
-\item {\tt simple induction \ident}\tacindex{simple induction}
-
-  This tactic behaves as {\tt intros until
-    {\ident}; elim {\tt {\ident}}} when {\ident} is a quantified
-  variable of the goal.
-
-\item {\tt simple induction {\num}}
-
-  This tactic behaves as {\tt intros until
-    {\num}; elim {\tt {\ident}}} where {\ident} is the name given by
-  {\tt intros until {\num}} to the {\num}-th non-dependent premise of
-  the goal.
-
-%% \item {\tt simple induction {\term}}\tacindex{simple induction}
-
-%%   If {\term} is an {\ident} corresponding to a quantified variable of
-%%   the goal then the tactic behaves as {\tt intros until {\ident}; elim
-%%   {\tt {\ident}}}.  If {\term} is a {\num} then the tactic behaves as
-%%   {\tt intros until {\ident}; elim {\tt {\ident}}}.  Otherwise, it is
-%%   a synonym for {\tt elim {\term}}.
-
-%%   \Rem For simple induction on a numeral, use syntax {\tt simple
-%%   induction ({\num})}.
-
-\end{Variants}
-
-%\subsection[\tt FixPoint \dots]{\tt FixPoint \dots\tacindex{Fixpoint}}
-%Not yet documented.
-
-\subsection{\tt double induction \ident$_1$ \ident$_2$}
-\tacindex{double induction}
-
-This tactic is deprecated and should be replaced by {\tt induction \ident$_1$; induction \ident$_2$} (or {\tt induction \ident$_1$; destruct \ident$_2$} depending on the exact needs).
-
-%% This tactic applies to any goal. If the variables {\ident$_1$} and
-%% {\ident$_2$} of the goal have an inductive type, then this tactic
-%% performs double induction on these variables.  For instance, if the
-%% current goal is \verb+forall n m:nat, P n m+ then, {\tt double induction n
-%%   m} yields the four cases with their respective inductive hypotheses.
-
-%% In particular, for proving \verb+(P (S n) (S m))+, the generated induction
-%% hypotheses are \verb+(P (S n) m)+ and \verb+(m:nat)(P n m)+ (of the latter,
-%% \verb+(P n m)+ and \verb+(P n (S m))+ are derivable).
-
-%% \Rem When the induction hypothesis \verb+(P (S n) m)+ is not
-%% needed, {\tt induction \ident$_1$; destruct \ident$_2$} produces
-%% more concise subgoals.
-
-\begin{Variant}
-
-\item {\tt double induction \num$_1$ \num$_2$}
-
-This tactic is deprecated and should be replaced by {\tt induction
-  \num$_1$; induction \num$_3$} where \num$_3$ is the result of
-\num$_2$-\num$_1$.
-
-%% This applies double induction on the \num$_1^{th}$ and \num$_2^{th}$ {\it
-%% non dependent} premises of the goal. More generally, any combination of an
-%% {\ident} and a {\num} is valid.
-
-\end{Variant}
-
-\subsection{\tt dependent induction \ident}
-\tacindex{dependent induction}
-\label{DepInduction}
-
-The \emph{experimental} tactic \texttt{dependent induction} performs
-induction-inversion on an instantiated inductive predicate.
-One needs to first require the {\tt Coq.Program.Equality} module to use
-this tactic. The tactic is based on the BasicElim tactic by Conor
-McBride \cite{DBLP:conf/types/McBride00} and the work of Cristina Cornes
-around inversion \cite{DBLP:conf/types/CornesT95}. From an instantiated
-inductive predicate and a goal, it generates an equivalent goal where the
-hypothesis has been generalized over its indexes which are then
-constrained by equalities to be the right instances. This permits to
-state lemmas without resorting to manually adding these equalities and
-still get enough information in the proofs.
-
-\Example
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-\begin{coq_example}
-Lemma le_minus : forall n:nat, n < 1 -> n = 0.
-intros n H ; induction H.
-\end{coq_example}
-
-Here we did not get any information on the indexes to help fulfill this
-proof. The problem is that, when we use the \texttt{induction} tactic,
-we lose information on the hypothesis instance, notably that the second
-argument is \texttt{1} here. Dependent induction solves this problem by
-adding the corresponding equality to the context.
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-\begin{coq_example}
-Require Import Coq.Program.Equality.
-Lemma le_minus : forall n:nat, n < 1 -> n = 0.
-intros n H ; dependent induction H.
-\end{coq_example}
-
-The subgoal is cleaned up as the tactic tries to automatically
-simplify the subgoals with respect to the generated equalities.
-In this enriched context, it becomes possible to solve this subgoal.
-\begin{coq_example}
-reflexivity.
-\end{coq_example}
-
-Now we are in a contradictory context and the proof can be solved.
-\begin{coq_example}
-inversion H.
-\end{coq_example}
-
-This technique works with any inductive predicate.
-In fact, the \texttt{dependent induction} tactic is just a wrapper around
-the \texttt{induction} tactic. One can make its own variant by just
-writing a new tactic based on the definition found in
-\texttt{Coq.Program.Equality}.
-
-\begin{Variants}
-\item {\tt dependent induction {\ident} generalizing {\ident$_1$} \dots
-    {\ident$_n$}}\tacindex{dependent induction \dots\ generalizing}
-
-  This performs dependent induction on the hypothesis {\ident} but first
-  generalizes the goal by the given variables so that they are
-  universally quantified in the goal. This is generally what one wants
-  to do with the variables that are inside some constructors in the
-  induction hypothesis. The other ones need not be further generalized.
-
-\item {\tt dependent destruction {\ident}}\tacindex{dependent destruction}
-
-  This performs the generalization of the instance {\ident} but uses {\tt destruct}
-  instead of {\tt induction} on the generalized hypothesis. This gives
-  results equivalent to {\tt inversion} or {\tt dependent inversion} if
-  the hypothesis is dependent.
-\end{Variants}
-
-\SeeAlso \ref{dependent-induction-example} for a larger example of
-dependent induction and an explanation of the underlying technique.
-
-\subsection{\tt functional induction (\qualid\ \term$_1$ \dots\ \term$_n$)}
-\tacindex{functional induction}
-\label{FunInduction}
-
-The tactic \texttt{functional induction} performs
-case analysis and induction following the definition of a function. It
-makes use of a principle generated by \texttt{Function}
-(see Section~\ref{Function}) or \texttt{Functional Scheme}
-(see Section~\ref{FunScheme}). Note that this tactic is only available
-after a {\tt Require Import FunInd}.
-
-\begin{coq_eval}
-Reset Initial.
-Import Nat.
-\end{coq_eval}
-\begin{coq_example}
-Require Import FunInd.
-Functional Scheme minus_ind := Induction for minus Sort Prop.
-Check minus_ind.
-Lemma le_minus (n m:nat) : n - m <= n.
-functional induction (minus n m) using minus_ind; simpl; auto.
-\end{coq_example}
-\begin{coq_example*}
-Qed.
-\end{coq_example*}
-
-\Rem \texttt{(\qualid\ \term$_1$ \dots\ \term$_n$)} must be a correct
-full application of \qualid. In particular, the rules for implicit
-arguments are the same as usual. For example use \texttt{@\qualid} if
-you want to write implicit arguments explicitly.
-
-\Rem Parentheses over \qualid \dots \term$_n$ are mandatory.
-
-\Rem \texttt{functional induction (f x1 x2 x3)} is actually a wrapper
-for \texttt{induction x1, x2, x3, (f x1 x2 x3) using \qualid} followed by
-a cleaning phase, where {\qualid} is the induction principle
-registered for $f$ (by the \texttt{Function} (see Section~\ref{Function})
-or \texttt{Functional Scheme} (see Section~\ref{FunScheme}) command)
-corresponding to the sort of the goal.  Therefore \texttt{functional
-  induction} may fail if the induction scheme {\qualid} is
-not defined. See also Section~\ref{Function} for the function terms
-accepted by \texttt{Function}.
-
-\Rem There is a difference between obtaining an induction scheme for a
-function by using \texttt{Function} (see Section~\ref{Function}) and by
-using \texttt{Functional Scheme} after a normal definition using
-\texttt{Fixpoint} or \texttt{Definition}. See \ref{Function} for
-details.
-
-\SeeAlso{\ref{Function},\ref{FunScheme},\ref{FunScheme-examples},
-  \ref{sec:functional-inversion}}
-
-\begin{ErrMsgs}
-\item \errindex{Cannot find induction information on \qualid}
-\item \errindex{Not the right number of induction arguments}
-\end{ErrMsgs}
-
-\begin{Variants}
-\item {\tt functional induction (\qualid\ \term$_1$ \dots\ \term$_n$)
-  as {\disjconjintropattern} using \term$_{m+1}$ with \bindinglist}
-
- Similarly to \texttt{Induction} and \texttt{elim}
- (see Section~\ref{Tac-induction}), this allows giving explicitly the
- name of the introduced variables, the
- induction principle, and the values of dependent premises of the
- elimination scheme, including \emph{predicates} for mutual induction
- when {\qualid} is part of a mutually recursive definition.
-
-\end{Variants}
-
-\subsection{\tt discriminate \term}
-\label{discriminate}
-\tacindex{discriminate}
-
-
-This tactic proves any goal from an assumption stating that two
-structurally different terms of an inductive set are equal. For
-example, from {\tt (S (S O))=(S O)} we can derive by absurdity any
-proposition.
-
-The argument {\term} is assumed to be a proof of a statement
-of conclusion {\tt{\term$_1$} = {\term$_2$}} with {\term$_1$} and
-{\term$_2$} being elements of an inductive set.  To build the proof,
-the tactic traverses the normal forms\footnote{Reminder: opaque
-  constants will not be expanded by $\delta$ reductions.} of
-{\term$_1$} and {\term$_2$} looking for a couple of subterms {\tt u}
-and {\tt w} ({\tt u} subterm of the normal form of {\term$_1$} and
-{\tt w} subterm of the normal form of {\term$_2$}), placed at the same
-positions and whose head symbols are two different constructors. If
-such a couple of subterms exists, then the proof of the current goal
-is completed, otherwise the tactic fails.
-
-\Rem The syntax {\tt discriminate {\ident}} can be used to refer to a
-hypothesis quantified in the goal. In this case, the quantified
-hypothesis whose name is {\ident} is first introduced in the local
-context using \texttt{intros until \ident}.
-
-\begin{ErrMsgs}
-\item \errindex{No primitive equality found}
-\item \errindex{Not a discriminable equality}
-\end{ErrMsgs}
-
-\begin{Variants}
-\item \texttt{discriminate \num}
-
-  This does the same thing as \texttt{intros until \num} followed by
-  \texttt{discriminate \ident} where {\ident} is the identifier for
-  the last introduced hypothesis.
-
-\item \texttt{discriminate {\term} with \bindinglist}
-
-  This does the same thing as \texttt{discriminate {\term}} but using
-the given bindings to instantiate parameters or hypotheses of {\term}.
-
-\item \texttt{ediscriminate \num}\tacindex{ediscriminate}\\
-      \texttt{ediscriminate {\term} \zeroone{with \bindinglist}}
-
-  This works the same as {\tt discriminate} but if the type of {\term},
-  or the type of the hypothesis referred to by {\num}, has uninstantiated
-  parameters, these parameters are left as existential variables.
-
-\item \texttt{discriminate}
-
-  This behaves like {\tt discriminate {\ident}} if {\ident} is the
-  name of an hypothesis to which {\tt discriminate} is applicable; if
-  the current goal is of the form {\term$_1$} {\tt <>} {\term$_2$},
-  this behaves as {\tt intro {\ident}; discriminate {\ident}}.
-
-  \ErrMsg \errindex{No discriminable equalities}
-\end{Variants}
-
-\subsection{\tt injection \term}
-\label{injection}
-\tacindex{injection}
-
-The {\tt injection} tactic exploits the property that constructors of
-inductive types are injective, i.e. that if $c$ is a constructor
-of an inductive type and $c~\vec{t_1}$ and $c~\vec{t_2}$ are equal
-then $\vec{t_1}$ and $\vec{t_2}$ are equal too.
-
-If {\term} is a proof of a statement of conclusion
- {\tt {\term$_1$} = {\term$_2$}},
-then {\tt injection} applies the injectivity of constructors as deep as possible to
-derive the equality of all the subterms of {\term$_1$} and {\term$_2$} at positions
-where {\term$_1$} and {\term$_2$} start to differ.
-For example, from {\tt (S p, S n) = (q, S (S m)} we may derive {\tt S
-  p = q} and {\tt n = S m}. For this tactic to work, {\term$_1$} and
-{\term$_2$} should be typed with an inductive
-type and they should be neither convertible, nor having a different
-head constructor. If these conditions are satisfied, the tactic
-derives the equality of all the subterms of {\term$_1$} and
-{\term$_2$} at positions where they differ and adds them as
-antecedents to the conclusion of the current goal.
-
-\Example Consider the following goal:
-
-\begin{coq_example*}
-Inductive list : Set :=
-  | nil : list
-  | cons : nat -> list -> list.
-Variable P : list -> Prop.
-\end{coq_example*}
-\begin{coq_eval}
-Lemma ex :
- forall (l:list) (n:nat), P nil -> cons n l = cons 0 nil -> P l.
-intros l n H H0.
-\end{coq_eval}
-\begin{coq_example}
-Show.
-injection H0.
-\end{coq_example}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-Beware that \texttt{injection} yields an equality in a sigma type
-whenever the injected object has a dependent type $P$ with its two
-instances in different types $(P~t_1~...~t_n)$ and
-$(P~u_1~...~u_n)$. If $t_1$ and $u_1$ are the same and have for type
-an inductive type for which a decidable equality has been declared
-using the command {\tt Scheme Equality} (see \ref{Scheme}), the use of
-a sigma type is avoided.
-
-\Rem If some quantified hypothesis of the goal is named {\ident}, then
-{\tt injection {\ident}} first introduces the hypothesis in the local
-context using \texttt{intros until \ident}.
-
-\begin{ErrMsgs}
-\item \errindex{Not a projectable equality but a discriminable one}
-\item \errindex{Nothing to do, it is an equality between convertible terms}
-\item \errindex{Not a primitive equality}
-\item \errindex{Nothing to inject}
-\end{ErrMsgs}
-
-\begin{Variants}
-\item \texttt{injection \num}
-
-  This does the same thing as \texttt{intros until \num} followed by
-\texttt{injection \ident} where {\ident} is the identifier for the last
-introduced hypothesis.
-
-\item \texttt{injection {\term} with \bindinglist}
-
-  This does the same as \texttt{injection {\term}} but using
-  the given bindings to instantiate parameters or hypotheses of {\term}.
-
-\item \texttt{einjection \num}\tacindex{einjection}\\
-      \texttt{einjection {\term} \zeroone{with \bindinglist}}
-
-  This works the same as {\tt injection} but if the type of {\term},
-  or the type of the hypothesis referred to by {\num}, has uninstantiated
-  parameters, these parameters are left as existential variables.
-
-\item{\tt injection}
-
-  If the current goal is of the form {\term$_1$} {\tt <>} {\term$_2$},
-  this behaves as {\tt intro {\ident}; injection {\ident}}.
-
-  \ErrMsg \errindex{goal does not satisfy the expected preconditions}
-
-\item \texttt{injection {\term} \zeroone{with \bindinglist} as \nelistnosep{\intropattern}}\\
-\texttt{injection {\num} as {\intropattern} \dots\ \intropattern}\\
-\texttt{injection as {\intropattern} \dots\ \intropattern}\\
-\texttt{einjection {\term} \zeroone{with \bindinglist} as \nelistnosep{\intropattern}}\\
-\texttt{einjection {\num} as {\intropattern} \dots\ \intropattern}\\
-\texttt{einjection as {\intropattern} \dots\ \intropattern}
-\tacindex{injection \dots\ as}
-
-These variants apply \texttt{intros} \nelistnosep{\intropattern} after
-the call to \texttt{injection} or \texttt{einjection} so that all
-equalities generated are moved in the context of hypotheses. The
-number of {\intropattern} must not exceed the number of equalities
-newly generated. If it is smaller, fresh names are automatically
-generated to adjust the list of {\intropattern} to the number of new
-equalities. The original equality is erased if it corresponds to an
-hypothesis.
-
-\end{Variants}
-
-\optindex{Structural Injection}
-
-It is possible to ensure that \texttt{injection {\term}} erases the
-original hypothesis and leaves the generated equalities in the context
-rather than putting them as antecedents of the current goal, as if
-giving \texttt{injection {\term} as} (with an empty list of names). To
-obtain this behavior, the option {\tt Set Structural Injection} must
-be activated. This option is off by default.
-
-By default, \texttt{injection} only creates new equalities between
-terms whose type is in sort \texttt{Type} or \texttt{Set}, thus
-implementing a special behavior for objects that are proofs
-of a statement in \texttt{Prop}.  This behavior can be turned off
-by setting the option \texttt{Set Keep Proof Equalities}.
-\optindex{Keep Proof Equalities}
-\subsection{\tt inversion \ident}
-\tacindex{inversion}
-
-Let the type of {\ident} in the local context be $(I~\vec{t})$,
-where $I$ is a (co)inductive predicate. Then,
-\texttt{inversion} applied to \ident~ derives for each possible
-constructor $c_i$ of $(I~\vec{t})$, {\bf all} the necessary
-conditions that should hold for the instance $(I~\vec{t})$ to be
-proved by $c_i$.
-
-\Rem If {\ident} does not denote a hypothesis in the local context
-but refers to a hypothesis quantified in the goal, then the
-latter is first introduced in the local context using
-\texttt{intros until \ident}.
-
-\Rem As inversion proofs may be large in size, we recommend the user to
-stock the lemmas whenever the same instance needs to be inverted
-several times. See Section~\ref{Derive-Inversion}.
-
-\Rem Part of the behavior of the \texttt{inversion} tactic is to generate
-equalities between expressions that appeared in the hypothesis that is
-being processed.  By default, no equalities are generated if they relate
-two proofs (i.e. equalities between terms whose type is in
-sort \texttt{Prop}).  This behavior can be turned off by using the option
-\texttt{Set Keep Proof Equalities.}
-\optindex{Keep Proof Equalities}
-
-\begin{Variants}
-\item \texttt{inversion \num}
-
-  This does the same thing as \texttt{intros until \num} then
-  \texttt{inversion \ident} where {\ident} is the identifier for the
-  last introduced hypothesis.
-
-\item \tacindex{inversion\_clear} \texttt{inversion\_clear \ident}
-
-  This behaves as \texttt{inversion} and then erases \ident~ from the
-  context.
-
-\item \tacindex{inversion \dots\ as} \texttt{inversion {\ident} as \intropattern}
-
-  This generally behaves as \texttt{inversion} but using names in
-  {\intropattern} for naming hypotheses. The {\intropattern} must have
-  the form {\tt [} $p_{11} \ldots p_{1n_1}$ {\tt |} {\ldots} {\tt |}
-  $p_{m1} \ldots p_{mn_m}$ {\tt ]} with $m$ being the number of
-  constructors of the type of {\ident}. Be careful that the list must
-  be of length $m$ even if {\tt inversion} discards some cases (which
-  is precisely one of its roles): for the discarded cases, just use an
-  empty list (i.e. $n_i=0$).
-
-  The arguments of the $i^{th}$ constructor and the
-  equalities that {\tt inversion} introduces in the context of the
-  goal corresponding to the $i^{th}$ constructor, if it exists, get
-  their names from the list $p_{i1}$ \ldots $p_{in_i}$ in order. If
-  there are not enough names, {\tt inversion} invents names for the
-  remaining variables to introduce. In case an equation splits into
-  several equations (because {\tt inversion} applies {\tt injection}
-  on the equalities it generates), the corresponding name $p_{ij}$ in
-  the list must be replaced by a sublist of the form {\tt [$p_{ij1}$
-  \mbox{\dots} $p_{ijq}$]} (or, equivalently, {\tt ($p_{ij1}$,
-  \dots, $p_{ijq}$)}) where $q$ is the number of subequalities
-  obtained from splitting the original equation. Here is an example.
-
-  The \texttt{inversion \dots\ as} variant of \texttt{inversion}
-  generally behaves in a slightly more expectable way than
-  \texttt{inversion} (no artificial duplication of some hypotheses
-  referring to other hypotheses) To take benefit of these
-  improvements, it is enough to use \texttt{inversion \dots\ as []},
-  letting the names being finally chosen by {\Coq}.
-
-\begin{coq_eval}
-Require Import List.
-\end{coq_eval}
-
-\begin{coq_example}
-Inductive contains0 : list nat -> Prop :=
-  | in_hd : forall l, contains0 (0 :: l)
-  | in_tl : forall l b, contains0 l -> contains0 (b :: l).
-Goal forall l:list nat, contains0 (1 :: l) -> contains0 l.
-intros l H; inversion H as [ | l' p Hl' [Heqp Heql'] ].
-\end{coq_example}
-
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-\item \texttt{inversion {\num} as \intropattern}
-
-  This allows naming the hypotheses introduced by
-  \texttt{inversion \num} in the context.
-
-\item \tacindex{inversion\_clear \dots\ as} \texttt{inversion\_clear
-  {\ident} as \intropattern}
-
-  This allows naming the hypotheses introduced by
-  \texttt{inversion\_clear} in the context. Notice that hypothesis
-  names can be provided as if \texttt{inversion} were called, even
-  though the \texttt{inversion\_clear} will eventually erase the
-  hypotheses.
-
-\item \tacindex{inversion \dots\ in} \texttt{inversion {\ident}
-  in \ident$_1$ \dots\ \ident$_n$}
+   That must be used when :n:`@ident` appears in the current goal. It acts like
+   ``inversion`` and then substitutes :n:`@ident` for the corresponding
+   :n:`@@term` in the goal.
 
-  Let \ident$_1$ \dots\ \ident$_n$, be identifiers in the local context. This
-  tactic behaves as generalizing \ident$_1$ \dots\ \ident$_n$, and
-  then performing \texttt{inversion}.
+.. tacv:: dependent inversion @ident as @intro_pattern
 
-\item \tacindex{inversion \dots\ as \dots\ in} \texttt{inversion
-  {\ident} as {\intropattern} in \ident$_1$ \dots\
-  \ident$_n$}
+   This allows naming the hypotheses introduced in the context by
+   :n:`dependent inversion @ident`.
 
-  This allows naming the hypotheses introduced in the context by
-  \texttt{inversion {\ident} in \ident$_1$ \dots\ \ident$_n$}.
+.. tacv:: dependent inversion_clear @ident
 
-\item \tacindex{inversion\_clear \dots\ in} \texttt{inversion\_clear
-  {\ident} in \ident$_1$ \dots\ \ident$_n$}
+   Like ``dependent inversion``, except that :n:`@ident` is cleared from the
+   local context.
 
-  Let \ident$_1$ \dots\ \ident$_n$, be identifiers in the local context. This
-  tactic behaves as generalizing \ident$_1$ \dots\ \ident$_n$, and
-  then performing {\tt inversion\_clear}.
-
-\item \tacindex{inversion\_clear \dots\ as \dots\ in}
-  \texttt{inversion\_clear {\ident} as {\intropattern}
-  in \ident$_1$ \dots\ \ident$_n$}
+.. tacv:: dependent inversion_clear @ident as @intro_pattern
 
-  This allows naming the hypotheses introduced in the context by
-  \texttt{inversion\_clear {\ident} in \ident$_1$ \dots\ \ident$_n$}.
+   This allows naming the hypotheses introduced in the context by
+   :n:`dependent inversion_clear @ident`.
 
-\item \tacindex{dependent inversion} \texttt{dependent inversion \ident}
+.. tacv:: dependent inversion @ident with @term
+   :name: dependent inversion ...
 
-  That must be used when \ident\ appears in the current goal.  It acts
-  like \texttt{inversion} and then substitutes \ident\ for the
-  corresponding term in the goal.
+   This variant allows you to specify the generalization of the goal. It is
+   useful when the system fails to generalize the goal automatically. If
+   :n:`@ident` has type :g:`(I t)` and :g:`I` has type :math:`\forall`
+   :g:`(x:T), s`, then :n:`@term` must be of type :g:`I:`:math:`\forall`
+   :g:`(x:T), I x -> s'` where :g:`s'` is the type of the goal.
 
-\item \tacindex{dependent inversion \dots\ as } \texttt{dependent
-    inversion {\ident} as \intropattern}
+.. tacv:: dependent inversion @ident as @intro_pattern with @term
 
-  This allows naming the hypotheses introduced in the context by
-  \texttt{dependent inversion} {\ident}.
-
-\item \tacindex{dependent inversion\_clear} \texttt{dependent
-    inversion\_clear \ident}
-
-  Like \texttt{dependent inversion}, except that {\ident} is cleared
-  from the local context.
+   This allows naming the hypotheses introduced in the context by
+   :n:`dependent inversion @ident with @term`.
 
-\item \tacindex{dependent inversion\_clear \dots\ as}
-  \texttt{dependent inversion\_clear {\ident} as \intropattern}
+.. tacv:: dependent inversion_clear @ident with @term
 
-  This allows naming the hypotheses introduced in the context by
-  \texttt{dependent inversion\_clear} {\ident}.
+   Like :tacn:`dependent inversion ...` with but clears :n:`@ident` from the
+   local context.
 
-\item \tacindex{dependent inversion \dots\ with} \texttt{dependent
-    inversion {\ident} with \term}
+.. tacv:: dependent inversion_clear @ident as @intro_pattern with @term
 
-  This variant allows you to specify the generalization of the goal. It
-  is useful when the system fails to generalize the goal automatically. If
-  {\ident} has type $(I~\vec{t})$ and $I$ has type
-  $\forall (\vec{x}:\vec{T}), s$,   then \term~  must be of type
-  $I:\forall (\vec{x}:\vec{T}), I~\vec{x}\to s'$ where $s'$ is the
-  type of the goal.
+   This allows naming the hypotheses introduced in the context by
+   :n:`dependent inversion_clear @ident with @term`.
 
-\item \tacindex{dependent inversion \dots\ as \dots\ with}
-  \texttt{dependent inversion {\ident} as {\intropattern}
-  with \term}
+.. tacv:: simple inversion @ident
 
-  This allows naming the hypotheses introduced in the context by
-  \texttt{dependent inversion {\ident} with \term}.
+   It is a very primitive inversion tactic that derives all the necessary
+   equalities but it does not simplify the constraints as ``inversion`` does.
 
-\item \tacindex{dependent inversion\_clear \dots\ with}
-  \texttt{dependent inversion\_clear {\ident} with \term}
+.. tacv:: simple inversion @ident as @intro_pattern
 
-  Like \texttt{dependent inversion \dots\ with} but clears {\ident} from
-  the local context.
+   This allows naming the hypotheses introduced in the context by
+   ``simple inversion``.
 
-\item \tacindex{dependent inversion\_clear \dots\ as \dots\ with}
-  \texttt{dependent inversion\_clear {\ident} as
-  {\intropattern} with \term}
+.. tacv:: inversion @ident using @ident
 
-  This allows naming the hypotheses introduced in the context by
-  \texttt{dependent inversion\_clear {\ident} with \term}.
+   Let :n:`@ident` have type :g:`(I t)` (:g:`I` an inductive predicate) in the
+   local context, and :n:`@ident` be a (dependent) inversion lemma. Then, this
+   tactic refines the current goal with the specified lemma.
 
-\item \tacindex{simple inversion} \texttt{simple inversion \ident}
+.. tacv:: inversion @ident using @ident in {+ @ident}
 
-  It is a very primitive inversion tactic that derives all the necessary
-  equalities  but it does not simplify the  constraints as
-  \texttt{inversion} does.
+   This tactic behaves as generalizing :n:`{+ @ident}`, then doing
+   :n:`inversion @ident using @ident`.
 
-\item \tacindex{simple inversion \dots\ as} \texttt{simple inversion
-  {\ident} as \intropattern}
+.. tacv:: inversion_sigma
 
-  This allows naming the hypotheses introduced in the context by
-  \texttt{simple inversion}.
+   This tactic turns equalities of dependent pairs (e.g.,
+   :g:`existT P x p = existT P y q`, frequently left over by inversion on
+   a dependent type family) into pairs of equalities (e.g., a hypothesis
+   :g:`H : x = y` and a hypothesis of type :g:`rew H in p = q`); these
+   hypotheses can subsequently be simplified using :tacn:`subst`, without ever
+   invoking any kind of axiom asserting uniqueness of identity proofs. If you
+   want to explicitly specify the hypothesis to be inverted, or name the
+   generated hypotheses, you can invoke
+   :n:`induction H as [H1 H2] using eq_sigT_rect.` This tactic also works for
+   :g:`sig`, :g:`sigT2`, and :g:`sig2`, and there are similar :g:`eq_sig`
+   :g:`***_rect` induction lemmas.
 
-\item \tacindex{inversion \dots\ using} \texttt{inversion {\ident}
-  using \ident$'$}
+.. example::
 
-  Let {\ident} have type $(I~\vec{t})$ ($I$ an inductive
-  predicate) in the local context, and \ident$'$ be a (dependent) inversion
-  lemma. Then, this tactic refines the current goal with the specified
-  lemma.
+   *Non-dependent inversion*.
 
-\item \tacindex{inversion \dots\ using \dots\ in} \texttt{inversion
-  {\ident} using \ident$'$ in \ident$_1$\dots\ \ident$_n$}
+   Let us consider the relation Le over natural numbers and the following
+   variables:
 
-  This tactic behaves as generalizing \ident$_1$\dots\ \ident$_n$,
-  then doing \texttt{inversion {\ident} using \ident$'$}.
+   .. coqtop:: all
 
-\item \tacindex{inversion\_sigma} \texttt{inversion\_sigma}
+      Inductive Le : nat -> nat -> Set :=
+      | LeO : forall n:nat, Le 0 n
+      | LeS : forall n m:nat, Le n m -> Le (S n) (S m).
+      Variable P : nat -> nat -> Prop.
+      Variable Q : forall n m:nat, Le n m -> Prop.
 
-  This tactic turns equalities of dependent pairs (e.g.,
-  \texttt{existT P x p = existT P y q}, frequently left over by
-  \texttt{inversion} on a dependent type family) into pairs of
-  equalities (e.g., a hypothesis \texttt{H : x = y} and a hypothesis
-  of type \texttt{rew H in p = q}); these hypotheses can subsequently
-  be simplified using \texttt{subst}, without ever invoking any kind
-  of axiom asserting uniqueness of identity proofs.  If you want to
-  explicitly specify the hypothesis to be inverted, or name the
-  generated hypotheses, you can invoke \texttt{induction H as [H1 H2]
-    using eq\_sigT\_rect}.  This tactic also works for \texttt{sig},
-  \texttt{sigT2}, and \texttt{sig2}, and there are similar
-  \texttt{eq\_sig\emph{*}\_rect} induction lemmas.
+   Let us consider the following goal:
 
-\end{Variants}
+   .. coqtop:: none
 
-\firstexample
-\example{Non-dependent inversion}
-\label{inversion-examples}
+      Goal forall n m, Le (S n) m -> P n m.
+      intros.
 
-Let us consider the relation \texttt{Le} over natural numbers and the
-following variables:
+   .. coqtop:: all
 
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
+      Show.
 
-\begin{coq_example*}
-Inductive Le : nat -> nat -> Set :=
-  | LeO : forall n:nat, Le 0 n
-  | LeS : forall n m:nat, Le n m -> Le (S n) (S m).
-Variable P : nat -> nat -> Prop.
-Variable Q : forall n m:nat, Le n m -> Prop.
-\end{coq_example*}
+   To prove the goal, we may need to reason by cases on H and to derive
+   that m is necessarily of the form (S m 0 ) for certain m 0 and that
+   (Le n m 0 ). Deriving these conditions corresponds to prove that the
+   only possible constructor of (Le (S n) m) isLeS and that we can invert
+   the-> in the type of LeS. This inversion is possible because Le is the
+   smallest set closed by the constructors LeO and LeS.
 
-Let us consider the following goal:
+   .. coqtop:: undo all
 
-\begin{coq_eval}
-Lemma ex : forall n m:nat, Le (S n) m -> P n m.
-intros.
-\end{coq_eval}
+      inversion_clear H.
 
-\begin{coq_example}
-Show.
-\end{coq_example}
+   Note that m has been substituted in the goal for (S m0) and that the
+   hypothesis (Le n m0) has been added to the context.
 
-To prove the goal, we may need to reason by cases on \texttt{H} and to
-derive that \texttt{m} is necessarily of
-the form $(S~m_0)$ for certain $m_0$ and that $(Le~n~m_0)$.
-Deriving these conditions corresponds to prove that the
-only possible constructor of \texttt{(Le (S n) m)} is
-\texttt{LeS} and that we can invert the
-\texttt{->} in the type  of \texttt{LeS}.
-This inversion is possible because \texttt{Le} is the smallest set closed by
-the constructors \texttt{LeO} and \texttt{LeS}.
+   Sometimes it is interesting to have the equality m=(S m0) in the
+   context to use it after. In that case we can use inversion that does
+   not clear the equalities:
 
-\begin{coq_example}
-inversion_clear H.
-\end{coq_example}
+   .. coqtop:: undo all
 
-Note that \texttt{m} has been substituted in the goal for \texttt{(S m0)}
-and that the hypothesis \texttt{(Le n m0)} has been added to the
-context.
-
-Sometimes it is
-interesting to have the equality \texttt{m=(S m0)} in the
-context to use it after. In that case we can use \texttt{inversion} that
-does not clear the equalities:
-
-\begin{coq_eval}
-Undo.
-\end{coq_eval}
-
-\begin{coq_example}
-inversion H.
-\end{coq_example}
-
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-\example{Dependent inversion}
-
-Let us consider the following goal:
-
-\begin{coq_eval}
-Lemma ex_dep : forall (n m:nat) (H:Le (S n) m), Q (S n) m H.
-intros.
-\end{coq_eval}
-
-\begin{coq_example}
-Show.
-\end{coq_example}
-
-As \texttt{H} occurs in the goal, we may want to reason by cases on its
-structure and so, we would like  inversion tactics to
-substitute \texttt{H} by the corresponding term in constructor form.
-Neither \texttt{Inversion} nor  {\tt Inversion\_clear} make such a
-substitution.
-To have such a behavior we use the dependent inversion tactics:
-
-\begin{coq_example}
-dependent inversion_clear H.
-\end{coq_example}
-
-Note that \texttt{H} has been substituted by \texttt{(LeS n m0 l)} and
-\texttt{m} by \texttt{(S m0)}.
-
-\example{Using \texorpdfstring{\texttt{inversion\_sigma}}{inversion\_sigma}}
-
-Let us consider the following inductive type of length-indexed lists,
-and a lemma about inverting equality of \texttt{cons}:
-
-\begin{coq_eval}
-Reset Initial.
-Set Printing Compact Contexts.
-\end{coq_eval}
-
-\begin{coq_example*}
-Require Coq.Logic.Eqdep_dec.
-
-Inductive vec A : nat -> Type :=
-| nil : vec A O
-| cons {n} (x : A) (xs : vec A n) : vec A (S n).
-
-Lemma invert_cons : forall A n x xs y ys,
-    @cons A n x xs = @cons A n y ys
-    -> xs = ys.
-Proof.
-\end{coq_example*}
-
-\begin{coq_example}
-intros A n x xs y ys H.
-\end{coq_example}
-
-After performing \texttt{inversion}, we are left with an equality of
-\texttt{existT}s:
-
-\begin{coq_example}
-inversion H.
-\end{coq_example}
-
-We can turn this equality into a usable form with
-\texttt{inversion\_sigma}:
-
-\begin{coq_example}
-inversion_sigma.
-\end{coq_example}
-
-To finish cleaning up the proof, we will need to use the fact that
-that all proofs of \texttt{n = n} for \texttt{n} a \texttt{nat} are
-\texttt{eq\_refl}:
-
-\begin{coq_example}
-let H := match goal with H : n = n |- _ => H end in
-pose proof (Eqdep_dec.UIP_refl_nat _ H); subst H.
-simpl in *.
-\end{coq_example}
-
-Finally, we can finish the proof:
-
-\begin{coq_example}
-assumption.
-Qed.
-\end{coq_example}
-
-\subsection{\tt fix {\ident} {\num}}
-\tacindex{fix}
-\label{tactic:fix}
-
-This tactic is a primitive tactic to start a proof by induction. In
-general, it is easier to rely on higher-level induction tactics such
-as the ones described in Section~\ref{Tac-induction}.
-
-In the syntax of the tactic, the identifier {\ident} is the name given
-to the induction hypothesis. The natural number {\num} tells on which
-premise of the current goal the induction acts, starting
-from 1, counting both dependent and non dependent
-products, but skipping local definitions. Especially, the current
-lemma must be composed of at least {\num} products.
+      inversion H.
 
-Like in a {\tt fix} expression, the induction
-hypotheses have to be used on structurally smaller arguments.
-The verification that inductive proof arguments are correct is done
-only at the time of registering the lemma in the environment. To know
-if the use of induction hypotheses is correct at some
-time of the interactive development of a proof, use the command {\tt
-  Guarded} (see Section~\ref{Guarded}).
+.. example::
 
-\begin{Variants}
-  \item {\tt fix \ident$_1$ {\num} with ( \ident$_2$
-    \nelistnosep{\binder$_2$} \zeroone{\{ struct \ident$'_2$
-      \}} :~\type$_2$ ) \dots\ ( \ident$_n$
-    \nelistnosep{\binder$_n$} \zeroone{\{ struct \ident$'_n$ \}} :~\type$_n$ )}
-
-This starts a proof by mutual induction. The statements to be
-simultaneously proved are respectively {\tt forall}
-  \nelistnosep{{\binder}$_2$}{\tt ,} {\type}$_2$, {\ldots}, {\tt forall}
-  \nelistnosep{{\binder}$_n$}{\tt ,} {\type}$_n$.  The identifiers
-{\ident}$_1$ {\ldots} {\ident}$_n$ are the names of the induction
-hypotheses. The identifiers {\ident}$'_2$ {\ldots} {\ident}$'_n$ are the
-respective names of the premises on which the induction is performed
-in the statements to be simultaneously proved (if not given, the
-system tries to guess itself what they are).
-
-\end{Variants}
-
-\subsection{\tt cofix \ident}
-\tacindex{cofix}
-\label{tactic:cofix}
-
-This tactic starts a proof by coinduction. The identifier {\ident} is
-the name given to the coinduction hypothesis.  Like in a {\tt cofix}
-expression, the use of induction hypotheses have to guarded by a
-constructor.  The verification that the use of co-inductive hypotheses
-is correct is done only at the time of registering the lemma in the
-environment. To know if the use of coinduction hypotheses is correct
-at some time of the interactive development of a proof, use the
-command {\tt Guarded} (see Section~\ref{Guarded}).
-
-
-\begin{Variants}
-  \item {\tt cofix \ident$_1$ with ( \ident$_2$
-    \nelistnosep{\binder$_2$} :~\type$_2$ ) \dots\ (
-    \ident$_n$ \nelistnosep{\binder$_n$} :~\type$_n$ )}
-
-This starts a proof by mutual coinduction. The statements to be
-simultaneously proved are respectively {\tt forall}
-\nelistnosep{{\binder}$_2$}{\tt ,} {\type}$_2$, {\ldots}, {\tt forall}
-  \nelistnosep{{\binder}$_n$}{\tt ,} {\type}$_n$. The identifiers
-    {\ident}$_1$ {\ldots} {\ident}$_n$ are the names of the
-    coinduction hypotheses.
-
-\end{Variants}
-
-\section{Rewriting expressions}
-
-
-These tactics use the equality {\tt eq:forall A:Type, A->A->Prop}
-defined in file {\tt Logic.v} (see Section~\ref{Equality}). The
-notation for {\tt eq}~$T~t~u$ is simply {\tt $t$=$u$} dropping the
-implicit type of $t$ and $u$.
-
-\subsection{\tt rewrite \term}
-\label{rewrite}
-\tacindex{rewrite}
-
-This tactic applies to any goal. The type of {\term}
-must have the form
-
-\texttt{forall (x$_1$:A$_1$) \dots\ (x$_n$:A$_n$)}\texttt{eq} \term$_1$ \term$_2$.
-
-\noindent where \texttt{eq} is the Leibniz equality or a registered
-setoid equality.
-
-\noindent Then {\tt rewrite \term} finds the first subterm matching
-\term$_1$ in the goal, resulting in instances \term$_1'$ and \term$_2'$
-and then replaces every occurrence of \term$_1'$ by \term$_2'$.
-Hence, some of the variables x$_i$ are
-solved by unification, and some of the types \texttt{A}$_1$, \dots,
-\texttt{A}$_n$ become new subgoals.
-
-% \Rem In case the type of
-% \term$_1$ contains occurrences of variables bound in the
-% type of \term, the tactic tries first to find a subterm of the goal
-% which matches this term in order to find a closed instance \term$'_1$
-% of \term$_1$, and then all instances of \term$'_1$ will be replaced.
-
-\begin{ErrMsgs}
-\item \errindex{The term provided does not end with an equation}
-
-\item \errindex{Tactic generated a subgoal identical to the original goal}
-
-This happens if \term$_1$ does not occur in the goal.
-\end{ErrMsgs}
-
-\begin{Variants}
-\item {\tt rewrite -> \term}\tacindex{rewrite ->}
-
-  Is equivalent to {\tt rewrite \term}
-
-\item {\tt rewrite <- \term}\tacindex{rewrite <-}
-
-  Uses the equality \term$_1${\tt=}\term$_2$ from right to left
-
-\item {\tt rewrite {\term} in \nterm{clause}}
-  \tacindex{rewrite \dots\ in}
-
-  Analogous to {\tt rewrite {\term}} but rewriting is done following
-  \nterm{clause} (similarly to \ref{Conversion-tactics}). For
-  instance:
-  \begin{itemize}
-  \item \texttt{rewrite H in H1} will rewrite \texttt{H} in the hypothesis
-    \texttt{H1} instead of the current goal.
-  \item \texttt{rewrite H in H1 at 1, H2 at - 2 |- *} means \texttt{rewrite H; rewrite H in H1 at 1;
-      rewrite H in H2 at - 2}. In particular a failure will happen if any of
-    these three simpler tactics fails.
-  \item \texttt{rewrite H in * |- } will do \texttt{rewrite H in
-      H$_i$} for all hypotheses \texttt{H$_i$} different from \texttt{H}. A success will happen
-    as soon as at least one of these simpler tactics succeeds.
-  \item \texttt{rewrite H in *} is a combination of \texttt{rewrite H}
-    and \texttt{rewrite H in * |-} that succeeds if at
-    least one of these two tactics succeeds.
-  \end{itemize}
-  Orientation {\tt ->} or {\tt <-} can be
-  inserted before the term to rewrite.
-
-\item {\tt rewrite {\term} at {\occlist}}
-  \tacindex{rewrite \dots\ at}
-
-  Rewrite only the given occurrences of \term$_1'$. Occurrences are
-  specified from left to right as for \texttt{pattern} (\S
-  \ref{pattern}). The rewrite is always performed using setoid
-  rewriting, even for Leibniz's equality, so one has to
-  \texttt{Import Setoid} to use this variant.
+   *Dependent inversion.*
 
-\item {\tt rewrite {\term} by {\tac}}
-  \tacindex{rewrite \dots\ by}
+   Let us consider the following goal:
 
-  Use {\tac} to completely solve the side-conditions arising from the
-  rewrite.
+   .. coqtop:: reset none
 
-\item {\tt rewrite \term$_1$ , \mbox{\dots} , \term$_n$}
+      Inductive Le : nat -> nat -> Set :=
+      | LeO : forall n:nat, Le 0 n
+      | LeS : forall n m:nat, Le n m -> Le (S n) (S m).
+      Variable P : nat -> nat -> Prop.
+      Variable Q : forall n m:nat, Le n m -> Prop.
+      Goal forall n m (H:Le (S n) m), Q (S n) m H.
+      intros.
 
-  Is equivalent to the $n$ successive tactics {\tt rewrite $\term_1$}
-  up to {\tt rewrite $\term_n$}, each one working on the first subgoal
-  generated by the previous one.
-  Orientation {\tt ->} or {\tt <-} can be
-  inserted before each term to rewrite. One unique \nterm{clause}
-  can be added at the end after the keyword {\tt in}; it will
-  then affect all rewrite operations.
+   .. coqtop:: all
 
-\item In all forms of {\tt rewrite} described above, a term to rewrite
-  can be immediately prefixed by one of the following modifiers:
-  \begin{itemize}
-  \item {\tt ?} : the tactic {\tt rewrite ?$\term$} performs the
-    rewrite of $\term$  as many times as possible (perhaps zero time).
-    This form never fails.
-  \item {\tt $n$?} : works similarly, except that it will do at most
-   $n$ rewrites.
-  \item {\tt !} : works as {\tt ?}, except that at least one rewrite
-    should succeed, otherwise the tactic fails.
-  \item {\tt $n$!} (or simply {\tt $n$}) : precisely $n$ rewrites
-    of $\term$ will be done, leading to failure if these $n$ rewrites are not possible.
-  \end{itemize}
+      Show.
 
-\item {\tt erewrite {\term}\tacindex{erewrite}}
+   As H occurs in the goal, we may want to reason by cases on its
+   structure and so, we would like inversion tactics to substitute H by
+   the corresponding @term in constructor form. Neither Inversion nor
+   Inversion_clear make such a substitution. To have such a behavior we
+   use the dependent inversion tactics:
 
-This tactic works as {\tt rewrite {\term}} but turning unresolved
-bindings into existential variables, if any, instead of failing. It has
-the same variants as {\tt rewrite} has.
-
-\end{Variants}
-
-\subsection{\tt replace \term$_1$ with \term$_2$}
-\label{tactic:replace}
-\tacindex{replace \dots\ with}
-
-This tactic applies to any goal. It replaces all free occurrences of
-{\term$_1$} in the current goal with {\term$_2$} and generates the
-equality {\term$_2$}{\tt =}{\term$_1$} as a subgoal. This equality is
-automatically solved if it occurs among the assumption, or if its
-symmetric form occurs.  It is equivalent to {\tt cut
-\term$_2$=\term$_1$; [intro H{\sl n}; rewrite <- H{\sl n}; clear H{\sl
-n}| assumption || symmetry; try assumption]}.
-
-\begin{ErrMsgs}
-\item \errindex{terms do not have convertible types}
-\end{ErrMsgs}
-
-\begin{Variants}
-
-\item {\tt replace \term$_1$ with \term$_2$ by \tac}
-
-  This acts as {\tt replace \term$_1$ with \term$_2$} but applies {\tt \tac}
-  to solve the generated subgoal {\tt \term$_2$=\term$_1$}.
-
-\item {\tt replace {\term}}
-
-  Replaces {\term} with {\term'} using the
-  first assumption whose type has the form {\tt \term=\term'} or {\tt
-    \term'=\term}.
-
-\item {\tt replace -> {\term}}
-
-  Replaces {\term} with {\term'} using the
-  first assumption whose type has the form {\tt \term=\term'}
-
-\item {\tt replace <- {\term}}
-
-  Replaces {\term} with {\term'} using the
-  first assumption whose type has the form {\tt \term'=\term}
-
-\item {\tt replace {\term$_1$} with {\term$_2$} in \nterm{clause} }\\
-    {\tt replace {\term$_1$} with {\term$_2$} in \nterm{clause} by \tac }\\
-    {\tt replace {\term} in \nterm{clause}}\\
-    {\tt replace -> {\term} in \nterm{clause}}\\
-    {\tt replace <- {\term} in \nterm{clause}}
-
-    Acts as before but the replacements take place in
-    \nterm{clause}~(see Section~\ref{Conversion-tactics}) and not only
-    in the conclusion of the goal.
-    The \nterm{clause} argument must not contain any \texttt{type of} nor \texttt{value of}.
+   .. coqtop:: all
 
-\item {\tt cutrewrite <- (\term$_1$ = \term$_2$)}
-%\label{cutrewrite}
-\tacindex{cutrewrite}
+      dependent inversion_clear H.
 
-This tactic is deprecated. It acts like {\tt replace {\term$_2$} with
-  {\term$_1$}}, or, equivalently as {\tt enough} (\term$_1$ =
-\term$_2$) {\tt as <-}.
+   Note that H has been substituted by (LeS n m0 l) andm by (S m0).
 
-\item {\tt cutrewrite -> (\term$_1$ = \term$_2$)}
-%\label{cutrewrite}
-\tacindex{cutrewrite}
+.. example::
 
-This tactic is deprecated. It can be replaced by {\tt enough}
-(\term$_1$ = \term$_2$) {\tt as ->}.
+   *Using inversion_sigma.*
 
-\end{Variants}
+   Let us consider the following inductive type of
+   length-indexed lists, and a lemma about inverting equality of cons:
 
-\subsection{\tt subst \ident}
-\tacindex{subst}
-\optindex{Regular Subst Tactic}
-
-This tactic applies to a goal that has \ident\ in its context and (at
-least) one hypothesis, say $H$, of type {\tt \ident} = $t$ or $t$
-{\tt = \ident} with {\ident} not occurring in $t$.  Then it replaces
-{\ident} by $t$ everywhere in the goal (in the hypotheses and in the
-conclusion) and clears {\ident} and $H$ from the context.
+   .. coqtop:: reset all
 
-If {\ident} is a local definition of the form {\ident} := $t$, it is
-also unfolded and cleared.
+      Require Import Coq.Logic.Eqdep_dec.
 
-\Rem
-When several hypotheses have the form {\tt \ident} = $t$ or {\tt
-  $t$ = \ident}, the first one is used.
+      Inductive vec A : nat -> Type :=
+      | nil : vec A O
+      | cons {n} (x : A) (xs : vec A n) : vec A (S n).
 
-\Rem
-If $H$ is itself dependent in the goal, it is replaced by the
-proof of reflexivity of equality.
+      Lemma invert_cons : forall A n x xs y ys,
+               @cons A n x xs = @cons A n y ys
+               -> xs = ys.
 
-\begin{Variants}
-  \item {\tt subst \ident$_1$ {\dots} \ident$_n$}
+      Proof.
+      intros A n x xs y ys H.
 
-    This is equivalent to {\tt subst \ident$_1$; \dots; subst \ident$_n$}.
-  \item {\tt subst}
+   After performing inversion, we are left with an equality of existTs:
 
-    This applies {\tt subst} repeatedly from top to bottom to all
-    identifiers of the context for which an equality of the form {\tt
-      \ident} = $t$ or $t$ {\tt = \ident} or {\tt \ident} := $t$ exists, with
-    {\ident} not occurring in $t$.
+   .. coqtop:: all
 
-\noindent {\bf Remark: } The behavior of {\tt subst} can be controlled
-using option {\tt Set Regular Subst Tactic}. When this option is
-activated, {\tt subst} also deals with the following corner cases:
-\begin{itemize}
-\item A context with ordered hypotheses {\tt \ident$_1$ = \ident$_2$}
-  and {\tt \ident$_1$ = $t$}, or {$t'$ = \ident$_1$} with $t'$ not a
-  variable, and no other hypotheses of the form {\tt \ident$_2$ = $u$}
-  or {\tt $u$ = \ident$_2$}; without the option, a second call to {\tt
-    subst} would be necessary to replace {\ident$_2$} by $t$ or $t'$
-  respectively.
+      inversion H.
 
-\item The presence of a recursive equation which without the option
-  would be a cause of failure of {\tt subst}.
+   We can turn this equality into a usable form with inversion_sigma:
 
-\item A context with cyclic dependencies as with hypotheses {\tt
-  \ident$_1$ = f~\ident$_2$} and {\tt \ident$_2$ = g~\ident$_1$} which
-  without the option would be a cause of failure of {\tt subst}.
-\end{itemize}
-Additionally, it prevents a local definition such as {\tt \ident} :=
-  $t$ to be unfolded which otherwise it would exceptionally unfold in
-configurations containing hypotheses of the form {\tt {\ident} = $u$},
-or {\tt $u'$ = \ident} with $u'$ not a variable.
+   .. coqtop:: all
 
-Finally, it preserves the initial order of hypotheses, which without
-the option it may break.
+      inversion_sigma.
 
-The option is on by default.
+   To finish cleaning up the proof, we will need to use the fact that
+   that all proofs of n = n for n a nat are eq_refl:
 
-\end{Variants}
+   .. coqtop:: all
+
+      let H := match goal with H : n = n |- _ => H end in
+      pose proof (Eqdep_dec.UIP_refl_nat _ H); subst H.
+      simpl in *.
+
+   Finally, we can finish the proof:
+
+   .. coqtop:: all
+
+      assumption.
+      Qed.
+
+.. tacn:: fix ident num
+   :name: fix
+
+   This tactic is a primitive tactic to start a proof by induction. In
+   general, it is easier to rely on higher-level induction tactics such
+   as the ones described in :tacn:`induction`.
+
+   In the syntax of the tactic, the identifier :n:`@ident` is the name given to
+   the induction hypothesis. The natural number :n:`@num` tells on which
+   premise of the current goal the induction acts, starting from 1,
+   counting both dependent and non dependent products, but skipping local
+   definitions. Especially, the current lemma must be composed of at
+   least :n:`@num` products.
+
+   Like in a fix expression, the induction hypotheses have to be used on
+   structurally smaller arguments. The verification that inductive proof
+   arguments are correct is done only at the time of registering the
+   lemma in the environment. To know if the use of induction hypotheses
+   is correct at some time of the interactive development of a proof, use
+   the command ``Guarded`` (see :ref:`TODO-7.3.2-Guarded`).
+
+.. tacv:: fix @ident @num with {+ (ident {+ @binder} [{struct @ident}] : @type)}
+
+   This starts a proof by mutual induction. The statements to be simultaneously
+   proved are respectively :g:`forall binder ... binder, type`.
+   The identifiers :n:`@ident` are the names of the induction hypotheses. The identifiers
+   :n:`@ident` are the respective names of the premises on which the induction
+   is performed in the statements to be simultaneously proved (if not given, the
+   system tries to guess itself what they are).
+
+.. tacn:: cofix @ident
+   :name: cofix
+
+   This tactic starts a proof by coinduction. The identifier :n:`@ident` is the
+   name given to the coinduction hypothesis. Like in a cofix expression,
+   the use of induction hypotheses have to guarded by a constructor. The
+   verification that the use of co-inductive hypotheses is correct is
+   done only at the time of registering the lemma in the environment. To
+   know if the use of coinduction hypotheses is correct at some time of
+   the interactive development of a proof, use the command ``Guarded``
+   (see :ref:`TODO-7.3.2-Guarded`).
+
+.. tacv:: cofix @ident with {+ (@ident {+ @binder} : @type)}
+
+   This starts a proof by mutual coinduction. The statements to be
+   simultaneously proved are respectively :g:`forall binder ... binder, type`
+   The identifiers :n:`@ident` are the names of the coinduction hypotheses.
+
+.. _rewritingexpressions:
+
+Rewriting expressions
+---------------------
+
+These tactics use the equality :g:`eq:forall A:Type, A->A->Prop` defined in
+file ``Logic.v`` (see :ref:`TODO-3.1.2-Logic`). The notation for :g:`eq T t u` is
+simply :g:`t=u` dropping the implicit type of :g:`t` and :g:`u`.
+
+.. tacn:: rewrite @term
+   :name: rewrite
+
+This tactic applies to any goal. The type of :n:`@term` must have the form
+
+``forall (x``:sub:`1` ``:A``:sub:`1` ``) ... (x``:sub:`n` ``:A``:sub:`n` ``). eq term``:sub:`1` ``term``:sub:`2` ``.``
+
+where :g:`eq` is the Leibniz equality or a registered setoid equality.
+
+Then :n:`rewrite @term` finds the first subterm matching `term`\ :sub:`1` in the goal,
+resulting in instances `term`:sub:`1`' and `term`:sub:`2`' and then
+replaces every occurrence of `term`:subscript:`1`' by `term`:subscript:`2`'.
+Hence, some of the variables :g:`x`\ :sub:`i` are solved by unification,
+and some of the types :g:`A`\ :sub:`1`:g:`, ..., A`\ :sub:`n` become new
+subgoals.
+
+.. exn:: The @term provided does not end with an equation
+
+.. exn:: Tactic generated a subgoal identical to the original goal. This happens if @term does not occur in the goal.
+
+.. tacv:: rewrite -> @term
+
+  Is equivalent to :n:`rewrite @term`
+
+.. tacv:: rewrite <- @term
+
+  Uses the equality :n:`@term`:sub:`1` :n:`= @term` :sub:`2` from right to left
+
+.. tacv:: rewrite @term in clause
+
+  Analogous to :n:`rewrite @term` but rewriting is done following clause
+  (similarly to :ref:`performing computations <performingcomputations>`). For instance:
+
+      + :n:`rewrite H in H`:sub:`1` will rewrite `H` in the hypothesis
+        `H`:sub:`1` instead of the current goal.
+      + :n:`rewrite H in H`:sub:`1` :g:`at 1, H`:sub:`2` :g:`at - 2 |- *` means
+        :n:`rewrite H; rewrite H in H`:sub:`1` :g:`at 1; rewrite H in H`:sub:`2` :g:`at - 2.`
+        In particular a failure will happen if any of these three simpler tactics
+        fails.
+      + :n:`rewrite H in * |-` will do :n:`rewrite H in H`:sub:`i` for all hypotheses
+        :g:`H`:sub:`i` :g:`<> H`. A success will happen as soon as at least one of these
+        simpler tactics succeeds.
+      + :n:`rewrite H in *` is a combination of :n:`rewrite H` and :n:`rewrite H in * |-`
+        that succeeds if at least one of these two tactics succeeds.
+
+  Orientation :g:`->` or :g:`<-` can be inserted before the :n:`@term` to rewrite.
+
+.. tacv:: rewrite @term at occurrences
+
+  Rewrite only the given occurrences of :n:`@term`. Occurrences are
+  specified from left to right as for pattern (:tacn:`pattern`). The rewrite is
+  always performed using setoid rewriting, even for Leibniz’s equality, so one
+  has to ``Import Setoid`` to use this variant.
+
+.. tacv:: rewrite @term by tactic
+
+  Use tactic to completely solve the side-conditions arising from the
+  :tacn:`rewrite`.
+
+.. tacv:: rewrite {+ @term}
+
+  Is equivalent to the `n` successive tactics :n:`{+ rewrite @term}`, each one
+  working on the first subgoal generated by the previous one. Orientation
+  :g:`->` or :g:`<-` can be inserted before each :n:`@term` to rewrite.  One
+  unique clause can be added at the end after the keyword in; it will then
+  affect all rewrite operations.
+
+  In all forms of rewrite described above, a :n:`@term` to rewrite can be
+  immediately prefixed by one of the following modifiers:
+
+  + `?` : the tactic rewrite :n:`?@term` performs the rewrite of :n:`@term` as many
+    times as possible (perhaps zero time). This form never fails.
+  + `n?` : works similarly, except that it will do at most `n` rewrites.
+  + `!` : works as ?, except that at least one rewrite should succeed, otherwise
+    the tactic fails.
+  + `n!` (or simply `n`) : precisely `n` rewrites of :n:`@term` will be done,
+    leading to failure if these n rewrites are not possible.
+
+.. tacv:: erewrite @term
+
+  This tactic works as :n:`rewrite @term` but turning
+  unresolved bindings into existential variables, if any, instead of
+  failing. It has the same variants as :tacn:`rewrite` has.
+
+.. tacn:: replace @term with @term
+   :name: replace
+
+   This tactic applies to any goal. It replaces all free occurrences of :n:`@term`
+   in the current goal with :n:`@term` and generates the equality :n:`@term =
+   @term` as a subgoal. This equality is automatically solved if it occurs among
+   the assumption, or if its symmetric form occurs. It is equivalent to
+   :n:`cut @term = @term; [intro H`:sub:`n` :n:`; rewrite <- H`:sub:`n` :n:`; clear H`:sub:`n`:n:`|| assumption || symmetry; try assumption]`.
+
+.. exn:: @terms do not have convertible types
+
+.. tacv:: replace @term with @term by tactic
+
+  This acts as :n:`replace @term` with :n:`@term` but applies tactic to solve the generated
+  subgoal :n:`@term = @term`.
+
+.. tacv:: replace @term
+
+  Replaces :n:`@term` with :n:`@term’` using the first assumption whose type has
+  the form :n:`@term = @term’` or :n:`@term’ = @term`.
+
+.. tacv:: replace -> @term
+
+  Replaces :n:`@term` with :n:`@term’` using the first assumption whose type has
+  the form :n:`@term = @term’`
+
+.. tacv:: replace <- @term
+
+  Replaces :n:`@term` with :n:`@term’` using the first assumption whose type has
+  the form :n:`@term’ = @term`
+
+.. tacv:: replace @term with @term in clause
+.. tacv:: replace @term with @term in clause by tactic
+.. tacv:: replace @term in clause replace -> @term in clause
+.. tacv:: replace <- @term in clause
+
+  Acts as before but the replacements take place inclause (see
+  :ref:`performingcomputations`) and not only in the conclusion of the goal. The
+  clause argument must not contain any type of nor value of.
+
+.. tacv:: cutrewrite <- (@term = @term)
+
+  This tactic is deprecated. It acts like :n:`replace @term with @term`, or,
+  equivalently as :n:`enough (@term = @term) as <-`.
+
+.. tacv:: cutrewrite -> (@term = @term)
+
+  This tactic is deprecated. It can be replaced by enough :n:`(@term = @term) as ->`.
+
+
+.. tacn:: subst @ident
+   :name: subst
+
+
+This tactic applies to a goal that has :n:`@ident` in its context and (at
+least) one hypothesis, say :g:`H`, of type :n:`@ident = t` or :n:`t = @ident`
+with :n:`@ident` not occurring in :g:`t`. Then it replaces :n:`@ident` by
+:g:`t` everywhere in the goal (in the hypotheses and in the conclusion) and
+clears :n:`@ident` and :g:`H` from the context.
+
+If :n:`@ident` is a local definition of the form :n:`@ident := t`, it is also
+unfolded and cleared.
+
+
+.. note::
+  When several hypotheses have the form :n:`@ident = t` or :n:`t = @ident`, the
+  first one is used.
+
+
+.. note::
+  If `H` is itself dependent in the goal, it is replaced by the proof of
+  reflexivity of equality.
+
+
+.. tacv:: subst {+ @ident}
+
+  This is equivalent to :n:`subst @ident`:sub:`1`:n:`; ...; subst @ident`:sub:`n`.
+
+.. tacv:: subst
+
+   This applies subst repeatedly from top to bottom to all identifiers of the
+   context for which an equality of the form :n:`@ident = t` or :n:`t = @ident`
+   or :n:`@ident := t` exists, with :n:`@ident` not occurring in `t`.
+
+     ..  note::
+
+       The behavior of subst can be controlled using option ``Set Regular Subst
+       Tactic.`` When this option is activated, subst also deals with the
+       following corner cases:
+
+        + A context with ordered hypotheses :n:`@ident`:sub:`1` :n:`= @ident`:sub:`2`
+          and :n:`@ident`:sub:`1` :n:`= t`, or :n:`t′ = @ident`:sub:`1`` with `t′` not
+          a variable, and no other hypotheses of the form :n:`@ident`:sub:`2` :n:`= u`
+          or :n:`u = @ident`:sub:`2`; without the option, a second call to
+          subst would be necessary to replace :n:`@ident`:sub:`2` by `t` or
+          `t′` respectively.
+        + The presence of a recursive equation which without the option would
+          be a cause of failure of :tacn:`subst`.
+        + A context with cyclic dependencies as with hypotheses :n:`@ident`:sub:`1` :n:`= f @ident`:sub:`2`
+          and :n:`@ident`:sub:`2` :n:`= g @ident`:sub:`1` which without the
+          option would be a cause of failure of :tacn:`subst`.
+
+       Additionally, it prevents a local definition such as :n:`@ident := t` to be
+       unfolded which otherwise it would exceptionally unfold in configurations
+       containing hypotheses of the form :n:`@ident = u`, or :n:`u′ = @ident`
+       with `u′` not a variable. Finally, it preserves the initial order of
+       hypotheses, which without the option it may break. The option is on by
+       default.
+
+
+.. tacn:: stepl @term
+   :name: stepl
 
-\subsection{\tt stepl \term}
-\tacindex{stepl}
 
 This tactic is for chaining rewriting steps. It assumes a goal of the
-form ``$R$ {\term}$_1$ {\term}$_2$'' where $R$ is a binary relation
-and relies on a database of lemmas of the form {\tt forall} $x$ $y$
-$z$, $R$ $x$ $y$ {\tt ->} $eq$ $x$ $z$ {\tt ->} $R$ $z$ $y$ where $eq$
-is typically a setoid equality. The application of {\tt stepl {\term}}
-then replaces the goal by ``$R$ {\term} {\term}$_2$'' and adds a new
-goal stating ``$eq$ {\term} {\term}$_1$''.
-
-Lemmas are added to the database using the command
-\comindex{Declare Left Step}
-\begin{quote}
-{\tt Declare Left Step {\term}.}
-\end{quote}
-
-The tactic is especially useful for parametric setoids which are not
-accepted as regular setoids for {\tt rewrite} and {\tt
-  setoid\_replace} (see Chapter~\ref{setoids}).
-
-\begin{Variants}
-\item{\tt stepl {\term} by {\tac}}
-
-This applies {\tt stepl {\term}} then applies {\tac} to the second goal.
-
-\item{\tt stepr {\term}}\\
-     {\tt stepr {\term} by {\tac}}\tacindex{stepr}
-
-This behaves as {\tt stepl} but on the right-hand-side of the binary relation.
-Lemmas are expected to be of the form
-``{\tt forall} $x$ $y$
-$z$, $R$ $x$ $y$ {\tt ->} $eq$ $y$ $z$ {\tt ->} $R$ $x$ $z$''
-and are registered using the command
-\comindex{Declare Right Step}
-\begin{quote}
-{\tt Declare Right Step {\term}.}
-\end{quote}
-\end{Variants}
-
-\subsection{\tt change \term}
-\tacindex{change}
-\label{change}
-
-This tactic applies to any goal. It implements the rule
-``Conv''\index{Typing rules!Conv} given in Section~\ref{Conv}.  {\tt
-  change U} replaces the current goal \T\ with \U\ providing that
-\U\ is well-formed and that \T\ and \U\ are convertible.
-
-\begin{ErrMsgs}
-\item \errindex{Not convertible}
-\end{ErrMsgs}
-
-\tacindex{change \dots\ in}
-\begin{Variants}
-\item {\tt change \term$_1$ with \term$_2$}
-
-  This replaces the occurrences of \term$_1$ by \term$_2$ in the
-  current goal.  The terms \term$_1$ and \term$_2$ must be
+form :n:`R @term @term` where `R` is a binary relation and relies on a
+database of lemmas of the form :g:`forall x y z, R x y -> eq x z -> R z y`
+where `eq` is typically a setoid equality. The application of :n:`stepl @term`
+then replaces the goal by :n:`R @term @term` and adds a new goal stating
+:n:`eq @term @term`.
+
+Lemmas are added to the database using the command ``Declare Left Step @term.``
+The tactic is especially useful for parametric setoids which are not accepted
+as regular setoids for :tacn:`rewrite` and :tacn:`setoid_replace` (see
+:ref:`TODO-27-Generalizedrewriting`).
+
+.. tacv:: stepl @term by tactic
+
+  This applies :n:`stepl @term` then applies tactic to the second goal.
+
+.. tacv:: stepr @term stepr @term by tactic
+
+  This behaves as :tacn:`stepl` but on the right-hand-side of the binary
+  relation. Lemmas are expected to be of the form :g:`forall x y z, R x y -> eq
+  y z -> R x z` and are registered using the command ``Declare Right Step
+  @term.``
+
+
+.. tacn:: change @term
+   :name: change
+
+  This tactic applies to any goal. It implements the rule ``Conv`` given in
+  :ref:`TODO-4.4-Subtypingrules`. :g:`change U` replaces the current goal `T`
+  with `U` providing that `U` is well-formed and that `T` and `U` are
   convertible.
 
-\item {\tt change \term$_1$ at \num$_1$ \dots\ \num$_i$ with \term$_2$}
+.. exn:: Not convertible
+
 
-  This replaces the occurrences numbered \num$_1$ \dots\ \num$_i$ of
-  \term$_1$ by \term$_2$ in the current goal.
-  The terms \term$_1$ and \term$_2$ must be convertible.
+.. tacv:: change @term with @term
 
-  \ErrMsg {\tt Too few occurrences}
+  This replaces the occurrences of :n:`@term` by :n:`@term` in the current goal.
+  The term :n:`@term` and :n:`@term` must be convertible.
 
-\item {\tt change {\term} in {\ident}}
+.. tacv:: change @term at {+ @num} with @term
 
-\item {\tt change \term$_1$ with \term$_2$ in {\ident}}
+  This replaces the occurrences numbered :n:`{+ @num}` of :n:`@term by @term`
+  in the current goal. The terms :n:`@term` and :n:`@term` must be convertible.
 
-\item {\tt change \term$_1$ at  \num$_1$ \dots\ \num$_i$ with \term$_2$ in
-    {\ident}}
+.. exn:: Too few occurrences
 
-  This applies the {\tt change} tactic not to the goal but to the
-  hypothesis {\ident}.
+.. tacv:: change @term in @ident
+.. tacv:: change @term with @term in @ident
+.. tacv:: change @term at {+ @num} with @term in @ident
 
-\end{Variants}
+  This applies the change tactic not to the goal but to the hypothesis :n:`@ident`.
 
-\SeeAlso \ref{Conversion-tactics}
+See also: :ref:`Performing computations <performingcomputations>`
 
+.. _performingcomputations:
 
-\section{Performing computations
-\index{Conversion tactics}
-\label{Conversion-tactics}}
+Performing computations
+---------------------------
 
 This set of tactics implements different specialized usages of the
-tactic \texttt{change}.
-
-All conversion tactics (including \texttt{change}) can be
-parameterized by the parts of the goal where the conversion can
-occur. This is done using \emph{goal clauses} which consists in a list
-of hypotheses and, optionally, of a reference to the conclusion of the
-goal. For defined hypothesis it is possible to specify if the
-conversion should occur on the type part, the body part or both
-(default).
-
-\index{Clauses}
-\index{Goal clauses}
-Goal clauses are written after a conversion tactic (tactics
-\texttt{set}~\ref{tactic:set},          \texttt{rewrite}~\ref{rewrite},
-\texttt{replace}~\ref{tactic:replace}                               and
-\texttt{autorewrite}~\ref{tactic:autorewrite} also use goal clauses)  and
-are introduced by  the keyword \texttt{in}. If no goal clause is provided,
-the default is to perform the conversion only in the conclusion.
-
-The syntax and description of the various goal clauses is the following:
-\begin{description}
-\item[]\texttt{in {\ident}$_1$ $\ldots$ {\ident}$_n$ |- } only in hypotheses {\ident}$_1$
-  \ldots {\ident}$_n$
-\item[]\texttt{in {\ident}$_1$ $\ldots$ {\ident}$_n$ |- *} in hypotheses {\ident}$_1$ \ldots
-  {\ident}$_n$ and in the conclusion
-\item[]\texttt{in * |-} in every hypothesis
-\item[]\texttt{in *} (equivalent to \texttt{in * |- *}) everywhere
-\item[]\texttt{in (type of {\ident}$_1$) (value of {\ident}$_2$) $\ldots$ |-} in
-  type part of {\ident}$_1$, in the value part of {\ident}$_2$, etc.
-\end{description}
-
-For backward compatibility, the notation \texttt{in}~{\ident}$_1$\ldots {\ident}$_n$
-performs the conversion in hypotheses {\ident}$_1$\ldots {\ident}$_n$.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%voir reduction__conv_x : histoires d'univers.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\subsection{{\tt cbv \flag$_1$ \mbox{\dots} \flag$_n$}, {\tt lazy \flag$_1$
-\mbox{\dots} \flag$_n$}, and \tt compute}
-\tacindex{cbv}
-\tacindex{lazy}
-\tacindex{compute}
-\tacindex{vm\_compute}\label{vmcompute}
-\tacindex{native\_compute}\label{nativecompute}
-
-These parameterized reduction tactics apply to any goal and perform
-the normalization of the goal according to the specified flags. In
-correspondence with the kinds of reduction considered in \Coq\, namely
-$\beta$ (reduction of functional application), $\delta$ (unfolding of
-transparent constants, see \ref{Transparent}), $\iota$ (reduction of
-pattern-matching over a constructed term, and unfolding of {\tt fix}
-and {\tt cofix} expressions) and $\zeta$ (contraction of local
-definitions), the flags are either {\tt beta}, {\tt delta},
-{\tt match}, {\tt fix}, {\tt cofix}, {\tt iota} or {\tt zeta}.
-The {\tt iota} flag is a shorthand for {\tt match}, {\tt fix} and {\tt cofix}.
-The {\tt delta} flag itself can be refined into {\tt
-delta [\qualid$_1$\ldots\qualid$_k$]} or {\tt delta
--[\qualid$_1$\ldots\qualid$_k$]}, restricting in the first case the
-constants to unfold to the constants listed, and restricting in the
-second case the constant to unfold to all but the ones explicitly
-mentioned. Notice that the {\tt delta} flag does not apply to
-variables bound by a let-in construction inside the term itself (use
-here the {\tt zeta} flag). In any cases, opaque constants are not
-unfolded (see Section~\ref{Opaque}).
-
-Normalization according to the flags is done by first evaluating the
-head of the expression into a {\em weak-head} normal form, i.e. until
-the evaluation is bloked by a variable (or an opaque constant, or an
-axiom), as e.g. in {\tt x\;u$_1$\;...\;u$_n$}, or {\tt match x with
-  ... end}, or {\tt (fix f x \{struct x\} := ...) x}, or is a
-constructed form (a $\lambda$-expression, a constructor, a cofixpoint,
-an inductive type, a product type, a sort), or is a redex that the
-flags prevent to reduce. Once a weak-head normal form is obtained,
-subterms are recursively reduced using the same strategy.
-
-Reduction to weak-head normal form can be done using two strategies:
-{\em lazy} ({\tt lazy} tactic), or {\em call-by-value} ({\tt cbv}
-tactic). The lazy strategy is a call-by-need strategy, with sharing of
-reductions: the arguments of a function call are weakly evaluated only
-when necessary, and if an argument is used several times then it is
-weakly computed only once. This reduction is efficient for reducing
-expressions with dead code. For instance, the proofs of a proposition
-{\tt exists~$x$. $P(x)$} reduce to a pair of a witness $t$, and a
-proof that $t$ satisfies the predicate $P$. Most of the time, $t$ may
-be computed without computing the proof of $P(t)$, thanks to the lazy
-strategy.
-
-The call-by-value strategy is the one used in ML languages: the
-arguments of a function call are systematically weakly evaluated
-first. Despite the lazy strategy always performs fewer reductions than
-the call-by-value strategy, the latter is generally more efficient for
-evaluating purely computational expressions (i.e. with little dead code).
-
-\begin{Variants}
-\item {\tt compute} \tacindex{compute}\\
-      {\tt cbv}
-
-  These are synonyms for {\tt cbv beta delta iota zeta}.
-
-\item {\tt lazy}
-
-  This is a synonym for {\tt lazy beta delta iota zeta}.
-
-\item {\tt compute [\qualid$_1$\ldots\qualid$_k$]}\\
-      {\tt cbv [\qualid$_1$\ldots\qualid$_k$]}
-
-  These are synonyms of {\tt cbv beta delta
-  [\qualid$_1$\ldots\qualid$_k$] iota zeta}.
-
-\item {\tt compute -[\qualid$_1$\ldots\qualid$_k$]}\\
-      {\tt cbv -[\qualid$_1$\ldots\qualid$_k$]}
-
-  These are synonyms of {\tt cbv beta delta
-  -[\qualid$_1$\ldots\qualid$_k$] iota zeta}.
-
-\item {\tt lazy [\qualid$_1$\ldots\qualid$_k$]}\\
-      {\tt lazy -[\qualid$_1$\ldots\qualid$_k$]}
-
-  These are respectively synonyms of {\tt lazy beta delta
-  [\qualid$_1$\ldots\qualid$_k$] iota zeta} and {\tt lazy beta delta
-  -[\qualid$_1$\ldots\qualid$_k$] iota zeta}.
-
-\item {\tt vm\_compute} \tacindex{vm\_compute}
-
-  This tactic evaluates the goal using the optimized call-by-value evaluation
-  bytecode-based virtual machine described in
-  \cite{CompiledStrongReduction}. This algorithm is dramatically more efficient
-  than the algorithm used for the {\tt cbv} tactic, but it cannot be
-  fine-tuned. It is specially interesting for full evaluation of algebraic
-  objects. This includes the case of reflection-based tactics.
-
-\item {\tt native\_compute} \tacindex{native\_compute} \optindex{NativeCompute Profiling}
-
-  This tactic evaluates the goal by compilation to \ocaml{} as described in
-  \cite{FullReduction}. If \Coq{} is running in native code, it can be typically
-  two to five times faster than {\tt vm\_compute}. Note however that the
-  compilation cost is higher, so it is worth using only for intensive
-  computations.
-
-  On Linux, if you have the {\tt perf} profiler installed, you can profile {\tt native\_compute} evaluations. 
-  The command
-  \begin{quote}
-    {\tt Set Native Compute Profiling}
-  \end{quote}
-  enables profiling. Use the command
-  \begin{quote}
-    {\tt Set NativeCompute Profile Filename \str}
-  \end{quote}
-  to specify the profile output; the default is {\tt native\_compute\_profile.data}. The actual filename used 
-  will contain extra characters to avoid overwriting an existing file; that filename is reported to the user. That means
-  you can individually profile multiple uses of {\tt native\_compute} in a script. From the Linux command line, run {\tt perf report} on
-  the profile file to see the results. Consult the {\tt perf} documentation for more details.
-
-\end{Variants}
-
-\Rem The following option makes {\tt cbv} (and its derivative {\tt
-  compute}) print information about the constants it encounters and
-the unfolding decisions it makes.
-\begin{quote}
-  \optindex{Debug Cbv}
-  {\tt Set Debug Cbv}
-\end{quote}
-
-% Obsolete? Anyway not very important message
-%\begin{ErrMsgs}
-%\item \errindex{Delta must be specified before}
-%
-%  A list of constants appeared before the {\tt delta} flag.
-%\end{ErrMsgs}
-
-
-\subsection{\tt red}
-\tacindex{red}
-
-This tactic applies to a goal that has the form {\tt
-  forall (x:T1)\dots(xk:Tk), t} with {\tt t}
-$\beta\iota\zeta$-reducing to {\tt c t1 \dots\ tn} and {\tt c} a
-constant.  If
-{\tt c} is transparent then it replaces {\tt c} with its definition
-(say {\tt t}) and then reduces {\tt (t t1 \dots\ tn)} according to
-$\beta\iota\zeta$-reduction rules.
-
-\begin{ErrMsgs}
-\item \errindex{Not reducible}
-\end{ErrMsgs}
-
-\subsection{\tt hnf}
-\tacindex{hnf}
-
-This tactic applies to any goal. It replaces the current goal with its
-head normal form according to the $\beta\delta\iota\zeta$-reduction
-rules, i.e.  it reduces the head of the goal until it becomes a
-product or an irreducible term. All inner $\beta\iota$-redexes are also
-reduced.
-
-\Example
-The term \verb+forall n:nat, (plus (S n) (S n))+ is not reduced by {\tt hnf}.
-
-\Rem The $\delta$ rule only applies to transparent constants
-(see Section~\ref{Opaque} on transparency and opacity).
-
-\subsection{\texorpdfstring{\texttt{cbn}}{cbn} and \texorpdfstring{\texttt{simpl}}{simpl}}
-\tacindex{cbn} \tacindex{simpl}
-
-These tactics apply to any goal. They try to reduce a term to
-something still readable instead of fully normalizing it. They perform
-a sort of strong normalization with two key differences:
-\begin{itemize}
-\item They unfold a constant if and only if it leads to a
-  $\iota$-reduction, i.e. reducing a match or unfolding a fixpoint.
-\item While reducing a constant unfolding to (co)fixpoints,
-  the tactics use the name of the
-  constant the (co)fixpoint comes from instead of the (co)fixpoint
-  definition in recursive calls.
-\end{itemize}
-
-The \texttt{cbn} tactic is claimed to be a more principled, faster and more
-predictable replacement for \texttt{simpl}.
-
-The \texttt{cbn} tactic accepts the same flags as \texttt{cbv} and
-\texttt{lazy}.  The behavior of both \texttt{simpl} and \texttt{cbn}
-can be tuned using the \texttt{Arguments} vernacular command as
-follows: \comindex{Arguments}
-\begin{itemize}
-\item
-A constant can be marked to be never unfolded by \texttt{cbn} or
-\texttt{simpl}:
-\begin{coq_example*}
-Arguments minus n m : simpl never.
-\end{coq_example*}
-After that command an expression like \texttt{(minus (S x) y)} is left
-untouched by the tactics \texttt{cbn} and \texttt{simpl}.
-\item
-A constant can be marked to be unfolded only if applied to enough arguments.
-The number of arguments required can be specified using
-the {\tt /} symbol in the arguments list of the {\tt Arguments} vernacular
-command.
-\begin{coq_example*}
-Definition fcomp A B C f (g : A -> B) (x : A) : C := f (g x).
-Notation "f \o g" := (fcomp f g) (at level 50).
-Arguments fcomp {A B C} f g x /.
-\end{coq_example*}
-After that command the expression {\tt (f \verb+\+o g)} is left untouched by
-{\tt simpl} while {\tt ((f \verb+\+o g) t)} is reduced to {\tt (f (g t))}.
-The same mechanism can be used to make a constant volatile, i.e. always
-unfolded.
-\begin{coq_example*}
-Definition volatile := fun x : nat => x.
-Arguments volatile / x.
-\end{coq_example*}
-\item
-A constant can be marked to be unfolded only if an entire set of arguments
-evaluates to a constructor. The {\tt !} symbol can be used to mark such
-arguments.
-\begin{coq_example*}
-Arguments minus !n !m.
-\end{coq_example*}
-After that command, the expression {\tt (minus (S x) y)} is left untouched by
-{\tt simpl}, while {\tt (minus (S x) (S y))} is reduced to {\tt (minus x y)}.
-\item
-A special heuristic to determine if a constant has to be unfolded can be
-activated with the following command:
-\begin{coq_example*}
-Arguments minus n m : simpl nomatch.
-\end{coq_example*}
-The heuristic avoids to perform a simplification step that would
-expose a {\tt match} construct in head position. For example the
-expression {\tt (minus (S (S x)) (S y))} is simplified to
-{\tt (minus (S x) y)} even if an extra simplification is possible.
-\end{itemize}
-
-In detail, the tactic \texttt{simpl} first applies
-$\beta\iota$-reduction.  Then, it expands transparent constants and
-tries to reduce further using $\beta\iota$-reduction. But, when no
-$\iota$ rule is applied after unfolding then $\delta$-reductions are
-not applied. For instance trying to use \texttt{simpl} on
-\texttt{(plus n O)=n} changes nothing.
-
-Notice that only transparent constants whose name can be reused in the
-recursive calls are possibly unfolded by \texttt{simpl}. For instance
-a constant defined by \texttt{plus' := plus} is possibly unfolded and
-reused in the recursive calls, but a constant such as \texttt{succ :=
-  plus (S O)} is never unfolded. This is the main difference between
-\texttt{simpl} and \texttt{cbn}. The tactic \texttt{cbn} reduces
-whenever it will be able to reuse it or not: \texttt{succ t} is
-reduced to \texttt{S t}.
-
-\tacindex{simpl \dots\ in}
-\begin{Variants}
-\item {\tt cbn [\qualid$_1$\ldots\qualid$_k$]}\\
-      {\tt cbn -[\qualid$_1$\ldots\qualid$_k$]}
-
-  These are respectively synonyms of {\tt cbn beta delta
-  [\qualid$_1$\ldots\qualid$_k$] iota zeta} and {\tt cbn beta delta
-  -[\qualid$_1$\ldots\qualid$_k$] iota zeta} (see \ref{vmcompute}).
-
-\item {\tt simpl {\pattern}}
-
-  This applies {\tt simpl} only to the subterms matching {\pattern} in the
-  current goal.
-
-\item {\tt simpl {\pattern} at \num$_1$ \dots\ \num$_i$}
-
-  This applies {\tt simpl} only to the \num$_1$, \dots, \num$_i$
-  occurrences of the subterms matching {\pattern} in the current goal.
-
-  \ErrMsg {\tt Too few occurrences}
-
-\item {\tt simpl {\qualid}}\\
-  {\tt simpl {\qstring}}
-
-  This applies {\tt simpl} only to the applicative subterms whose head
-  occurrence is the unfoldable constant {\qualid} (the constant can be
-  referred to by its notation using {\qstring} if such a notation
-  exists).
-
-\item {\tt simpl {\qualid} at \num$_1$ \dots\ \num$_i$}\\
-  {\tt simpl {\qstring} at \num$_1$ \dots\ \num$_i$}\\
-
-  This applies {\tt simpl} only to the \num$_1$, \dots, \num$_i$
-  applicative subterms whose head occurrence is {\qualid} (or
-  {\qstring}).
-
-\end{Variants}
-
-\begin{quote}
-  \optindex{Debug RAKAM}
-  {\tt Set Debug RAKAM}
-\end{quote}
-This option makes {\tt cbn} print various debugging information.
-{\tt RAKAM} is the Refolding Algebraic Krivine Abstract Machine.
-
-\subsection{\tt unfold \qualid}
-\tacindex{unfold}
-\label{unfold}
-
-This tactic applies to any goal. The argument {\qualid} must denote a
-defined transparent constant or local definition (see Sections~\ref{Basic-definitions} and~\ref{Transparent}).  The tactic {\tt
-  unfold} applies the $\delta$ rule to each occurrence of the constant
-to which {\qualid} refers in the current goal and then replaces it
-with its $\beta\iota$-normal form.
-
-\begin{ErrMsgs}
-\item {\qualid} \errindex{does not denote an evaluable constant}
-
-\end{ErrMsgs}
-
-\begin{Variants}
-\item {\tt unfold {\qualid} in {\ident}}
-  \tacindex{unfold \dots in}
-
-  Replaces {\qualid} in hypothesis {\ident} with its definition
-  and replaces the hypothesis with its $\beta\iota$ normal form.
-
-\item {\tt unfold {\qualid}$_1$, \dots, \qualid$_n$}
+tactic :tacn:`change`.
+
+All conversion tactics (including :tacn:`change`) can be parameterized by the
+parts of the goal where the conversion can occur. This is done using
+*goal clauses* which consists in a list of hypotheses and, optionally,
+of a reference to the conclusion of the goal. For defined hypothesis
+it is possible to specify if the conversion should occur on the type
+part, the body part or both (default).
+
+Goal clauses are written after a conversion tactic (tactics :tacn:`set`,
+:tacn:`rewrite`, :tacn:`replace` and :tacn:`autorewrite` also use goal
+clauses) and are introduced by the keyword `in`. If no goal clause is
+provided, the default is to perform the conversion only in the
+conclusion.
+
+The syntax and description of the various goal clauses is the
+following:
 
-  Replaces {\em simultaneously} {\qualid}$_1$, \dots, {\qualid}$_n$
-  with their definitions and replaces the current goal with its
-  $\beta\iota$ normal form.
++ :n:`in {+ @ident} |-`  only in hypotheses :n:`{+ @ident}`
++ :n:`in {+ @ident} |- *` in hypotheses :n:`{+ @ident}` and in the
+  conclusion
++ :n:`in * |-` in every hypothesis
++ :n:`in *` (equivalent to in :n:`* |- *`) everywhere
++ :n:`in (type of @ident) (value of @ident) ... |-` in type part of
+  :n:`@ident`, in the value part of :n:`@ident`, etc.
+
+For backward compatibility, the notation :n:`in {+ @ident}` performs
+the conversion in hypotheses :n:`{+ @ident}`.
+
+.. tacn:: cbv {* flag}
+   :name: cbv
+.. tacn:: lazy {* flag}
+   :name: lazy
+.. tacn:: compute
+   :name: compute
+
+   These parameterized reduction tactics apply to any goal and perform
+   the normalization of the goal according to the specified flags. In
+   correspondence with the kinds of reduction considered in Coq namely
+   :math:`\beta` (reduction of functional application), :math:`\delta`
+   (unfolding of transparent constants, see :ref:`TODO-6.10.2-Transparent`),
+   :math:`\iota` (reduction of
+   pattern-matching over a constructed term, and unfolding of :g:`fix` and
+   :g:`cofix` expressions) and :math:`\zeta` (contraction of local definitions), the
+   flags are either ``beta``, ``delta``, ``match``, ``fix``, ``cofix``,
+   ``iota`` or ``zeta``. The ``iota`` flag is a shorthand for ``match``, ``fix``
+   and ``cofix``. The ``delta`` flag itself can be refined into
+   :n:`delta {+ @qualid}` or :n:`delta -{+ @qualid}`, restricting in the first
+   case the constants to unfold to the constants listed, and restricting in the
+   second case the constant to unfold to all but the ones explicitly mentioned.
+   Notice that the ``delta`` flag does not apply to variables bound by a let-in
+   construction inside the :n:`@term` itself (use here the ``zeta`` flag). In
+   any cases, opaque constants are not unfolded (see :ref:`TODO-6.10.1-Opaque`).
+
+   Normalization according to the flags is done by first evaluating the
+   head of the expression into a *weak-head* normal form, i.e. until the
+   evaluation is bloked by a variable (or an opaque constant, or an
+   axiom), as e.g. in :g:`x u1 ... un` , or :g:`match x with ... end`, or
+   :g:`(fix f x {struct x} := ...) x`, or is a constructed form (a
+   :math:`\lambda`-expression, a constructor, a cofixpoint, an inductive type, a
+   product type, a sort), or is a redex that the flags prevent to reduce. Once a
+   weak-head normal form is obtained, subterms are recursively reduced using the
+   same strategy.
+
+   Reduction to weak-head normal form can be done using two strategies:
+   *lazy* (``lazy`` tactic), or *call-by-value* (``cbv`` tactic). The lazy
+   strategy is a call-by-need strategy, with sharing of reductions: the
+   arguments of a function call are weakly evaluated only when necessary,
+   and if an argument is used several times then it is weakly computed
+   only once. This reduction is efficient for reducing expressions with
+   dead code. For instance, the proofs of a proposition :g:`exists x. P(x)`
+   reduce to a pair of a witness :g:`t`, and a proof that :g:`t` satisfies the
+   predicate :g:`P`. Most of the time, :g:`t` may be computed without computing
+   the proof of :g:`P(t)`, thanks to the lazy strategy.
+
+   The call-by-value strategy is the one used in ML languages: the
+   arguments of a function call are systematically weakly evaluated
+   first. Despite the lazy strategy always performs fewer reductions than
+   the call-by-value strategy, the latter is generally more efficient for
+   evaluating purely computational expressions (i.e. with little dead code).
+
+.. tacv:: compute
+.. tacv:: cbv
+
+   These are synonyms for ``cbv beta delta iota zeta``.
+
+.. tacv:: lazy
+
+   This is a synonym for ``lazy beta delta iota zeta``.
+
+.. tacv:: compute {+ @qualid}
+.. tacv:: cbv {+ @qualid}
+
+   These are synonyms of :n:`cbv beta delta {+ @qualid} iota zeta`.
+
+.. tacv:: compute -{+ @qualid}
+.. tacv:: cbv -{+ @qualid}
+
+   These are synonyms of :n:`cbv beta delta -{+ @qualid} iota zeta`.
+
+.. tacv:: lazy {+ @qualid}
+.. tacv:: lazy -{+ @qualid}
+
+   These are respectively synonyms of :n:`lazy beta delta {+ @qualid} iota zeta`
+   and :n:`lazy beta delta -{+ @qualid} iota zeta`.
+
+.. tacv:: vm_compute
+
+   This tactic evaluates the goal using the optimized call-by-value evaluation
+   bytecode-based virtual machine described in :cite:`CompiledStrongReduction`.
+   This algorithm is dramatically more efficient than the algorithm used for the
+   ``cbv`` tactic, but it cannot be fine-tuned. It is specially interesting for
+   full evaluation of algebraic objects. This includes the case of
+   reflection-based tactics.
+
+.. tacv:: native_compute
+
+   This tactic evaluates the goal by compilation to Objective Caml as described
+   in :cite:`FullReduction`. If Coq is running in native code, it can be
+   typically two to five times faster than ``vm_compute``. Note however that the
+   compilation cost is higher, so it is worth using only for intensive
+   computations.
+
+   .. opt:: NativeCompute Profiling
 
-\item {\tt unfold {\qualid}$_1$ at \num$_1^1$, \dots, \num$_i^1$,
-\dots,\ \qualid$_n$ at \num$_1^n$ \dots\ \num$_j^n$}
+      On Linux, if you have the ``perf`` profiler installed, this option makes
+      it possible to profile ``native_compute`` evaluations.
 
-  The lists \num$_1^1$, \dots, \num$_i^1$ and \num$_1^n$, \dots,
-  \num$_j^n$ specify the occurrences of {\qualid}$_1$, \dots,
-  \qualid$_n$ to be unfolded. Occurrences are located from left to
-  right.
+   .. opt:: NativeCompute Profile Filename
+
+      This option specifies the profile output; the default is
+      ``native_compute_profile.data``. The actual filename used
+      will contain extra characters to avoid overwriting an existing file; that
+      filename is reported to the user.
+      That means you can individually profile multiple uses of
+      ``native_compute`` in a script. From the Linux command line, run ``perf report``
+      on the profile file to see the results. Consult the ``perf`` documentation
+      for more details.
 
-  \ErrMsg {\tt bad occurrence number of {\qualid}$_i$}
+.. opt:: Debug Cbv
 
-  \ErrMsg {\qualid}$_i$ {\tt does not occur}
+   This option makes :tacn:`cbv` (and its derivative :tacn:`compute`) print
+   information about the constants it encounters and the unfolding decisions it
+   makes.
 
-\item {\tt unfold {\qstring}}
+.. tacn:: red
+   :name: red
 
-  If {\qstring} denotes the discriminating symbol of a notation (e.g. {\tt
-  "+"}) or an expression defining a notation (e.g. \verb!"_ + _"!), and
-  this notation refers to an unfoldable constant, then the tactic
-  unfolds it.
+   This tactic applies to a goal that has the form::
 
-\item {\tt unfold {\qstring}\%{\delimkey}}
+     forall (x:T1) ... (xk:Tk), t
 
-  This is variant of {\tt unfold {\qstring}} where {\qstring} gets its
-  interpretation from the scope bound to the delimiting key
-  {\delimkey} instead of its default interpretation (see
-  Section~\ref{scopechange}).
+   with :g:`t` :math:`\beta`:math:`\iota`:math:`\zeta`-reducing to :g:`c t`:sub:`1` :g:`... t`:sub:`n` and :g:`c` a
+   constant. If :g:`c` is transparent then it replaces :g:`c` with its
+   definition (say :g:`t`) and then reduces
+   :g:`(t t`:sub:`1` :g:`... t`:sub:`n` :g:`)` according to :math:`\beta`:math:`\iota`:math:`\zeta`-reduction rules.
 
-\item {\tt unfold \qualidorstring$_1$ at \num$_1^1$, \dots, \num$_i^1$,
-\dots,\ \qualidorstring$_n$ at \num$_1^n$ \dots\ \num$_j^n$}
+.. exn:: Not reducible
 
-  This is the most general form, where {\qualidorstring} is either a
-  {\qualid} or a {\qstring} referring to a notation.
+.. tacn:: hnf
+   :name: hnf
 
-\end{Variants}
+   This tactic applies to any goal. It replaces the current goal with its
+   head normal form according to the :math:`\beta`:math:`\delta`:math:`\iota`:math:`\zeta`-reduction rules, i.e. it
+   reduces the head of the goal until it becomes a product or an
+   irreducible term. All inner :math:`\beta`:math:`\iota`-redexes are also reduced.
 
-\subsection{\tt fold \term}
-\tacindex{fold}
+   Example: The term :g:`forall n:nat, (plus (S n) (S n))` is not reduced by
+   :n:`hnf`.
 
-This tactic applies to any goal. The term \term\ is reduced using the {\tt red}
-tactic. Every occurrence of the resulting term in the goal is then
-replaced by \term.
+.. note::
+ The :math:`\delta` rule only applies to transparent constants (see :ref:`TODO-6.10.1-Opaque`
+ on transparency and opacity).
 
-\begin{Variants}
-\item {\tt fold} \term$_1$ \dots\ \term$_n$
+.. tacn:: cbn
+   :name: cbn
+.. tacn:: simpl
+   :name: simpl
 
-  Equivalent to {\tt fold} \term$_1${\tt;}\ldots{\tt; fold} \term$_n$.
-\end{Variants}
+   These tactics apply to any goal. They try to reduce a term to
+   something still readable instead of fully normalizing it. They perform
+   a sort of strong normalization with two key differences:
 
-\subsection{\tt pattern \term}
-\tacindex{pattern}
-\label{pattern}
+   + They unfold a constant if and only if it leads to a :math:`\iota`-reduction,
+     i.e. reducing a match or unfolding a fixpoint.
+   + While reducing a constant unfolding to (co)fixpoints, the tactics
+     use the name of the constant the (co)fixpoint comes from instead of
+     the (co)fixpoint definition in recursive calls.
 
-This command applies to any goal. The argument {\term} must be a free
-subterm of the current goal.  The command {\tt pattern} performs
-$\beta$-expansion (the inverse of $\bt$-reduction) of the current goal
-(say \T) by
-\begin{enumerate}
-\item replacing all occurrences of {\term} in {\T} with a fresh variable
-\item abstracting this variable
-\item applying the abstracted goal to {\term}
-\end{enumerate}
+   The ``cbn`` tactic is claimed to be a more principled, faster and more
+   predictable replacement for ``simpl``.
 
-For instance, if the current goal $T$ is expressible as $\phi(t)$
-where the notation captures all the instances of $t$ in $\phi(t)$,
-then {\tt pattern $t$} transforms it into {\tt (fun x:$A$ => $\phi(${\tt
-x}$)$) $t$}.  This command can be used, for instance, when the tactic
-{\tt apply} fails on matching.
+   The ``cbn`` tactic accepts the same flags as ``cbv`` and ``lazy``. The
+   behavior of both ``simpl`` and ``cbn`` can be tuned using the
+   Arguments vernacular command as follows:
 
-\begin{Variants}
-\item {\tt pattern {\term} at {\num$_1$} \dots\ {\num$_n$}}
+   + A constant can be marked to be never unfolded by ``cbn`` or ``simpl``:
 
-  Only the occurrences {\num$_1$} \dots\ {\num$_n$} of {\term} are
-  considered for $\beta$-expansion. Occurrences are located from left
-  to right.
+     .. example::
+        .. coqtop:: all
 
-\item {\tt pattern {\term} at - {\num$_1$} \dots\ {\num$_n$}}
+           Arguments minus n m : simpl never.
 
-  All occurrences except the occurrences of indexes {\num$_1$} \dots\
-  {\num$_n$} of {\term} are considered for
-  $\beta$-expansion. Occurrences are located from left to right.
+     After that command an expression like :g:`(minus (S x) y)` is left
+     untouched by the tactics ``cbn`` and ``simpl``.
 
-\item {\tt pattern {\term$_1$}, \dots, {\term$_m$}}
+   + A constant can be marked to be unfolded only if applied to enough
+     arguments. The number of arguments required can be specified using the
+     ``/`` symbol in the arguments list of the ``Arguments`` vernacular command.
 
-  Starting from a goal $\phi(t_1 \dots\ t_m)$, the tactic
-   {\tt pattern $t_1$, \dots,\ $t_m$} generates the equivalent goal {\tt
-   (fun (x$_1$:$A_1$) \dots\ (x$_m$:$A_m$) => $\phi(${\tt x$_1$\dots\
-   x$_m$}$)$) $t_1$ \dots\ $t_m$}. If $t_i$ occurs in one of the
-   generated types $A_j$ these occurrences will also be considered and
-   possibly abstracted.
+     .. example::
+        .. coqtop:: all
 
-\item {\tt pattern {\term$_1$} at {\num$_1^1$} \dots\ {\num$_{n_1}^1$}, \dots,
-    {\term$_m$} at {\num$_1^m$} \dots\ {\num$_{n_m}^m$}}
+           Definition fcomp A B C f (g : A -> B) (x : A) : C := f (g x).
+           Notation "f \o g" := (fcomp f g) (at level 50).
+           Arguments fcomp {A B C} f g x /.
 
-  This behaves as above but processing only the occurrences \num$_1^1$,
-  \dots, \num$_i^1$ of \term$_1$, \dots, \num$_1^m$, \dots, \num$_j^m$
-  of \term$_m$ starting from \term$_m$.
+     After that command the expression :g:`(f \o g)` is left untouched by
+     ``simpl`` while :g:`((f \o g) t)` is reduced to :g:`(f (g t))`.
+     The same mechanism can be used to make a constant volatile, i.e.
+     always unfolded.
 
-\item {\tt pattern} {\term$_1$} \zeroone{{\tt at \zeroone{-}} {\num$_1^1$} \dots\ {\num$_{n_1}^1$}} {\tt ,} \dots {\tt ,}
-    {\term$_m$} \zeroone{{\tt at \zeroone{-}} {\num$_1^m$} \dots\ {\num$_{n_m}^m$}}
+     .. example::
+        .. coqtop:: all
 
-  This is the most general syntax that combines the different variants.
+           Definition volatile := fun x : nat => x.
+           Arguments volatile / x.
 
-\end{Variants}
+   + A constant can be marked to be unfolded only if an entire set of
+     arguments evaluates to a constructor. The ``!`` symbol can be used to mark
+     such arguments.
 
-\subsection{Conversion tactics applied to hypotheses}
+     .. example::
+        .. coqtop:: all
 
-{\convtactic} {\tt in} \ident$_1$ \dots\ \ident$_n$
+           Arguments minus !n !m.
 
-Applies the conversion tactic {\convtactic} to the
-hypotheses \ident$_1$, \ldots, \ident$_n$. The tactic {\convtactic} is
-any of the conversion tactics listed in this section.
+     After that command, the expression :g:`(minus (S x) y)` is left untouched
+     by ``simpl``, while :g:`(minus (S x) (S y))` is reduced to :g:`(minus x y)`.
 
-If \ident$_i$ is a local definition, then \ident$_i$ can be replaced
-by (Type of \ident$_i$) to address not the body but the type of the
-local definition. Example: {\tt unfold not in (Type of H1) (Type of H3).}
+   + A special heuristic to determine if a constant has to be unfolded
+     can be activated with the following command:
 
-\begin{ErrMsgs}
-\item \errindex{No such hypothesis} : {\ident}.
-\end{ErrMsgs}
+     .. example::
 
+        .. coqtop:: all
 
-\section{Automation}
-\subsection{\tt auto}
-\label{auto}
-\tacindex{auto}
+           Arguments minus n m : simpl nomatch.
 
-This tactic implements a Prolog-like resolution procedure to solve the
-current goal. It first tries to solve the goal using the {\tt
-  assumption} tactic, then it reduces the goal to an atomic one using
-{\tt intros} and introduces the newly generated hypotheses as hints.
-Then it looks at the list of tactics associated to the head symbol of
-the goal and tries to apply one of them (starting from the tactics
-with lower cost). This process is recursively applied to the generated
-subgoals.
+     The heuristic avoids to perform a simplification step that would expose a
+     match construct in head position. For example the expression
+     :g:`(minus (S (S x)) (S y))` is simplified to :g:`(minus (S x) y)`
+     even if an extra simplification is possible.
 
-By default, \texttt{auto} only uses the hypotheses of the current goal and the
-hints of the database named {\tt core}.
+   In detail, the tactic ``simpl`` first applies :math:`\beta`:math:`\iota`-reduction. Then, it
+   expands transparent constants and tries to reduce further using :math:`\beta`:math:`\iota`-
+   reduction. But, when no :math:`\iota` rule is applied after unfolding then
+   :math:`\delta`-reductions are not applied. For instance trying to use ``simpl`` on
+   :g:`(plus n O) = n` changes nothing.
 
-\begin{Variants}
+   Notice that only transparent constants whose name can be reused in the
+   recursive calls are possibly unfolded by ``simpl``. For instance a
+   constant defined by :g:`plus' := plus` is possibly unfolded and reused in
+   the recursive calls, but a constant such as :g:`succ := plus (S O)` is
+   never unfolded. This is the main difference between ``simpl`` and ``cbn``.
+   The tactic ``cbn`` reduces whenever it will be able to reuse it or not:
+   :g:`succ t` is reduced to :g:`S t`.
 
-\item  {\tt auto \num}
+.. tacv:: cbn {+ @qualid}
+.. tacv:: cbn -{+ @qualid}
 
-  Forces the search depth to be \num. The maximal search depth is 5 by
-  default.
+   These are respectively synonyms of :n:`cbn beta delta {+ @qualid} iota zeta`
+   and :n:`cbn beta delta -{+ @qualid} iota zeta` (see :tacn:`cbn`).
 
-\item {\tt auto with \ident$_1$ \dots\ \ident$_n$}
+.. tacv:: simpl @pattern
 
-  Uses the hint databases $\ident_1$ \dots\ $\ident_n$ in addition to
-  the database {\tt core}. See Section~\ref{Hints-databases} for the
-  list of pre-defined databases and the way to create or extend a
-  database.
+   This applies ``simpl`` only to the subterms matching :n:`@pattern` in the
+   current goal.
 
-\item {\tt auto with *}
+.. tacv:: simpl @pattern at {+ @num}
 
-  Uses all existing hint databases. See Section~\ref{Hints-databases}
+   This applies ``simpl`` only to the :n:`{+ @num}` occurrences of the subterms
+   matching :n:`@pattern` in the current goal.
 
-\item \texttt{auto using} \nterm{lemma}$_1$ {\tt ,} {\ldots} {\tt ,} \nterm{lemma}$_n$
+   .. exn:: Too few occurrences
 
-  Uses \nterm{lemma}$_1$, \ldots, \nterm{lemma}$_n$ in addition to
-  hints (can be combined with the \texttt{with \ident} option). If
-  $lemma_i$ is an inductive type, it is the collection of its
-  constructors which is added as hints.
+.. tacv:: simpl @qualid
+.. tacv:: simpl @string
 
-\item {\tt info\_auto}
+   This applies ``simpl`` only to the applicative subterms whose head occurrence
+   is the unfoldable constant :n:`@qualid` (the constant can be referred to by
+   its notation using :n:`@string` if such a notation exists).
 
-  Behaves like {\tt auto} but shows the tactics it uses to solve the goal.
-  This variant is very useful for getting a better understanding of automation,
-  or to know what lemmas/assumptions were used.
+.. tacv:: simpl @qualid at {+ @num}
+.. tacv:: simpl @string at {+ @num}
 
-\item {\tt debug auto} Behaves like {\tt auto} but shows the tactics
-  it tries to solve the goal, including failing paths.
+   This applies ``simpl`` only to the :n:`{+ @num}` applicative subterms whose
+   head occurrence is :n:`@qualid` (or :n:`@string`).
 
-\item {\tt \zeroone{info\_}auto \zeroone{\num}} \zeroone{{\tt using} \nterm{lemma}$_1$
-  {\tt ,} {\ldots} {\tt ,} \nterm{lemma}$_n$} \zeroone{{\tt with}
-  \ident$_1$ {\ldots} \ident$_n$}
+.. opt:: Debug RAKAM
 
-  This is the most general form, combining the various options.
+   This option makes :tacn:`cbn` print various debugging information.
+   ``RAKAM`` is the Refolding Algebraic Krivine Abstract Machine.
 
-\item {\tt trivial}\tacindex{trivial}
+.. tacn:: unfold @qualid
+   :name: unfold
 
-  This tactic is a restriction of {\tt auto} that is not recursive and
-  tries only hints that cost 0. Typically it solves trivial
-  equalities like $X=X$.
+   This tactic applies to any goal. The argument qualid must denote a
+   defined transparent constant or local definition (see
+   :ref:`TODO-1.3.2-Definitions` and :ref:`TODO-6.10.2-Transparent`). The tactic
+   ``unfold`` applies the :math:`\delta` rule to each occurrence of the constant to which
+   :n:`@qualid` refers in the current goal and then replaces it with its
+   :math:`\beta`:math:`\iota`-normal form.
 
-\item \texttt{trivial with \ident$_1$ \dots\ \ident$_n$}
+.. exn:: @qualid does not denote an evaluable constant
 
-\item \texttt{trivial with *}
+.. tacv:: unfold @qualid in @ident
 
-\item \texttt{trivial using} \nterm{lemma}$_1$ {\tt ,} {\ldots} {\tt ,} \nterm{lemma}$_n$
+   Replaces :n:`@qualid` in hypothesis :n:`@ident` with its definition
+   and replaces the hypothesis with its :math:`\beta`:math:`\iota` normal form.
 
-\item {\tt info\_trivial}
+.. tacv:: unfold {+, @qualid}
 
-\item {\tt debug trivial}
+   Replaces *simultaneously* :n:`{+, @qualid}` with their definitions and
+   replaces the current goal with its :math:`\beta`:math:`\iota` normal form.
 
-\item {\tt \zeroone{info\_}trivial} \zeroone{{\tt using} \nterm{lemma}$_1$
-  {\tt ,} {\ldots} {\tt ,} \nterm{lemma}$_n$} \zeroone{{\tt with}
-  \ident$_1$ {\ldots} \ident$_n$}
+.. tacv:: unfold {+, @qualid at {+, @num }}
 
-\end{Variants}
+   The lists :n:`{+, @num}` specify the occurrences of :n:`@qualid` to be
+   unfolded. Occurrences are located from left to right.
 
-\Rem {\tt auto} either solves completely the goal or else leaves it
-intact. \texttt{auto} and \texttt{trivial} never fail.
+   .. exn:: bad occurrence number of @qualid
 
-\Rem The following options enable printing of informative or debug
-information for the {\tt auto} and {\tt trivial} tactics:
-\begin{quote}
-  \optindex{Info Auto}
-  {\tt Set Info Auto}
-  \optindex{Debug Auto}
-  {\tt Set Debug Auto}
-  \optindex{Info Trivial}
-  {\tt Set Info Trivial}
-  \optindex{Debug Trivial}
-  {\tt Set Debug Trivial}
-\end{quote}
+   .. exn:: @qualid does not occur
 
-\SeeAlso Section~\ref{Hints-databases}
+.. tacv:: unfold @string
 
-\subsection{\tt eauto}
-\tacindex{eauto}
-\label{eauto}
+   If :n:`@string` denotes the discriminating symbol of a notation (e.g. "+") or
+   an expression defining a notation (e.g. `"_ + _"`), and this notation refers to an unfoldable constant, then the
+   tactic unfolds it.
 
-This tactic generalizes {\tt auto}. While {\tt auto} does not try
-resolution hints which would leave existential variables in the goal,
-{\tt eauto} does try them (informally speaking, it uses
-{\tt simple eapply} where {\tt auto} uses {\tt simple apply}).
-As a consequence, {\tt eauto} can solve such a goal:
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-\begin{coq_example}
-Hint Resolve ex_intro.
-Goal forall P:nat -> Prop, P 0 ->  exists n, P n.
-eauto.
-\end{coq_example}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-Note that {\tt ex\_intro} should be declared as a hint.
-
-\begin{Variants}
-
-\item {\tt \zeroone{info\_}eauto \zeroone{\num}} \zeroone{{\tt using} \nterm{lemma}$_1$
-  {\tt ,} {\ldots} {\tt ,} \nterm{lemma}$_n$} \zeroone{{\tt with}
-  \ident$_1$ {\ldots} \ident$_n$}
+.. tacv:: unfold @string%key
 
-  The various options for eauto are the same as for auto.
+   This is variant of :n:`unfold @string` where :n:`@string` gets its
+   interpretation from the scope bound to the delimiting key :n:`key`
+   instead of its default interpretation (see :ref:`TODO-12.2.2-Localinterpretationrulesfornotations`).
+.. tacv:: unfold {+, qualid_or_string at {+, @num}}
 
-\end{Variants}
+   This is the most general form, where :n:`qualid_or_string` is either a
+   :n:`@qualid` or a :n:`@string` referring to a notation.
 
-\Rem {\tt eauto} obeys the following options:
-\begin{quote}
-  \optindex{Info Eauto}
-  {\tt Set Info Eauto}
-  \optindex{Debug Eauto}
-  {\tt Set Debug Eauto}
-\end{quote}
+.. tacn:: fold @term
+   :name: fold
 
-\SeeAlso Section~\ref{Hints-databases}
+   This tactic applies to any goal. The term :n:`@term` is reduced using the
+   ``red`` tactic. Every occurrence of the resulting :n:`@term` in the goal is
+   then replaced by :n:`@term`.
 
-\subsection{\tt autounfold with \ident$_1$ \mbox{\dots} \ident$_n$}
-\tacindex{autounfold}
-\label{autounfold}
+.. tacv:: fold {+ @term}
 
-This tactic unfolds constants that were declared through a {\tt Hint
-  Unfold} in the given databases.
+   Equivalent to :n:`fold @term ; ... ; fold @term`.
 
-\begin{Variants}
-\item {\tt autounfold with \ident$_1$ \dots\ \ident$_n$ in \nterm{clause}}
+.. tacn:: pattern @term
+   :name: pattern
 
-  Performs the unfolding in the given clause.
+   This command applies to any goal. The argument :n:`@term` must be a free
+   subterm of the current goal. The command pattern performs :math:`\beta`-expansion
+   (the inverse of :math:`\beta`-reduction) of the current goal (say :g:`T`) by
 
-\item {\tt autounfold with *}
+   + replacing all occurrences of :n:`@term` in :g:`T` with a fresh variable
+   + abstracting this variable
+   + applying the abstracted goal to :n:`@term`
 
-  Uses the unfold hints declared in all the hint databases.
-\end{Variants}
+   For instance, if the current goal :g:`T` is expressible as
+   :math:`\varphi`:g:`(t)` where the notation captures all the instances of :g:`t`
+   in :math:`\varphi`:g:`(t)`, then :n:`pattern t` transforms it into
+   :g:`(fun x:A =>` :math:`\varphi`:g:`(x)) t`. This command can be used, for
+   instance, when the tactic ``apply`` fails on matching.
 
+.. tacv:: pattern @term at {+ @num}
 
-\subsection{\tt autorewrite with \ident$_1$ \mbox{\dots} \ident$_n$}
-\label{tactic:autorewrite}
-\tacindex{autorewrite}
+   Only the occurrences :n:`{+ @num}` of :n:`@term` are considered for
+   :math:`\beta`-expansion. Occurrences are located from left to right.
 
-This tactic \footnote{The behavior of this tactic has much changed compared to
-the versions available in the previous distributions (V6). This may cause
-significant changes in your theories to obtain the same result. As a drawback
-of the re-engineering of the code, this tactic has also been completely revised
-to get a very compact and readable version.} carries out rewritings according
-the rewriting rule bases {\tt \ident$_1$ \dots \ident$_n$}.
+.. tacv:: pattern @term at - {+ @num}
 
-Each rewriting rule of a base \ident$_i$ is applied to the main subgoal until
-it fails. Once all the rules have been processed, if the main subgoal has
-progressed (e.g., if it is distinct from the initial main goal) then the rules
-of this base are processed again. If the main subgoal has not progressed then
-the next base is processed. For the bases, the behavior is exactly similar to
-the processing of the rewriting rules.
+   All occurrences except the occurrences of indexes :n:`{+ @num }`
+   of :n:`@term` are considered for :math:`\beta`-expansion. Occurrences are located from
+   left to right.
 
-The rewriting rule bases are built with the {\tt Hint~Rewrite} vernacular
-command.
+.. tacv:: pattern {+, @term}
+
+   Starting from a goal :math:`\varphi`:g:`(t`:sub:`1` :g:`... t`:sub:`m`:g:`)`,
+   the tactic :n:`pattern t`:sub:`1`:n:`, ..., t`:sub:`m` generates the
+   equivalent goal
+   :g:`(fun (x`:sub:`1`:g:`:A`:sub:`1`:g:`) ... (x`:sub:`m` :g:`:A`:sub:`m` :g:`) =>`:math:`\varphi`:g:`(x`:sub:`1` :g:`... x`:sub:`m` :g:`)) t`:sub:`1` :g:`... t`:sub:`m`.
+   If :g:`t`:sub:`i` occurs in one of the generated types :g:`A`:sub:`j` these
+   occurrences will also be considered and possibly abstracted.
+
+.. tacv:: pattern {+, @term at {+ @num}}
+
+   This behaves as above but processing only the occurrences :n:`{+ @num}` of
+   :n:`@term` starting from :n:`@term`.
+
+.. tacv:: pattern {+, @term {? at {? -} {+, @num}}}
+
+   This is the most general syntax that combines the different variants.
+
+Conversion tactics applied to hypotheses
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. tacn:: conv_tactic in {+, @ident}
+
+   Applies the conversion tactic :n:`conv_tactic` to the hypotheses
+   :n:`{+ @ident}`. The tactic :n:`conv_tactic` is any of the conversion tactics
+   listed in this section.
+
+   If :n:`@ident` is a local definition, then :n:`@ident` can be replaced by
+   (Type of :n:`@ident`) to address not the body but the type of the local
+   definition.
+
+   Example: :n:`unfold not in (Type of H1) (Type of H3)`.
+
+.. exn:: No such hypothesis : ident.
+
+
+.. _automation:
 
-\Warning{} This tactic may loop if you build non terminating rewriting systems.
+Automation
+----------
 
-\begin{Variant}
-\item {\tt autorewrite with \ident$_1$ \mbox{\dots} \ident$_n$ using \tac}
+.. tacn:: auto
+   :name: auto
 
-Performs, in the same way, all the rewritings of the bases {\tt \ident$_1$
-\mbox{\dots} \ident$_n$} applying {\tt \tac} to the main subgoal after each
-rewriting step.
+This tactic implements a Prolog-like resolution procedure to solve the
+current goal. It first tries to solve the goal using the assumption
+tactic, then it reduces the goal to an atomic one using intros and
+introduces the newly generated hypotheses as hints. Then it looks at
+the list of tactics associated to the head symbol of the goal and
+tries to apply one of them (starting from the tactics with lower
+cost). This process is recursively applied to the generated subgoals.
 
-\item {\tt autorewrite with \ident$_1$ \mbox{\dots} \ident$_n$ in \qualid}
+By default, auto only uses the hypotheses of the current goal and the
+hints of the database named core.
 
-  Performs all the rewritings in hypothesis {\qualid}.
-\item {\tt autorewrite with \ident$_1$ \mbox{\dots} \ident$_n$ in {\qualid} using \tac}
+.. tacv:: auto @num
 
-  Performs all  the rewritings  in hypothesis {\qualid}  applying {\tt
-    \tac} to the main subgoal after each rewriting step.
+  Forces the search depth to be :n:`@num`. The maximal search depth
+  is `5` by default.
 
-\item {\tt autorewrite with \ident$_1$ \mbox{\dots} \ident$_n$ in \nterm{clause}}
+.. tacv:: auto with {+ @ident}
 
-  Performs all the rewriting  in the clause \nterm{clause}.
-  The \nterm{clause} argument must not contain any \texttt{type of} nor \texttt{value of}.
+  Uses the hint databases :n:`{+ @ident}` in addition to the database core. See
+  :ref:`The Hints Databases for auto and eauto <thehintsdatabasesforautoandeauto>` for the list of
+  pre-defined databases and the way to create or extend a database.
 
-\end{Variant}
+.. tacv:: auto with *
 
-\SeeAlso Section~\ref{HintRewrite} for feeding the database of lemmas used by {\tt autorewrite}.
+  Uses all existing hint databases. See
+  :ref:`The Hints Databases for auto and eauto <thehintsdatabasesforautoandeauto>`
 
-\SeeAlso Section~\ref{autorewrite-example} for examples showing the use of
-this tactic.
+.. tacv:: auto using {+ @lemma}
 
-% En attente d'un moyen de valoriser les fichiers de demos
-%\SeeAlso file \texttt{contrib/Rocq/DEMOS/Demo\_AutoRewrite.v}
+  Uses :n:`{+ @lemma}` in addition to hints (can be combined with the with
+  :n:`@ident` option).  If :n:`@lemma` is an inductive type, it is the
+  collection of its constructors which is added as hints.
 
-\subsection{\tt easy}
-\tacindex{easy}
-\label{easy}
+.. tacv:: info_auto
 
-This tactic tries to solve the current goal by a number of standard closing steps.
-In particular, it tries to close the current goal using the closing tactics
-{\tt trivial}, reflexivity, symmetry, contradiction and inversion of hypothesis.
-If this fails, it tries introducing variables and splitting and-hypotheses,
-using the closing tactics afterwards, and splitting the goal using {\tt split} and recursing.
+   Behaves like auto but shows the tactics it uses to solve the goal. This
+   variant is very useful for getting a better understanding of automation, or
+   to know what lemmas/assumptions were used.
 
-This tactic solves goals that belong to many common classes; in particular, many cases of
-unsatisfiable hypotheses, and simple equality goals are usually solved by this tactic.
+.. tacv:: debug auto
 
-\begin{Variant}
-\item {\tt now \tac}
-  \tacindex{now}
+   Behaves like :tacn:`auto` but shows the tactics it tries to solve the goal,
+   including failing paths.
 
-  Run \tac\/ followed by easy. This is a notation for {\tt \tac; easy}.
-\end{Variant}
+.. tacv:: {? info_}auto {? @num} {? using {+ @lemma}} {? with {+ @ident}}
 
-\section{Controlling automation}
+  This is the most general form, combining the various options.
 
-\subsection{The hints databases for {\tt auto} and {\tt eauto}}
-\index{Hints databases}
-\label{Hints-databases}
-\comindex{Hint}
+.. tacv:: trivial
+   :name: trivial
 
-The hints for \texttt{auto} and \texttt{eauto} are stored in
-databases.  Each database maps head symbols to a list of hints. One can
-use the command \texttt{Print Hint \ident} to display the hints
-associated to the head symbol \ident{} (see \ref{PrintHint}). Each
-hint has a cost that is a nonnegative integer, and an optional pattern.
-The hints with lower cost are tried first. A hint is tried by
-\texttt{auto} when the conclusion of the current goal
-matches its pattern or when it has no pattern.
+   This tactic is a restriction of auto that is not recursive
+   and tries only hints that cost `0`. Typically it solves trivial
+   equalities like :g:`X=X`.
 
-\subsubsection*{Creating Hint databases
-  \label{CreateHintDb}\comindex{CreateHintDb}}
+.. tacv:: trivial with {+ @ident}
+.. tacv:: trivial with *
+.. tacv:: trivial using {+ @lemma}
+.. tacv:: debug trivial
+.. tacv:: info_trivial
+.. tacv:: {? info_}trivial {? using {+ @lemma}} {? with {+ @ident}}
 
-One can optionally declare a hint database using the command
-\texttt{Create HintDb}. If a hint is added to an unknown database, it
-will be automatically created.
+.. note::
+  :tacn:`auto` either solves completely the goal or else leaves it
+  intact. :tacn:`auto` and :tacn:`trivial` never fail.
 
-\medskip
-\texttt{Create HintDb} {\ident} [\texttt{discriminated}]
-\medskip
+The following options enable printing of informative or debug information for
+the :tacn:`auto` and :tacn:`trivial` tactics:
 
-This command creates a new database named \ident.
-The database is implemented by a Discrimination Tree (DT) that serves as
-an index of all the lemmas. The DT can use transparency information to decide
-if a constant should be indexed or not (c.f. \ref{HintTransparency}),
-making the retrieval more efficient.
-The legacy implementation (the default one for new databases) uses the
-DT only on goals without existentials (i.e., auto goals), for non-Immediate
-hints and do not make use of transparency hints, putting more work on the
-unification that is run after retrieval (it keeps a list of the lemmas
-in case the DT is not used). The new implementation enabled by
-the {\tt discriminated} option makes use of DTs in all cases and takes
-transparency information into account. However, the order in which hints
-are retrieved from the DT may differ from the order in which they were
-inserted, making this implementation observationally different from the
-legacy one.
+.. opt:: Info Auto
+.. opt:: Debug Auto
+.. opt:: Info Trivial
+.. opt:: Info Trivial
 
-The general
-command to add a hint to some databases \ident$_1$, \dots, \ident$_n$ is
-\begin{tabbing}
-  {\tt Hint {\hintdef} :~\ident$_1$ \mbox{\dots} \ident$_n$}
-\end{tabbing}
+See also: :ref:`The Hints Databases for auto and eauto <thehintsdatabasesforautoandeauto>`
 
-\begin{Variants}
-\item {\tt Hint \hintdef}
+.. tacn:: eauto
+   :name: eauto
 
-  No database name is given: the hint is registered in the {\tt core}
-    database.
+This tactic generalizes :tacn:`auto`. While :tacn:`auto` does not try
+resolution hints which would leave existential variables in the goal,
+:tacn:`eauto` does try them (informally speaking, it usessimple :tacn:`eapply`
+where :tacn:`auto` uses simple :tacn:`apply`). As a consequence, :tacn:`eauto`
+can solve such a goal:
 
-\item {\tt Local Hint {\hintdef} :~\ident$_1$ \mbox{\dots} \ident$_n$}
+.. example::
+   .. coqtop:: all
 
-  This is used to declare hints that must not be exported to the other
-  modules that require and import the current module. Inside a
-  section, the option {\tt Local} is useless since hints do not
-  survive anyway to the closure of sections.
+      Hint Resolve ex_intro.
+      Goal forall P:nat -> Prop, P 0 -> exists n, P n.
+      eauto.
 
-\item {\tt Local Hint \hintdef}
+Note that :tacn:`ex_intro` should be declared as a hint.
 
-  Idem for the {\tt core} database.
 
-\end{Variants}
+.. tacv:: {? info_}eauto {? @num} {? using {+ @lemma}} {? with {+ @ident}}
 
-The {\hintdef} is one of the following expressions:
+  The various options for eauto are the same as for auto.
 
-\begin{itemize}
-\item {\tt Resolve \term {\zeroone{{\tt |} \zeroone{\num} \zeroone{\pattern}}}}
-  \comindex{Hint Resolve}
+:tacn:`eauto` also obeys the following options:
 
-  This command adds {\tt simple apply {\term}} to the hint list
-  with the head symbol of the type of \term. The cost of that hint is
-  the number of subgoals generated by {\tt simple apply {\term}} or \num
-  if specified. The associated pattern is inferred from the conclusion
-  of the type of \term or the given \pattern if specified.
-%{\tt auto} actually uses a slightly modified variant of {\tt simple apply} with use_metas_eagerly_in_conv_on_closed_terms set to false
+.. opt:: Info Eauto
+.. opt:: Debug Eauto
 
-  In case the inferred type of \term\ does not start with a product
-  the tactic added in the hint list is {\tt exact {\term}}.
-% Actually, a slightly restricted version is used (no conversion on the head symbol)
-  In case
-  this type can however be reduced to a type starting with a product,
-  the tactic {\tt simple apply {\term}} is also stored in the hints list.
+See also: :ref:`The Hints Databases for auto and eauto <thehintsdatabasesforautoandeauto>`
 
-  If the inferred type of \term\ contains a dependent quantification
-  on a variable which occurs only in the premisses of the type and not
-  in its conclusion, no instance could be inferred for the variable by
-  unification with the goal. In this case, the hint is added to the
-  hint list of {\tt eauto} (see \ref{eauto}) instead of the hint list
-  of {\tt auto} and a warning is printed. A typical example of a hint
-  that is used only by \texttt{eauto} is a transitivity lemma.
 
-  \begin{ErrMsgs}
-%%  \item \errindex{Bound head variable}
+.. tacn:: autounfold with {+ @ident}
+   :name: autounfold
 
-  \item \term\ \errindex{cannot be used as a hint}
 
-    The head symbol of the type of {\term} is a bound variable such
-    that this tactic cannot be associated to a constant.
+This tactic unfolds constants that were declared through a ``Hint Unfold``
+in the given databases.
 
-    %% The type of {\term} contains products over variables that do not
-    %% appear in the conclusion. A typical example is a transitivity axiom.
-    %% In that case the {\tt simple apply} tactic fails, and thus is useless.
+.. tacv:: autounfold with {+ @ident} in clause
 
-  \end{ErrMsgs}
+  Performs the unfolding in the given clause.
 
-  \begin{Variants}
+.. tacv:: autounfold with *
 
-  \item {\tt Resolve \term$_1$ \mbox{\dots} \term$_m$}
+   Uses the unfold hints declared in all the hint databases.
 
-    Adds each \texttt{Resolve} {\term$_i$}.
+.. tacn:: autorewrite with {+ @ident}
+   :name: autorewrite
 
-  \item {\tt Resolve -> \term}
+This tactic [4]_ carries out rewritings according the rewriting rule
+bases :n:`{+ @ident}`.
 
-    Adds the left-to-right implication of an equivalence as a hint
-    (informally the hint will be used as {\tt apply <- \term},
-    although as mentionned before, the tactic actually used is
-    a restricted version of apply).
+Each rewriting rule of a base :n:`@ident` is applied to the main subgoal until
+it fails. Once all the rules have been processed, if the main subgoal has
+progressed (e.g., if it is distinct from the initial main goal) then the rules
+of this base are processed again. If the main subgoal has not progressed then
+the next base is processed. For the bases, the behavior is exactly similar to
+the processing of the rewriting rules.
+
+The rewriting rule bases are built with the ``Hint Rewrite vernacular``
+command.
 
-  \item {\tt Resolve <- \term}
+.. warn:: This tactic may loop if you build non terminating rewriting systems.
 
-    Adds the right-to-left implication of an equivalence as a hint.
+.. tacv:: autorewrite with {+ @ident} using @tactic
 
-  \end{Variants}
+  Performs, in the same way, all the rewritings of the bases :n:`{+ @ident}`
+  applying tactic to the main subgoal after each rewriting step.
 
-\item \texttt{Immediate {\term}}
-\comindex{Hint Immediate}
+.. tacv:: autorewrite with {+ @ident} in @qualid
 
-  This command adds {\tt simple apply {\term}; trivial} to the hint list
-  associated with the head symbol of the type of {\ident} in the given
-  database. This tactic will fail if all the subgoals generated by
-  {\tt simple apply {\term}} are not solved immediately by the {\tt trivial}
-  tactic (which only tries tactics with cost $0$).
+   Performs all the rewritings in hypothesis :n:`@qualid`.
 
-  This command is useful for theorems such as the symmetry of equality
-  or $n+1=m+1 \to n=m$ that we may like to introduce with a
-  limited use in order to avoid useless proof-search.
+.. tacv:: autorewrite with {+ @ident} in @qualid using @tactic
 
-  The cost of this tactic (which never generates subgoals) is always 1,
-  so that it is not used by {\tt trivial} itself.
+  Performs all the rewritings in hypothesis :n:`@qualid` applying :n:`@tactic`
+  to the main subgoal after each rewriting step.
 
-  \begin{ErrMsgs}
+.. tacv:: autorewrite with {+ @ident} in @clause
 
-%%  \item \errindex{Bound head variable}
+  Performs all the rewriting in the clause :n:`@clause`. The clause argument
+  must not contain any ``type of`` nor ``value of``.
 
-  \item \term\ \errindex{cannot be used as a hint}
+See also: :ref:`Hint-Rewrite <hintrewrite>` for feeding the database of lemmas used by
+:tacn:`autorewrite`.
 
-  \end{ErrMsgs}
+See also: :tacn:`autorewrite` for examples showing the use of this tactic.
 
-  \begin{Variants}
+.. tacn:: easy
+   :name: easy
 
-    \item {\tt Immediate \term$_1$ \mbox{\dots} \term$_m$}
+   This tactic tries to solve the current goal by a number of standard closing steps.
+   In particular, it tries to close the current goal using the closing tactics
+   :tacn:`trivial`, reflexivity, symmetry, contradiction and inversion of hypothesis.
+   If this fails, it tries introducing variables and splitting and-hypotheses,
+   using the closing tactics afterwards, and splitting the goal using
+   :tacn:`split` and recursing.
 
-      Adds each \texttt{Immediate} {\term$_i$}.
+   This tactic solves goals that belong to many common classes; in particular, many cases of
+   unsatisfiable hypotheses, and simple equality goals are usually solved by this tactic.
 
-  \end{Variants}
+.. tacv:: now @tactic
+   :name: now
 
-\item \texttt{Constructors} {\ident}
-\comindex{Hint Constructors}
+   Run :n:`@tac` followed by ``easy``. This is a notation for :n:`@tactic; easy`.
 
-  If {\ident} is an inductive type, this command adds all its
-  constructors as hints of type \texttt{Resolve}. Then, when the
-  conclusion of current goal has the form \texttt{({\ident} \dots)},
-  \texttt{auto} will try to apply each constructor.
+Controlling automation
+--------------------------
 
-  \begin{ErrMsgs}
+.. _thehintsdatabasesforautoandeauto:
 
-    \item {\ident} \errindex{is not an inductive type}
+The hints databases for auto and eauto
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-% No need to have this message here, is is generic to all commands
-% referring to globals
-%%    \item {\ident} \errindex{not declared}
+The hints for ``auto`` and ``eauto`` are stored in databases. Each database
+maps head symbols to a list of hints. One can use the command
 
-  \end{ErrMsgs}
+.. cmd:: Print Hint @ident
 
-  \begin{Variants}
+to display the hints associated to the head symbol :n:`@ident`
+(see :ref:`Print Hint <printhint>`). Each hint has a cost that is a nonnegative
+integer, and an optional pattern. The hints with lower cost are tried first. A
+hint is tried by ``auto`` when the conclusion of the current goal matches its
+pattern or when it has no pattern.
 
-    \item {\tt Constructors \ident$_1$ \mbox{\dots} \ident$_m$}
+Creating Hint databases
+```````````````````````
 
-      Adds each \texttt{Constructors} {\ident$_i$}.
+One can optionally declare a hint database using the command ``Create
+HintDb``. If a hint is added to an unknown database, it will be
+automatically created.
 
-  \end{Variants}
+.. cmd:: Create HintDb @ident {? discriminated}.
 
-\item \texttt{Unfold} {\qualid}
-\comindex{Hint Unfold}
+This command creates a new database named :n:`@ident`. The database is
+implemented by a Discrimination Tree (DT) that serves as an index of
+all the lemmas. The DT can use transparency information to decide if a
+constant should be indexed or not (c.f. :ref:`The hints databases for auto and eauto <thehintsdatabasesforautoandeauto>`),
+making the retrieval more efficient. The legacy implementation (the default one
+for new databases) uses the DT only on goals without existentials (i.e., ``auto``
+goals), for non-Immediate hints and do not make use of transparency
+hints, putting more work on the unification that is run after
+retrieval (it keeps a list of the lemmas in case the DT is not used).
+The new implementation enabled by the discriminated option makes use
+of DTs in all cases and takes transparency information into account.
+However, the order in which hints are retrieved from the DT may differ
+from the order in which they were inserted, making this implementation
+observationally different from the legacy one.
 
-  This adds the tactic {\tt unfold {\qualid}} to the hint list that
-  will only be used when the head constant of the goal is \ident.  Its
-  cost is 4.
+The general command to add a hint to some databases :n:`{+ @ident}` is
 
-  \begin{Variants}
+.. cmd:: Hint hint_definition : {+ @ident}
 
-    \item {\tt Unfold \ident$_1$ \mbox{\dots} \ident$_m$}
+**Variants:**
 
-      Adds each \texttt{Unfold} {\ident$_i$}.
+.. cmd:: Hint hint_definition
 
-  \end{Variants}
+   No database name is given: the hint is registered in the core database.
 
-\item \texttt{Transparent}, \texttt{Opaque} {\qualid}
-\label{HintTransparency}
-\comindex{Hint Transparent}
-\comindex{Hint Opaque}
+.. cmd:: Local Hint hint_definition : {+ @ident}
 
-  This adds a transparency hint to the database, making {\tt {\qualid}}
-  a transparent or opaque constant during resolution. This information
-  is used during unification of the goal with any lemma in the database
-  and inside the discrimination network to relax or constrain it in the
-  case of \texttt{discriminated} databases.
+   This is used to declare hints that must not be exported to the other modules
+   that require and import the current module. Inside a section, the option
+   Local is useless since hints do not survive anyway to the closure of
+   sections.
 
-  \begin{Variants}
+.. cmd:: Local Hint hint_definition
 
-    \item \texttt{Transparent}, \texttt{Opaque} {\ident$_1$} \mbox{\dots} {\ident$_m$}
+   Idem for the core database.
 
-      Declares each {\ident$_i$} as a transparent or opaque constant.
+The ``hint_definition`` is one of the following expressions:
 
-  \end{Variants}
++ :n:`Resolve @term {? | {? @num} {? @pattern}}`
+  This command adds :n:`simple apply @term` to the hint list with the head symbol of the type of
+  :n:`@term`. The cost of that hint is the number of subgoals generated by
+  :n:`simple apply @term` or :n:`@num` if specified. The associated :n:`@pattern`
+  is inferred from the conclusion of the type of :n:`@term` or the given
+  :n:`@pattern` if specified. In case the inferred type of :n:`@term` does not
+  start with a product the tactic added in the hint list is :n:`exact @term`.
+  In case this type can however be reduced to a type starting with a product,
+  the tactic :n:`simple apply @term` is also stored in the hints list. If the
+  inferred type of :n:`@term` contains a dependent quantification on a variable
+  which occurs only in the premisses of the type and not in its conclusion, no
+  instance could be inferred for the variable by unification with the goal. In
+  this case, the hint is added to the hint list of :tacn:`eauto` instead of the
+  hint list of auto and a warning is printed. A typical example of a hint that
+  is used only by ``eauto`` is a transitivity lemma.
 
-\item \texttt{Extern \num\ [\pattern]\ => }\textsl{tactic}
-\comindex{Hint Extern}
+  .. exn:: @term cannot be used as a hint
 
-  This hint type is to extend \texttt{auto} with tactics other than
-  \texttt{apply} and \texttt{unfold}. For that, we must specify a
-  cost, an optional pattern and a tactic to execute. Here is an example:
+     The head symbol of the type of :n:`@term` is a bound variable such that
+     this tactic cannot be associated to a constant.
 
-\begin{quotation}
-\begin{verbatim}
-Hint Extern 4 (~(_ = _)) => discriminate.
-\end{verbatim}
-\end{quotation}
+  **Variants:**
 
-  Now, when the head of the goal is a disequality, \texttt{auto} will
-  try \texttt{discriminate} if it does not manage to solve the goal
-  with hints with a cost less than 4.
+   + :n:`Resolve {+ @term}`
+     Adds each :n:`Resolve @term`.
 
-  One can even use some sub-patterns of the pattern in the tactic
-  script. A sub-pattern is a question mark followed by an identifier, like
-  \texttt{?X1} or \texttt{?X2}. Here is an example:
+   + :n:`Resolve -> @term`
+     Adds the left-to-right implication of an equivalence as a hint (informally
+     the hint will be used as :n:`apply <- @term`, although as mentionned
+     before, the tactic actually used is a restricted version of ``apply``).
 
-% Require EqDecide.
-\begin{coq_example*}
-Require Import List.
-\end{coq_example*}
-\begin{coq_example}
-Hint Extern 5   ({?X1 = ?X2} + {?X1 <> ?X2}) =>
- generalize X1, X2; decide equality : eqdec.
-Goal
-forall a b:list (nat * nat), {a = b} + {a <> b}.
-Info 1 auto with eqdec.
-\end{coq_example}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
+   + :n:`Resolve <- @term`
+     Adds the right-to-left implication of an equivalence  as a hint.
 
-\item \texttt{Cut} {\textit{regexp}}
-\label{HintCut}
-\comindex{Hint Cut}
-
-  \textit{Warning:} these hints currently only apply to typeclass proof search and
-  the \texttt{typeclasses eauto} tactic (\ref{typeclasseseauto}).
-
-  This command can be used to cut the proof-search tree according to a
-  regular expression matching paths to be cut. The grammar for regular
-  expressions is the following. Beware, there is no operator precedence
-  during parsing, one can check with \texttt{Print HintDb} to verify the
-  current cut expression:
-\[\begin{array}{lcll}
-  e & ::= & \ident & \text{ hint or instance identifier } \\
-  & & \texttt{\_} & \text{ any hint } \\
-  & & e | e' & \text{ disjunction } \\
-  & & e e' & \text{ sequence } \\
-  & & e * & \text{ Kleene star } \\
-  & & \texttt{emp} & \text{ empty } \\
-  & & \texttt{eps} & \text{ epsilon } \\
-  & & \texttt{(} e \texttt{)} &
-\end{array}\]
-
-The \texttt{emp} regexp does not match any search path while
-\texttt{eps} matches the empty path. During proof search, the path of
-successive successful hints on a search branch is recorded, as a list of
-identifiers for the hints (note \texttt{Hint Extern}'s do not have an
-associated identifier). Before applying any hint $\ident$ the current
-path $p$ extended with $\ident$ is matched against the current cut
-expression $c$ associated to the hint database. If matching succeeds,
-the hint is \emph{not} applied. The semantics of \texttt{Hint Cut} $e$
-is to set the cut expression to $c | e$, the initial cut expression
-being \texttt{emp}.
-
-
-\item \texttt{Mode} {\qualid} {\tt (+ | ! | -)}$^*$
-\label{HintMode}
-\comindex{Hint Mode}
-
-This sets an optional mode of use of the identifier {\qualid}.  When
-proof-search faces a goal that ends in an application of {\qualid} to
-arguments {\tt \term$_1$ \mbox{\dots} \term$_n$}, the mode tells if the
-hints associated to qualid can be applied or not. A mode specification
-is a list of $n$ {\tt +}, {\tt !} or {\tt -} items that specify if an
-argument of the identifier is to be treated as an input ({\tt +}), if
-its head only is an input ({\tt !}) or an output ({\tt -}) of the
-identifier. For a mode to match a list of arguments, input terms and
-input heads \emph{must not} contain existential variables or be
-existential variables respectively, while outputs can be any
-term. Multiple modes can be declared for a single identifier, in that
-case only one mode needs to match the arguments for the hints to be
-applied.
-
-The head of a term is understood here as the applicative head, or the
-match or projection scrutinee's head, recursively, casts being ignored.
-
-{\tt Hint Mode} is especially useful for typeclasses, when one does not
-want to support default instances and avoid ambiguity in
-general. Setting a parameter of a class as an input forces proof-search
-to be driven by that index of the class, with {\tt !} giving more
-flexibility by allowing existentials to still appear deeper in the index
-but not at its head.
-
-\end{itemize}
-
-\Rem One can use an \texttt{Extern} hint with no pattern to do
-pattern-matching on hypotheses using \texttt{match goal with} inside
-the tactic.
-
-% There are shortcuts that allow to define several goal at once:
-
-% \begin{itemize}
-% \item \comindex{Hints Resolve}\texttt{Hints Resolve \ident$_1$ \dots\ \ident$_n$ : \ident.}\\
-%   This command is a shortcut for the following ones:
-%   \begin{quotation}
-%    \noindent\texttt{Hint \ident$_1$ : \ident\ := Resolve \ident$_1$}\\
-%    \dots\\
-%    \texttt{Hint \ident$_1$ : \ident := Resolve \ident$_1$}
-%   \end{quotation}
-%   Notice that the hint name is the same that the theorem given as
-%   hint.
-% \item \comindex{Hints Immediate}\texttt{Hints Immediate \ident$_1$ \dots\ \ident$_n$ : \ident.}\\
-% \item \comindex{Hints Unfold}\texttt{Hints Unfold \qualid$_1$ \dots\ \qualid$_n$ : \ident.}\\
-% \end{itemize}
-
-%\begin{Warnings}
-%  \item \texttt{Overriding hint named \dots\ in database \dots}
-%\end{Warnings}
-
-
-
-\subsection{Hint databases defined in the \Coq\ standard library}
-
-Several hint databases are defined in the \Coq\ standard library.  The
++ :n:`Immediate @term`
+  This command adds :n:`simple apply @term; trivial` to the hint list associated
+  with the head symbol of the type of :n:`@ident` in the given database. This
+  tactic will fail if all the subgoals generated by :n:`simple apply @term` are
+  not solved immediately by the ``trivial`` tactic (which only tries tactics
+  with cost 0).This command is useful for theorems such as the symmetry of
+  equality or :g:`n+1=m+1 -> n=m` that we may like to introduce with a limited
+  use in order to avoid useless proof-search.The cost of this tactic (which
+  never generates subgoals) is always 1, so that it is not used by ``trivial``
+  itself.
+
+  .. exn:: @term cannot be used as a hint
+
+  **Variants:**
+
+  + :n:`Immediate {+ @term}`
+    Adds each :n:`Immediate @term`.
+
++ :n:`Constructors @ident`
+  If :n:`@ident` is an inductive type, this command adds all its constructors as
+  hints of type Resolve. Then, when the conclusion of current goal has the form
+  :n:`(@ident ...)`, ``auto`` will try to apply each constructor.
+
+  .. exn:: @ident is not an inductive type
+
+  **Variants:**
+
+    + :n:`Constructors {+ @ident}`
+      Adds each :n:`Constructors @ident`.
+
++ :n:`Unfold @qualid`
+  This adds the tactic :n:`unfold @qualid` to the hint list that will only be
+  used when the head constant of the goal is :n:`@ident`.
+  Its cost is 4.
+
+  **Variants:**
+
+    + :n:`Unfold {+ @ident}`
+      Adds each :n:`Unfold @ident`.
+
++ :n:`Transparent`, :n:`Opaque @qualid`
+  This adds a transparency hint to the database, making :n:`@qualid` a
+  transparent or opaque constant during resolution. This information is used
+  during unification of the goal with any lemma in the database and inside the
+  discrimination network to relax or constrain it in the case of discriminated
+  databases.
+
+  **Variants:**
+
+    + :n:`Transparent`, :n:`Opaque {+ @ident}`
+      Declares each :n:`@ident` as a transparent or opaque constant.
+
++ :n:`Extern @num {? @pattern} => tactic`
+  This hint type is to extend ``auto`` with tactics other than ``apply`` and
+  ``unfold``. For that, we must specify a cost, an optional :n:`@pattern` and a
+  :n:`tactic` to execute. Here is an example::
+
+    Hint Extern 4 (~(_ = _)) => discriminate.
+
+  Now, when the head of the goal is a disequality, ``auto`` will try
+  discriminate if it does not manage to solve the goal with hints with a
+  cost less than 4. One can even use some sub-patterns of the pattern in
+  the tactic script. A sub-pattern is a question mark followed by an
+  identifier, like ``?X1`` or ``?X2``. Here is an example:
+
+  .. example::
+     .. coqtop:: reset all
+
+        Require Import List.
+        Hint Extern 5 ({?X1 = ?X2} + {?X1 <> ?X2}) => generalize  X1, X2; decide equality : eqdec.
+        Goal forall a b:list (nat * nat), {a = b} + {a <> b}.
+        Info 1 auto with eqdec.
+
++ :n:`Cut @regexp`
+
+  .. warning:: these hints currently only apply to typeclass
+               proof search and the ``typeclasses eauto`` tactic (:ref:`TODO-20.6.5-typeclasseseauto`).
+
+  This command can be used to cut the proof-search tree according to a regular
+  expression matching paths to be cut. The grammar for regular expressions is
+  the following. Beware, there is no operator precedence during parsing, one can
+  check with ``Print HintDb`` to verify the current cut expression:
+
+  .. productionlist:: `regexp`
+     e : ident      hint or instance identifier
+     :|_         any hint
+     :| e\|e′     disjunction
+     :| e e′      sequence
+     :| e *       Kleene star
+     :| emp       empty
+     :| eps       epsilon
+     :| ( e  )
+
+  The `emp` regexp does not match any search path while `eps`
+  matches the empty path. During proof search, the path of
+  successive successful hints on a search branch is recorded, as a
+  list of identifiers for the hints (note Hint Extern’s do not have
+  an associated identifier).
+  Before applying any hint :n:`@ident` the current path `p` extended with
+  :n:`@ident` is matched against the current cut expression `c` associated to
+  the hint database. If matching succeeds, the hint is *not* applied. The
+  semantics of ``Hint Cut e`` is to set the cut expression to ``c | e``, the
+  initial cut expression being `emp`.
+
++ :n:`Mode @qualid {* (+ | ! | -)}`
+  This sets an optional mode of use of the identifier :n:`@qualid`. When
+  proof-search faces a goal that ends in an application of :n:`@qualid` to
+  arguments :n:`@term ... @term`, the mode tells if the hints associated to
+  :n:`@qualid` can be applied or not. A mode specification is a list of n ``+``,
+  ``!`` or ``-`` items that specify if an argument of the identifier is to be
+  treated as an input (``+``), if its head only is an input (``!``) or an output
+  (``-``) of the identifier. For a mode to match a list of arguments, input
+  terms and input heads *must not* contain existential variables or be
+  existential variables respectively, while outputs can be any term. Multiple
+  modes can be declared for a single identifier, in that case only one mode
+  needs to match the arguments for the hints to be applied.The head of a term
+  is understood here as the applicative head, or the match or projection
+  scrutinee’s head, recursively, casts being ignored. ``Hint Mode`` is
+  especially useful for typeclasses, when one does not want to support default
+  instances and avoid ambiguity in general. Setting a parameter of a class as an
+  input forces proof-search to be driven by that index of the class, with ``!``
+  giving more flexibility by allowing existentials to still appear deeper in the
+  index but not at its head.
+
+.. note::
+ One can use an ``Extern`` hint with no pattern to do pattern-matching on
+ hypotheses using ``match goal`` with inside the tactic.
+
+
+Hint databases defined in the Coq standard library
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Several hint databases are defined in the Coq standard library. The
 actual content of a database is the collection of the hints declared
 to belong to this database in each of the various modules currently
-loaded.  Especially, requiring new modules potentially extend a
-database. At {\Coq} startup, only the {\tt core} database is non empty
-and can be used.
+loaded. Especially, requiring new modules potentially extend a
+database. At Coq startup, only the core database is non empty and can
+be used.
 
-\begin{description}
+:core: This special database is automatically used by ``auto``, except when
+       pseudo-database ``nocore`` is given to ``auto``. The core database
+       contains only basic lemmas about negation, conjunction, and so on from.
+       Most of the hints in this database come from the Init and Logic directories.
 
-\item[\tt core] This special database is automatically used by
-  \texttt{auto}, except when pseudo-database \texttt{nocore} is
-  given to \texttt{auto}. The \texttt{core} database contains
-  only basic lemmas about negation,
-  conjunction, and so on from. Most of the hints in this database come
-  from the \texttt{Init} and \texttt{Logic} directories.
+:arith: This database contains all lemmas about Peano’s arithmetic proved in the
+        directories Init and Arith.
 
-\item[\tt arith] This database contains all lemmas about Peano's
-  arithmetic proved in the directories \texttt{Init} and
-  \texttt{Arith}
+:zarith: contains lemmas about binary signed integers from the directories
+         theories/ZArith. When required, the module Omega also extends the
+         database zarith with a high-cost hint that calls ``omega`` on equations
+         and inequalities in nat or Z.
 
-\item[\tt zarith] contains lemmas about binary signed integers from
-  the directories \texttt{theories/ZArith}. When required, the module
-  {\tt Omega} also extends the database {\tt zarith} with a high-cost
-  hint that calls {\tt omega} on equations and inequalities in {\tt
-  nat} or {\tt Z}.
+:bool: contains lemmas about booleans, mostly from directory theories/Bool.
 
-\item[\tt bool] contains lemmas about booleans, mostly from directory
-  \texttt{theories/Bool}.
+:datatypes: is for lemmas about lists, streams and so on that are mainly proved
+            in the Lists subdirectory.
 
-\item[\tt datatypes] is for lemmas about lists, streams and so on that
-  are mainly proved in the \texttt{Lists} subdirectory.
+:sets: contains lemmas about sets and relations from the directories Sets and
+       Relations.
 
-\item[\tt sets] contains lemmas about sets and relations from the
-  directories \texttt{Sets} and \texttt{Relations}.
+:typeclass_instances: contains all the type class instances declared in the
+                      environment, including those used for ``setoid_rewrite``,
+                      from the Classes directory.
 
-\item[\tt typeclass\_instances] contains all the type class instances
-  declared in the environment, including those used for \texttt{setoid\_rewrite},
-  from the \texttt{Classes} directory.
-\end{description}
+You are advised not to put your own hints in the core database, but
+use one or several databases specific to your development.
 
-You are advised not to put your own hints in the {\tt core} database,
-but use one or several databases specific to your development.
+.. _removehints:
 
-\subsection{\tt Remove Hints \term$_1$ \mbox{\dots} \term$_n$ :~ \ident$_1$
-  \mbox{\dots} \ident$_m$}
-\label{RemoveHints}
-\comindex{Remove Hints}
+.. cmd:: Remove Hints {+ @term} : {+ @ident}
 
-This command removes the hints associated to terms \term$_1$ \mbox{\dots}
-\term$_n$ in databases \ident$_1$ \mbox{\dots} \ident$_m$.
+This command removes the hints associated to terms :n:`{+ @term}` in databases
+:n:`{+ @ident}`.
 
-\subsection{\tt Print Hint}
-\label{PrintHint}
-\comindex{Print Hint}
+.. _printhint:
+
+.. cmd:: Print Hint
 
 This command displays all hints that apply to the current goal. It
-fails if no proof is being edited, while the two variants can be used at
-every moment.
+fails if no proof is being edited, while the two variants can be used
+at every moment.
 
-\begin{Variants}
+**Variants:**
 
-\item {\tt Print Hint \ident}
 
- This command displays only tactics associated with \ident\ in the
- hints list. This is independent of the goal being edited, so this
- command will not fail if no goal is being edited.
+.. cmd:: Print Hint @ident
 
-\item {\tt Print Hint *}
+   This command displays only tactics associated with :n:`@ident` in the hints
+   list. This is independent of the goal being edited, so this command will not
+   fail if no goal is being edited.
 
-  This command displays all declared hints.
+.. cmd:: Print Hint *
 
-\item {\tt Print HintDb \ident}
-\label{PrintHintDb}
-\comindex{Print HintDb}
+   This command displays all declared hints.
 
- This command displays all hints from database \ident.
+.. cmd:: Print HintDb @ident
 
-\end{Variants}
+   This command displays all hints from database :n:`@ident`.
 
-\subsection{\tt Hint Rewrite \term$_1$ \mbox{\dots} \term$_n$ :~ \ident$_1$ \mbox{\dots} \ident$_m$}
-\label{HintRewrite}
-\comindex{Hint Rewrite}
+.. _hintrewrite:
 
-This vernacular command adds the terms {\tt \term$_1$ \mbox{\dots} \term$_n$}
-(their types must be equalities) in the rewriting bases \ident$_1$, \dots, \ident$_m$
-with the default orientation (left to right). Notice that the
-rewriting bases are distinct from the {\tt auto} hint bases and that
-{\tt auto} does not take them into account.
+.. cmd:: Hint Rewrite {+ @term} : {+ @ident}
 
-This command is synchronous with the section mechanism (see \ref{Section}):
-when closing a section, all aliases created by \texttt{Hint Rewrite} in that
-section are lost. Conversely, when loading a module, all \texttt{Hint Rewrite}
-declarations at the global level of that module are loaded.
+   This vernacular command adds the terms :n:`{+ @term}` (their types must be
+   equalities) in the rewriting bases :n:`{+ @ident}` with the default orientation
+   (left to right). Notice that the rewriting bases are distinct from the ``auto``
+   hint bases and thatauto does not take them into account.
 
-\begin{Variants}
-\item {\tt Hint Rewrite -> \term$_1$ \mbox{\dots} \term$_n$ :~\ident$_1$ \mbox{\dots} \ident$_m$}
+   This command is synchronous with the section mechanism (see :ref:`TODO-2.4-Sectionmechanism`):
+   when closing a section, all aliases created by ``Hint Rewrite`` in that
+   section are lost. Conversely, when loading a module, all ``Hint Rewrite``
+   declarations at the global level of that module are loaded.
 
-This is strictly equivalent to the command above (we only make explicit the
-orientation which otherwise defaults to {\tt ->}).
+**Variants:**
 
-\item {\tt Hint Rewrite <- \term$_1$ \mbox{\dots} \term$_n$ :~\ident$_1$ \mbox{\dots} \ident$_m$}
+.. cmd:: Hint Rewrite -> {+ @term} : {+ @ident}
 
-Adds the rewriting rules {\tt \term$_1$ \mbox{\dots} \term$_n$} with a right-to-left
-orientation in the bases \ident$_1$, \dots, \ident$_m$.
+   This is strictly equivalent to the command above (we only make explicit the
+   orientation which otherwise defaults to ->).
 
-\item {\tt Hint Rewrite \term$_1$ \mbox{\dots} \term$_n$ using {\tac} :~\ident$_1$ \mbox{\dots} \ident$_m$}
+.. cmd:: Hint Rewrite <- {+ @term} : {+ @ident}
 
-When the rewriting rules {\tt \term$_1$ \mbox{\dots} \term$_n$} in \ident$_1$, \dots, \ident$_m$ will
-be used, the tactic {\tt \tac} will be applied to the generated subgoals, the
-main subgoal excluded.
+   Adds the rewriting rules :n:`{+ @term}` with a right-to-left orientation in
+   the bases :n:`{+ @ident}`.
 
-%% \item
-%% {\tt Hint Rewrite [ \term$_1$ \dots \term$_n$ ] in \ident}\\
-%% {\tt Hint Rewrite [ \term$_1$ \dots \term$_n$ ] in {\ident} using {\tac}}\\
-%% These are deprecated syntactic variants for
-%% {\tt Hint Rewrite \term$_1$ \dots \term$_n$ : \ident} and
-%% {\tt Hint Rewrite \term$_1$ \dots \term$_n$ using {\tac} : {\ident}}.
+.. cmd:: Hint Rewrite {+ @term} using tactic : {+ @ident}
 
-\item \texttt{Print Rewrite HintDb {\ident}}
+   When the rewriting rules :n:`{+ @term}` in :n:`{+ @ident}` will be used, the
+   tactic ``tactic`` will be applied to the generated subgoals, the main subgoal
+   excluded.
 
-  This command displays all rewrite hints contained in {\ident}.
+.. cmd:: Print Rewrite HintDb @ident
 
-\end{Variants}
+   This command displays all rewrite hints contained in :n:`@ident`.
 
-\subsection{Hint locality
-\label{Hint-Locality}}
-\optindex{Loose Hint Behavior}
+Hint locality
+~~~~~~~~~~~~~
 
-Hints provided by the \texttt{Hint} commands are erased when closing a
-section. Conversely, all hints of a module \texttt{A} that are not
-defined inside a section (and not defined with option {\tt Local}) become
-available when the module {\tt A} is imported (using
-e.g. \texttt{Require Import A.}).
+Hints provided by the ``Hint`` commands are erased when closing a section.
+Conversely, all hints of a module ``A`` that are not defined inside a
+section (and not defined with option ``Local``) become available when the
+module ``A`` is imported (using e.g. ``Require Import A.``).
 
-As of today, hints only have a binary behavior regarding locality, as described
-above: either they disappear at the end of a section scope, or they remain
-global forever. This causes a scalability issue, because hints coming from an
-unrelated part of the code may badly influence another development. It can be
-mitigated to some extent thanks to the {\tt Remove Hints} command
-(see ~\ref{RemoveHints}), but this is a mere workaround and has some
-limitations (for instance, external hints cannot be removed).
+As of today, hints only have a binary behavior regarding locality, as
+described above: either they disappear at the end of a section scope,
+or they remain global forever. This causes a scalability issue,
+because hints coming from an unrelated part of the code may badly
+influence another development. It can be mitigated to some extent
+thanks to the ``Remove Hints`` command (see :ref:`Remove Hints <removehints>`),
+but this is a mere workaround and has some limitations (for instance, external
+hints cannot be removed).
 
 A proper way to fix this issue is to bind the hints to their module scope, as
 for most of the other objects Coq uses. Hints should only made available when
 the module they are defined in is imported, not just required. It is very
 difficult to change the historical behavior, as it would break a lot of scripts.
-We propose a smooth transitional path by providing the {\tt Loose Hint Behavior}
+We propose a smooth transitional path by providing the ``Loose Hint Behavior``
 option which accepts three flags allowing for a fine-grained handling of
 non-imported hints.
 
-\begin{Variants}
+**Variants:**
 
-\item {\tt Set Loose Hint Behavior "Lax"}
+.. cmd:: Set Loose Hint Behavior "Lax"
 
-  This is the default, and corresponds to the historical behavior, that is,
-  hints defined outside of a section have a global scope.
+   This is the default, and corresponds to the historical behavior, that
+   is, hints defined outside of a section have a global scope.
 
-\item {\tt Set Loose Hint Behavior "Warn"}
+.. cmd:: Set Loose Hint Behavior "Warn"
 
-  When set, it outputs a warning when a non-imported hint is used. Note that
-  this is an over-approximation, because a hint may be triggered by a run that
-  will eventually fail and backtrack, resulting in the hint not being actually
-  useful for the proof.
+   When set, it outputs a warning when a non-imported hint is used. Note that
+   this is an over-approximation, because a hint may be triggered by a run that
+   will eventually fail and backtrack, resulting in the hint not being actually
+   useful for the proof.
 
-\item {\tt Set Loose Hint Behavior "Strict"}
+.. cmd:: Set Loose Hint Behavior "Strict"
 
-  When set, it changes the behavior of an unloaded hint to a immediate fail
-  tactic, allowing to emulate an import-scoped hint mechanism.
+   When set, it changes the behavior of an unloaded hint to a immediate fail
+   tactic, allowing to emulate an import-scoped hint mechanism.
 
-\end{Variants}
+Setting implicit automation tactics
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-\subsection{Setting implicit automation tactics}
+.. cmd:: Proof with tactic
 
-\subsubsection{\tt Proof with {\tac}}
-\label{ProofWith}
-\comindex{Proof with}
+   This command may be used to start a proof. It defines a default tactic
+   to be used each time a tactic command ``tactic``:sub:`1` is ended by ``...``.
+   In this case the tactic command typed by the user is equivalent to
+   ``tactic``:sub:`1` ``;tactic``.
 
-  This command may be used to start a proof. It defines a default
-  tactic to be used each time a tactic command {\tac$_1$} is ended by
-  ``\verb#...#''. In this case the tactic command typed by the user is
-  equivalent to \tac$_1$;{\tac}.
+See also: Proof. in :ref:`TODO-7.1.4-Proofterm`.
 
-\SeeAlso {\tt Proof.} in Section~\ref{BeginProof}.
+**Variants:**
 
-\begin{Variants}
+.. cmd:: Proof with tactic using {+ @ident}
 
-\item {\tt Proof with {\tac} using \ident$_1$ \mbox{\dots} \ident$_n$}
+   Combines in a single line ``Proof with`` and ``Proof using``, see :ref:`TODO-7.1.5-Proofusing`
 
-  Combines in a single line {\tt Proof with} and {\tt Proof using},
-  see~\ref{ProofUsing}
+.. cmd:: Proof using {+ @ident} with tactic
 
-\item {\tt Proof using \ident$_1$ \mbox{\dots} \ident$_n$ with {\tac}}
+   Combines in a single line ``Proof with`` and ``Proof using``, see :ref:`TODO-7.1.5-Proofusing`
 
-  Combines in a single line {\tt Proof with} and {\tt Proof using},
-  see~\ref{ProofUsing}
+.. cmd:: Declare Implicit Tactic tactic
 
-\end{Variants}
+   This command declares a tactic to be used to solve implicit arguments
+   that Coq does not know how to solve by unification. It is used every
+   time the term argument of a tactic has one of its holes not fully
+   resolved.
 
-\subsubsection{\tt Declare Implicit Tactic {\tac}}\label{DeclareImplicit}
-\comindex{Declare Implicit Tactic}
+Here is an example:
 
-This command declares a tactic to be used to solve implicit arguments
-that {\Coq} does not know how to solve by unification. It is used
-every time the term argument of a tactic has one of its holes not
-fully resolved.
+.. example::
 
-Here is an example:
+   .. coqtop:: all
 
-\begin{coq_example}
-Parameter quo : nat -> forall n:nat, n<>0 -> nat.
-Notation "x // y" := (quo x y _) (at level 40).
+      Parameter quo : nat -> forall n:nat, n<>0 -> nat.
+      Notation "x // y" := (quo x y _) (at level 40).
+      Declare Implicit Tactic assumption.
+      Goal forall n m, m<>0 -> { q:nat & { r | q * m + r = n } }.
+      intros.
+      exists (n // m).
 
-Declare Implicit Tactic assumption.
-Goal forall n m, m<>0 -> { q:nat & { r | q * m + r = n } }.
-intros.
-exists (n // m).
-\end{coq_example}
-\begin{coq_eval}
-Clear Implicit Tactic.
-Reset Initial.
-\end{coq_eval}
+   The tactic ``exists (n // m)`` did not fail. The hole was solved
+   by ``assumption`` so that it behaved as ``exists (quo n m H)``.
 
-The tactic {\tt exists (n // m)} did not fail. The hole was solved by
-{\tt assumption} so that it behaved as {\tt exists (quo n m H)}.
+.. _decisionprocedures:
 
-\section{Decision procedures}
+Decision procedures
+-------------------
 
-\subsection{\tt tauto}
-\tacindex{tauto}
-\tacindex{dtauto}
-\label{tauto}
+.. tacn:: tauto
+   :name: tauto
 
 This tactic implements a decision procedure for intuitionistic propositional
 calculus based on the contraction-free sequent calculi LJT* of Roy Dyckhoff
-\cite{Dyc92}. Note that {\tt tauto} succeeds on any instance of an
-intuitionistic tautological proposition. {\tt tauto} unfolds negations
-and logical equivalence but does not unfold any other definition.
-
-The following goal can be proved by {\tt tauto} whereas {\tt auto}
-would fail:
-
-\begin{coq_example}
-Goal forall (x:nat) (P:nat -> Prop), x = 0 \/ P x -> x <> 0 -> P x.
-  intros.
-  tauto.
-\end{coq_example}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-Moreover, if it has nothing else to do, {\tt tauto} performs
-introductions. Therefore, the use of {\tt intros} in the previous
-proof is unnecessary. {\tt tauto} can for instance prove the
-following:
-\begin{coq_example}
-(* auto would fail *)
-Goal forall (A:Prop) (P:nat -> Prop),
-    A \/ (forall x:nat, ~ A -> P x) -> forall x:nat, ~ A -> P x.
-
-  tauto.
-\end{coq_example}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-\Rem In contrast, {\tt tauto} cannot solve the following goal
-
-\begin{coq_example*}
-Goal forall (A:Prop) (P:nat -> Prop),
-    A \/ (forall x:nat, ~ A -> P x) -> forall x:nat, ~ ~ (A \/ P x).
-\end{coq_example*}
-\begin{coq_eval}
-Abort.
-\end{coq_eval}
-
-because \verb=(forall x:nat, ~ A -> P x)= cannot be treated as atomic and an
-instantiation of \verb=x= is necessary.
-
-\begin{Variants}
-
-\item {\tt dtauto}
-
-  While {\tt tauto} recognizes inductively defined connectives
-  isomorphic to the standard connective {\tt and}, {\tt prod}, {\tt
-    or}, {\tt sum}, {\tt False}, {\tt Empty\_set}, {\tt unit}, {\tt
-    True}, {\tt dtauto} recognizes also all inductive types with
-  one constructors and no indices, i.e. record-style connectives.
-
-\end{Variants}
-
-\subsection{\tt intuition \tac}
-\tacindex{intuition}
-\tacindex{dintuition}
-\label{intuition}
-
-The tactic \texttt{intuition} takes advantage of the search-tree built
-by the decision procedure involved in the tactic {\tt tauto}. It uses
-this information to generate a set of subgoals equivalent to the
-original one (but simpler than it) and applies the tactic
-{\tac} to them \cite{Mun94}. If this tactic fails on some goals then
-{\tt intuition} fails. In fact, {\tt tauto} is simply {\tt intuition
-  fail}.
-
-For instance, the tactic {\tt intuition auto} applied to the goal
-\begin{verbatim}
-(forall (x:nat), P x)/\B -> (forall (y:nat),P y)/\ P O \/B/\ P O
-\end{verbatim}
+:cite:`Dyc92`. Note that :tacn:`tauto` succeeds on any instance of an
+intuitionistic tautological proposition. :tacn:`tauto` unfolds negations and
+logical equivalence but does not unfold any other definition.
+
+The following goal can be proved by :tacn:`tauto` whereas :tacn:`auto` would
+fail:
+
+.. example::
+   .. coqtop:: reset all
+
+      Goal forall (x:nat) (P:nat -> Prop), x = 0 \/ P x -> x <> 0 -> P x.
+      intros.
+      tauto.
+
+Moreover, if it has nothing else to do, :tacn:`tauto` performs introductions.
+Therefore, the use of :tacn:`intros` in the previous proof is unnecessary.
+:tacn:`tauto` can for instance for:
+
+.. example::
+
+   .. coqtop:: reset all
+
+      Goal forall (A:Prop) (P:nat -> Prop), A \/ (forall x:nat, ~ A -> P x) -> forall x:nat, ~ A -> P x.
+      tauto.
+
+.. note::
+  In contrast, :tacn:`tauto` cannot solve the following goal
+  :g:`Goal forall (A:Prop) (P:nat -> Prop), A \/ (forall x:nat, ~ A -> P x) ->`
+  :g:`forall x:nat, ~ ~ (A \/ P x).`
+  because :g:`(forall x:nat, ~ A -> P x)` cannot be treated as atomic and
+  an instantiation of `x` is necessary.
+
+.. tacv:: dtauto
+
+  While :tacn:`tauto` recognizes inductively defined connectives isomorphic to
+  the standard connective ``and, prod, or, sum, False, Empty_set, unit, True``,
+  :tacn:`dtauto` recognizes also all inductive types with one constructors and
+  no indices, i.e. record-style connectives.
+
+.. tacn:: intuition @tactic
+   :name: intuition
+
+The tactic :tacn:`intuition` takes advantage of the search-tree built by the
+decision procedure involved in the tactic :tacn:`tauto`. It uses this
+information to generate a set of subgoals equivalent to the original one (but
+simpler than it) and applies the tactic :n:`@tactic` to them :cite:`Mun94`. If
+this tactic fails on some goals then :tacn:`intuition` fails. In fact,
+:tacn:`tauto` is simply :g:`intuition fail`.
+
+For instance, the tactic :g:`intuition auto` applied to the goal
+
+::
+
+    (forall (x:nat), P x)/\B -> (forall (y:nat),P y)/\ P O \/B/\ P O
+
+
 internally replaces it by the equivalent one:
-\begin{verbatim}
-(forall (x:nat), P x), B |- P O
-\end{verbatim}
-and then uses {\tt auto} which completes the proof.
+::
 
-Originally due to C{\'e}sar~Mu{\~n}oz, these tactics ({\tt tauto} and {\tt intuition})
-have been completely re-engineered by David~Delahaye using mainly the tactic
-language (see Chapter~\ref{TacticLanguage}). The code is now much shorter and
-a significant increase in performance has been noticed. The general behavior
-with respect to dependent types, unfolding and introductions has
-slightly changed to get clearer semantics. This may lead to some
-incompatibilities.
+    (forall (x:nat), P x), B |- P O
 
-\begin{Variants}
-\item {\tt intuition}
 
-  Is equivalent to {\tt intuition auto with *}.
+and then uses :tacn:`auto` which completes the proof.
 
-\item {\tt dintuition}
+Originally due to César Muñoz, these tactics (:tacn:`tauto` and
+:tacn:`intuition`) have been completely re-engineered by David Delahaye using
+mainly the tactic language (see :ref:`TODO-9-thetacticlanguage`). The code is
+now much shorter and a significant increase in performance has been noticed.
+The general behavior with respect to dependent types, unfolding and
+introductions has slightly changed to get clearer semantics. This may lead to
+some incompatibilities.
 
-  While {\tt intuition} recognizes inductively defined connectives
-  isomorphic to the standard connective {\tt and}, {\tt prod}, {\tt
-    or}, {\tt sum}, {\tt False}, {\tt Empty\_set}, {\tt unit}, {\tt
-    True}, {\tt dintuition} recognizes also all inductive types with
-  one constructors and no indices, i.e. record-style connectives.
+.. tacv:: intuition
 
-\end{Variants}
+  Is equivalent to :g:`intuition auto with *`.
 
-\optindex{Intuition Negation Unfolding}
+.. tacv:: dintuition
 
-Some aspects of the tactic {\tt intuition} can be
-controlled using options. To avoid that inner negations which do not
-need to be unfolded are unfolded, use:
+  While :tacn:`intuition` recognizes inductively defined connectives
+  isomorphic to the standard connective ``and, prod, or, sum, False,
+  Empty_set, unit, True``, :tacn:`dintuition` recognizes also all inductive
+  types with one constructors and no indices, i.e. record-style connectives.
+
+Some aspects of the tactic :tacn:`intuition` can be controlled using options.
+To avoid that inner negations which do not need to be unfolded are
+unfolded, use:
+
+.. cmd:: Unset Intuition Negation Unfolding
 
-\begin{quote}
-{\tt Unset Intuition Negation Unfolding}
-\end{quote}
 
 To do that all negations of the goal are unfolded even inner ones
 (this is the default), use:
 
-\begin{quote}
-{\tt Set Intuition Negation Unfolding}
-\end{quote}
+.. cmd:: Set Intuition Negation Unfolding
+
+.. tacn:: rtauto
+   :name: rtauto
+
+The :tacn:`rtauto` tactic solves propositional tautologies similarly to what
+:tacn:`tauto` does. The main difference is that the proof term is built using a
+reflection scheme applied to a sequent calculus proof of the goal.  The search
+procedure is also implemented using a different technique.
 
-To avoid that inner occurrence of {\tt iff} which do not need to be
-unfolded are unfolded (this is the default), use:
+Users should be aware that this difference may result in faster proof- search
+but slower proof-checking, and :tacn:`rtauto` might not solve goals that
+:tacn:`tauto` would be able to solve (e.g. goals involving universal
+quantifiers).
 
-% En attente d'un moyen de valoriser les fichiers de demos
-%\SeeAlso file \texttt{contrib/Rocq/DEMOS/Demo\_tauto.v}
 
+.. tacn:: firstorder
+   :name: firstorder
 
-\subsection{\tt rtauto}
-\tacindex{rtauto}
-\label{rtauto}
+The tactic :tacn:`firstorder` is an experimental extension of :tacn:`tauto` to
+first- order reasoning, written by Pierre Corbineau. It is not restricted to
+usual logical connectives but instead may reason about any first-order class
+inductive definition.
 
-The {\tt rtauto} tactic solves propositional tautologies similarly to what {\tt tauto} does. The main difference is that the proof term is built using a reflection scheme applied to a sequent calculus proof of the goal. The search procedure is also implemented using a different technique.
+The default tactic used by :tacn:`firstorder` when no rule applies is :g:`auto
+with \*`, it can be reset locally or globally using the ``Set Firstorder
+Solver`` tactic vernacular command and printed using ``Print Firstorder
+Solver``.
 
-Users should be aware that this difference may result in faster proof-search but  slower proof-checking, and {\tt rtauto} might not solve goals that {\tt tauto} would be able to solve (e.g. goals involving universal quantifiers).
+.. tacv:: firstorder @tactic
 
-\subsection{\tt firstorder}
-\tacindex{firstorder}
-\label{firstorder}
+  Tries to solve the goal with :n:`@tactic` when no logical rule may apply.
 
-The tactic \texttt{firstorder} is an {\it experimental} extension of
-\texttt{tauto} to
-first-order reasoning, written by Pierre Corbineau.
-It is not restricted to usual logical connectives but
-instead may reason about any first-order class inductive definition.
+.. tacv:: firstorder using {+ @qualid}
 
-The default tactic used by \texttt{firstorder} when no rule applies is {\tt
-  auto with *}, it can be reset locally or globally using the {\nobreak
-  {\tt Set Firstorder Solver {\tac}}} \optindex{Firstorder Solver}
-vernacular command and printed using {\nobreak {\tt Print Firstorder
-    Solver}}.
+  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.
 
-\begin{Variants}
- \item {\tt firstorder {\tac}}
-   \tacindex{firstorder {\tac}}
+.. tacv:: firstorder with {+ @ident}
 
-   Tries to solve the goal with {\tac} when no logical rule may apply.
+  Adds lemmas from :tacn:`auto` hint bases :n:`{+ @ident}` to the proof-search
+  environment.
 
- \item {\tt firstorder using {\qualid}$_1$ , \dots\ , {\qualid}$_n$ }
-   \tacindex{firstorder using}
+.. tacv:: firstorder tactic using {+ @qualid} with {+ @ident}
 
-   Adds lemmas {\qualid}$_1$ \dots\ {\qualid}$_n$ to the proof-search
-   environment. If {\qualid}$_i$ refers to an inductive type, it is
-   the collection of its constructors which are added to the
-   proof-search environment.
+  This combines the effects of the different variants of :tacn:`firstorder`.
 
- \item {\tt firstorder with \ident$_1$ \dots\ \ident$_n$ }
-   \tacindex{firstorder with}
+Proof-search is bounded by a depth parameter which can be set by
+typing the ``Set Firstorder Depth n`` vernacular command.
 
-   Adds lemmas from {\tt auto} hint bases \ident$_1$ \dots\ \ident$_n$
-   to the proof-search environment.
+.. tacn:: congruence
+   :name: congruence
 
-\item \texttt{firstorder {\tac} using {\qualid}$_1$ , \dots\ , {\qualid}$_n$ with \ident$_1$ \dots\ \ident$_n$}
+The tactic :tacn:`congruence`, by Pierre Corbineau, implements the standard
+Nelson and Oppen congruence closure algorithm, which is a decision procedure
+for ground equalities with uninterpreted symbols. It also include the
+constructor theory (see :tacn:`injection` and :tacn:`discriminate`). If the goal
+is a non-quantified equality, congruence tries to prove it with non-quantified
+equalities in the context. Otherwise it tries to infer a discriminable equality
+from those in the context. Alternatively, congruence tries to prove that a
+hypothesis is equal to the goal or to the negation of another hypothesis.
 
-  This combines the effects of the different variants of \texttt{firstorder}.
+:tacn:`congruence` is also able to take advantage of hypotheses stating
+quantified equalities, you have to provide a bound for the number of extra
+equalities generated that way. Please note that one of the members of the
+equality must contain all the quantified variables in order for congruence to
+match against it.
 
-\end{Variants}
+.. example::
+   .. coqtop:: reset all
 
-Proof-search is bounded by a depth parameter which can be set by typing the
-{\nobreak \tt Set Firstorder Depth $n$} \optindex{Firstorder Depth}
-vernacular command.
+      Theorem T (A:Type) (f:A -> A) (g: A -> A -> A) a b: a=(f a) -> (g b (f a))=(f (f a)) -> (g a b)=(f (g b a)) -> (g a b)=a.
+      intros.
+      congruence.
+      Qed.
 
+      Theorem inj (A:Type) (f:A -> A * A) (a c d: A) : f = pair a -> Some (f c) = Some (f d) -> c=d.
+      intros.
+      congruence.
+      Qed.
 
-\subsection{\tt congruence}
-\tacindex{congruence}
-\label{congruence}
+.. tacv:: congruence n
 
-The tactic {\tt congruence}, by Pierre Corbineau, implements the standard Nelson and Oppen
-congruence closure algorithm, which is a decision procedure for ground
-equalities with uninterpreted symbols. It also include the constructor theory
-(see \ref{injection} and \ref{discriminate}).
-If the goal is a non-quantified equality, {\tt congruence} tries to
-prove it with non-quantified equalities in the context. Otherwise it
-tries to infer a discriminable equality from those in the context. Alternatively, congruence tries to prove that a hypothesis is equal to the goal or to the negation of another hypothesis.
+  Tries to add at most `n` instances of hypotheses stating quantified equalities
+  to the problem in order to solve it. A bigger value of `n` does not make
+  success slower, only failure. You might consider adding some lemmas as
+  hypotheses using assert in order for :tacn:`congruence` to use them.
 
-{\tt congruence} is also able to take advantage of hypotheses stating quantified equalities, you have to provide a bound for the number of extra equalities generated that way. Please note that one of the members of the equality must contain all the quantified variables in order for {\tt congruence} to match against it.
+.. tacv:: congruence with {+ @term}
 
-\begin{coq_eval}
-Reset Initial.
-Variable A:Set.
-Variables a b:A.
-Variable f:A->A.
-Variable g:A->A->A.
-\end{coq_eval}
+  Adds :n:`{+ @term}` to the pool of terms used by :tacn:`congruence`. This helps
+  in case you have partially applied constructors in your goal.
 
-\begin{coq_example}
-Theorem T:
-  a=(f a) -> (g b (f a))=(f (f a)) -> (g a b)=(f (g b a)) -> (g a b)=a.
-intros.
-congruence.
-\end{coq_example}
+.. exn:: I don’t know how to handle dependent equality
 
-\begin{coq_eval}
-Reset Initial.
-Variable A:Set.
-Variables a c d:A.
-Variable f:A->A*A.
-\end{coq_eval}
+  The decision procedure managed to find a proof of the goal or of a
+  discriminable equality but this proof could not be built in Coq because of
+  dependently-typed functions.
 
-\begin{coq_example}
-Theorem inj : f = pair a -> Some (f c) = Some (f d) -> c=d.
-intros.
-congruence.
-\end{coq_example}
+.. exn:: Goal is solvable by congruence but some arguments are missing. Try congruence with ..., replacing metavariables by arbitrary terms.
 
-\begin{Variants}
- \item {\tt congruence {\sl n}}
+  The decision procedure could solve the goal with the provision that additional
+  arguments are supplied for some partially applied constructors. Any term of an
+  appropriate type will allow the tactic to successfully solve the goal. Those
+  additional arguments can be given to congruence by filling in the holes in the
+  terms given in the error message, using the with variant described above.
 
-  Tries to add at most {\tt \sl n} instances of hypotheses stating quantified equalities to the problem in order to solve it. A bigger value of {\tt \sl n} does not make success slower, only failure. You might consider adding some lemmas as hypotheses using {\tt assert} in order for congruence to use them.
+.. opt:: Congruence Verbose
 
-\item {\tt congruence with \term$_1$ \dots\ \term$_n$}
+  This option makes :tacn:`congruence` print debug information.
 
-  Adds {\tt \term$_1$ \dots\ \term$_n$} to the pool of terms used by
-  {\tt congruence}. This helps in case you have partially applied
-  constructors in your goal.
-\end{Variants}
 
-\begin{ErrMsgs}
-  \item \errindex{I don't know how to handle dependent equality}
+Checking properties of terms
+----------------------------
 
-    The decision procedure managed to find a proof of the goal or of
-    a discriminable equality but this proof could not be built in {\Coq}
-    because of dependently-typed functions.
+Each of the following tactics acts as the identity if the check
+succeeds, and results in an error otherwise.
 
-  \item \errindex{Goal is solvable by congruence but some arguments are missing. Try "congruence with \dots", replacing metavariables by arbitrary terms.}
+.. tacn:: constr_eq @term @term
+   :name: constr_eq
 
-    The decision procedure could solve the goal with the provision
-    that additional arguments are supplied for some partially applied
-    constructors. Any term of an appropriate type will allow the
-    tactic to successfully solve the goal. Those additional arguments
-    can be given to {\tt congruence} by filling in the holes in the
-    terms given in the error message, using the {\tt with} variant
-    described above.
-\end{ErrMsgs}
+   This tactic checks whether its arguments are equal modulo alpha
+   conversion and casts.
 
-\noindent {\bf Remark: } {\tt congruence} can be made to print debug
-information by setting the following option:
+.. exn:: Not equal
 
-\begin{quote}
-\optindex{Congruence Verbose}
-{\tt Set Congruence Verbose}
-\end{quote}
+.. tacn:: unify @term @term
+   :name: unify
 
-\section{Checking properties of terms}
+   This tactic checks whether its arguments are unifiable, potentially
+   instantiating existential variables.
 
-Each of the following tactics acts as the identity if the check succeeds, and results in an error otherwise.
+.. exn:: Not unifiable
 
-\subsection{\tt constr\_eq \term$_1$ \term$_2$}
-\tacindex{constr\_eq}
-\label{constreq}
+.. tacv:: unify @term @term with @ident
 
-This tactic checks whether its arguments are equal modulo alpha conversion and casts.
+   Unification takes the transparency information defined in the hint database
+   :n:`@ident` into account (see :ref:`the hints databases for auto and eauto <the-hints-databases-for-auto-and-eauto>`).
 
-\ErrMsg \errindex{Not equal}
+.. tacn:: is_evar @term
+   :name: is_evar
 
-\subsection{\tt unify \term$_1$ \term$_2$}
-\tacindex{unify}
-\label{unify}
+   This tactic checks whether its argument is a current existential
+   variable. Existential variables are uninstantiated variables generated
+   by :tacn:`eapply` and some other tactics.
 
-This tactic checks whether its arguments are unifiable, potentially
-instantiating existential variables.
+.. exn:: Not an evar
 
-\ErrMsg \errindex{Not unifiable}
+.. tacn:: has_evar @term
+   :name: has_evar
 
-\begin{Variants}
-\item {\tt unify \term$_1$ \term$_2$ with \ident}
+   This tactic checks whether its argument has an existential variable as
+   a subterm. Unlike context patterns combined with ``is_evar``, this tactic
+   scans all subterms, including those under binders.
 
-  Unification takes the transparency information defined in the
-  hint database {\tt \ident} into account (see Section~\ref{HintTransparency}).
-\end{Variants}
+.. exn:: No evars
 
-\subsection{\tt is\_evar \term}
-\tacindex{is\_evar}
-\label{isevar}
+.. tacn:: is_var @term
+   :name: is_var
 
-This tactic checks whether its argument is a current existential
-variable. Existential variables are uninstantiated variables generated
-by {\tt eapply} (see Section~\ref{apply}) and some other tactics.
+   This tactic checks whether its argument is a variable or hypothesis in
+   the current goal context or in the opened sections.
 
-\ErrMsg \errindex{Not an evar}
+.. exn:: Not a variable or hypothesis
 
-\subsection{\tt has\_evar \term}
-\tacindex{has\_evar}
-\label{hasevar}
 
-This tactic checks whether its argument has an existential variable as
-a subterm.  Unlike {\tt context} patterns combined with {\tt is\_evar},
-this tactic scans all subterms, including those under binders.
+.. _equality:
 
-\ErrMsg \errindex{No evars}
+Equality
+--------
 
-\subsection{\tt is\_var \term}
-\tacindex{is\_var}
-\label{isvar}
 
-This tactic checks whether its argument is a variable or hypothesis in the
-current goal context or in the opened sections.
+.. tacn:: f_equal
+   :name: f_equal
 
-\ErrMsg \errindex{Not a variable or hypothesis}
+This tactic applies to a goal of the form :g:`f a`:sub:`1` :g:`... a`:sub:`n`
+:g:`= f′a′`:sub:`1` :g:`... a′`:sub:`n`.  Using :tacn:`f_equal` on such a goal
+leads to subgoals :g:`f=f′` and :g:`a`:sub:`1` = :g:`a′`:sub:`1` and so on up
+to :g:`a`:sub:`n` :g:`= a′`:sub:`n`. Amongst these subgoals, the simple ones
+(e.g. provable by :tacn:`reflexivity` or :tacn:`congruence`) are automatically
+solved by :tacn:`f_equal`.
 
-\section{Equality}
 
-\subsection{\tt f\_equal}
-\label{f-equal}
-\tacindex{f\_equal}
+.. tacn:: reflexivity
+   :name: reflexivity
 
-This tactic applies to a goal of the form $f\ a_1\ \ldots\ a_n = f'\
-a'_1\ \ldots\ a'_n$. Using {\tt f\_equal} on such a goal leads to
-subgoals $f=f'$ and $a_1=a'_1$ and so on up to $a_n=a'_n$. Amongst
-these subgoals, the simple ones (e.g. provable by
-reflexivity or congruence) are automatically solved by {\tt f\_equal}.
+This tactic applies to a goal that has the form :g:`t=u`. It checks that `t`
+and `u` are convertible and then solves the goal. It is equivalent to apply
+:tacn:`refl_equal`.
 
-\subsection{\tt reflexivity}
-\label{reflexivity}
-\tacindex{reflexivity}
+.. exn:: The conclusion is not a substitutive equation
 
-This tactic applies to a goal that has the form {\tt t=u}. It checks
-that {\tt t} and {\tt u} are convertible and then solves the goal.
-It is equivalent to {\tt apply refl\_equal}.
+.. exn:: Unable to unify ... with ...
 
-\begin{ErrMsgs}
-\item \errindex{The conclusion is not a substitutive equation}
-\item \errindex{Unable to unify \dots\ with \dots}
-\end{ErrMsgs}
 
-\subsection{\tt symmetry}
-\tacindex{symmetry}
+.. tacn:: symmetry
+   :name: symmetry
 
-This tactic applies to a goal that has the form {\tt t=u} and changes it
-into {\tt u=t}.
+This tactic applies to a goal that has the form :g:`t=u` and changes it into
+:g:`u=t`.
 
-\begin{Variants}
-\item {\tt symmetry in \ident} \tacindex{symmetry in}
 
-If the statement of the hypothesis {\ident} has the form {\tt t=u},
-the tactic changes it to {\tt u=t}.
-\end{Variants}
+.. tacv:: symmetry in @ident
 
-\subsection{\tt transitivity \term}
-\tacindex{transitivity}
+  If the statement of the hypothesis ident has the form :g:`t=u`, the tactic
+  changes it to :g:`u=t`.
 
-This tactic applies to a goal that has the form {\tt t=u}
-and transforms it into the two subgoals
-{\tt t={\term}} and {\tt {\term}=u}.
 
-\section{Equality and inductive sets}
+
+.. tacn:: transitivity @term
+   :name: transitivity
+
+This tactic applies to a goal that has the form :g:`t=u` and transforms it
+into the two subgoals :n:`t=@term` and :n:`@term=u`.
+
+
+Equality and inductive sets
+---------------------------
 
 We describe in this section some special purpose tactics dealing with
-equality and inductive sets or types. These tactics use the equality
-{\tt eq:forall (A:Type), A->A->Prop}, simply written with the
-infix symbol {\tt =}.
-
-\subsection{\tt decide equality}
-\label{decideequality}
-\tacindex{decide equality}
-
-This tactic solves a goal of the form
-{\tt forall $x$ $y$:$R$, \{$x$=$y$\}+\{\verb|~|$x$=$y$\}}, where $R$
-is an inductive type such that its constructors do not take proofs or
-functions as arguments, nor objects in dependent types.
-It solves goals of the form {\tt \{$x$=$y$\}+\{\verb|~|$x$=$y$\}} as well.
-
-\subsection{\tt compare \term$_1$ \term$_2$}
-\tacindex{compare}
-
-This tactic compares two given objects \term$_1$ and \term$_2$
-of an inductive datatype. If $G$ is the current goal, it leaves the sub-goals
-\term$_1${\tt =}\term$_2$ {\tt ->} $G$ and \verb|~|\term$_1${\tt =}\term$_2$
-{\tt ->} $G$. The type
-of \term$_1$ and \term$_2$ must satisfy the same restrictions as in the tactic
-\texttt{decide equality}.
-
-\subsection{\tt simplify\_eq \term}
-\tacindex{simplify\_eq}
-\tacindex{esimplify\_eq}
-\label{simplify-eq}
-
-Let {\term} be the proof of a statement of conclusion {\tt
-  {\term$_1$}={\term$_2$}}. If {\term$_1$} and
-{\term$_2$} are structurally different (in the sense described for the
-tactic {\tt discriminate}), then the tactic {\tt simplify\_eq} behaves as {\tt
-  discriminate {\term}}, otherwise it behaves as {\tt injection
-  {\term}}.
-
-\Rem If some quantified hypothesis of the goal is named {\ident}, then
-{\tt simplify\_eq {\ident}} first introduces the hypothesis in the local
-context using \texttt{intros until \ident}.
-
-\begin{Variants}
-\item \texttt{simplify\_eq} \num
-
-  This does the same thing as \texttt{intros until \num} then
-\texttt{simplify\_eq \ident} where {\ident} is the identifier for the last
-introduced hypothesis.
+equality and inductive sets or types. These tactics use the
+equality :g:`eq:forall (A:Type), A->A->Prop`, simply written with the infix
+symbol :g:`=`.
+
+.. tacn:: decide equality
+   :name: decide equality
+
+   This tactic solves a goal of the form :g:`forall x y:R, {x=y}+{ ~x=y}`,
+   where :g:`R` is an inductive type such that its constructors do not take
+   proofs or functions as arguments, nor objects in dependent types. It
+   solves goals of the form :g:`{x=y}+{ ~x=y}` as well.
+
+.. tacn:: compare @term @term
+   :name: compare
+
+   This tactic compares two given objects :n:`@term` and :n:`@term` of an
+   inductive datatype. If :g:`G` is the current goal, it leaves the sub-
+   goals :n:`@term =@term -> G` and :n:`~ @term = @term -> G`. The type of
+   :n:`@term` and :n:`@term` must satisfy the same restrictions as in the
+   tactic ``decide equality``.
+
+.. tacn:: simplify_eq @term
+   :name: simplify_eq
+
+   Let :n:`@term` be the proof of a statement of conclusion :n:`@term = @term`.
+   If :n:`@term` and :n:`@term` are structurally different (in the sense
+   described for the tactic :tacn:`discriminate`), then the tactic
+   ``simplify_eq`` behaves as :n:`discriminate @term`, otherwise it behaves as
+   :n:`injection @term`.
+
+.. note::
+   If some quantified hypothesis of the goal is named :n:`@ident`,
+   then :n:`simplify_eq @ident` first introduces the hypothesis in the local
+   context using :n:`intros until @ident`.
+
+.. tacv:: simplify_eq @num
+
+   This does the same thing as :n:`intros until @num` then
+   :n:`simplify_eq @ident` where :n:`@ident` is the identifier for the last
+   introduced hypothesis.
+
+.. tacv:: simplify_eq @term with @bindings_list
+
+   This does the same as :n:`simplify_eq @term` but using the given bindings to
+   instantiate parameters or hypotheses of :n:`@term`.
+
+.. tacv:: esimplify_eq @num
+.. tacv:: esimplify_eq @term {? with @bindings_list}
+
+   This works the same as ``simplify_eq`` but if the type of :n:`@term`, or the
+   type of the hypothesis referred to by :n:`@num`, has uninstantiated
+   parameters, these parameters are left as existential variables.
+
+.. tacv:: simplify_eq
+
+   If the current goal has form :g:`t1 <> t2`, it behaves as
+   :n:`intro @ident; simplify_eq @ident`.
+
+.. tacn:: dependent rewrite -> @ident
+   :name: dependent rewrite ->
+
+   This tactic applies to any goal. If :n:`@ident` has type
+   :g:`(existT B a b)=(existT B a' b')` in the local context (i.e. each
+   :n:`@term` of the equality has a sigma type :g:`{ a:A & (B a)}`) this tactic
+   rewrites :g:`a` into :g:`a'` and :g:`b` into :g:`b'` in the current goal.
+   This tactic works even if :g:`B` is also a sigma type. This kind of
+   equalities between dependent pairs may be derived by the
+   :tacn:`injection` and :tacn:`inversion` tactics.
 
-\item \texttt{simplify\_eq} \term{} {\tt with} {\bindinglist}
-
-  This does the same as \texttt{simplify\_eq {\term}} but using
-  the given bindings to instantiate parameters or hypotheses of {\term}.
-
-\item \texttt{esimplify\_eq} \num\\
-      \texttt{esimplify\_eq} \term{} \zeroone{{\tt with} {\bindinglist}}
+.. tacv:: dependent rewrite <- @ident
 
-  This works the same as {\tt simplify\_eq} but if the type of {\term},
-  or the type of the hypothesis referred to by {\num}, has uninstantiated
-  parameters, these parameters are left as existential variables.
+   Analogous to :tacn:`dependent rewrite ->` but uses the equality from right to
+   left.
 
-\item{\tt simplify\_eq}
+Inversion
+---------
 
-If the current goal has form $t_1\verb=<>=t_2$, it behaves as
-\texttt{intro {\ident}; simplify\_eq {\ident}}.
-\end{Variants}
+.. tacn:: functional inversion @ident
+   :name: functional inversion
 
-\subsection{\tt dependent rewrite -> \ident}
-\tacindex{dependent rewrite ->}
-\label{dependent-rewrite}
+:tacn:`functional inversion` is a tactic that performs inversion on hypothesis
+:n:`@ident` of the form :n:`@qualid {+ @term} = @term` or :n:`@term = @qualid
+{+ @term}` where :n:`@qualid` must have been defined using Function (see
+:ref:`TODO-2.3-advancedrecursivefunctions`). Note that this tactic is only
+available after a ``Require Import FunInd``.
 
-This tactic applies to any goal.  If \ident\ has type
-\verb+(existT B a b)=(existT B a' b')+
-in the local context (i.e. each term of the
-equality has a sigma type $\{ a:A~ \&~(B~a)\}$) this tactic rewrites
-\verb+a+ into \verb+a'+ and \verb+b+ into \verb+b'+ in the current
-goal. This tactic works even if $B$ is also a sigma type.  This kind
-of equalities between dependent pairs may be derived by the injection
-and inversion tactics.
-
-\begin{Variants}
-\item{\tt dependent rewrite <- {\ident}}
-\tacindex{dependent rewrite <-}
-
-Analogous to {\tt dependent rewrite ->} but uses the equality from
-right to left.
-\end{Variants}
-
-\section{Inversion
-\label{inversion}}
-
-\subsection{\tt functional inversion \ident}
-\tacindex{functional inversion}
-\label{sec:functional-inversion}
-
-\texttt{functional inversion} is a tactic
-that performs inversion on hypothesis {\ident} of the form
-\texttt{\qualid\ \term$_1$\dots\term$_n$\ = \term} or \texttt{\term\ =
-  \qualid\ \term$_1$\dots\term$_n$} where \qualid\ must have been
-defined using \texttt{Function} (see Section~\ref{Function}).
-Note that this tactic is only available after a {\tt Require Import FunInd}.
-
-\begin{ErrMsgs}
-\item \errindex{Hypothesis {\ident} must contain at least one Function}
-
-\item \errindex{Cannot find inversion information for hypothesis \ident}
-
-  This error may be raised when  some inversion lemma failed to be
-  generated by Function.
-\end{ErrMsgs}
-
-\begin{Variants}
-\item {\tt functional inversion \num}
-
-  This does the same thing as \texttt{intros until \num} then
-  \texttt{functional inversion \ident} where {\ident} is the
-  identifier for the last introduced hypothesis.
-\item {\tt functional inversion \ident\ \qualid}\\
-  {\tt functional inversion \num\ \qualid}
-
-  If the hypothesis {\ident} (or {\num}) has a type of the form
-  \texttt{\qualid$_1$\ \term$_1$\dots\term$_n$\ =\ \qualid$_2$\
-    \term$_{n+1}$\dots\term$_{n+m}$} where \qualid$_1$ and \qualid$_2$
-  are valid candidates to functional inversion, this variant allows
-  choosing which {\qualid} is inverted.
-\end{Variants}
-
-
-
-\subsection{\tt quote \ident}
-\tacindex{quote}
-\index{2-level approach}
-
-This kind of inversion has nothing to do with the tactic
-\texttt{inversion} above. This tactic does \texttt{change (\ident\
-  t)}, where \texttt{t} is a term built in order to ensure the
-convertibility. In other words, it does inversion of the function
-\ident. This function must be a fixpoint on a simple recursive
-datatype: see~\ref{quote-examples} for the full details.
-
-\begin{ErrMsgs}
-\item \errindex{quote: not a simple fixpoint}
-
-  Happens when \texttt{quote} is not able to perform inversion properly.
-\end{ErrMsgs}
-
-\begin{Variants}
-\item \texttt{quote {\ident} [ \ident$_1$ \dots \ident$_n$ ]}
-
-  All terms that are built only with \ident$_1$ \dots \ident$_n$ will be
-  considered by \texttt{quote} as constants rather than variables.
-\end{Variants}
-
-% En attente d'un moyen de valoriser les fichiers de demos
-% \SeeAlso file \texttt{theories/DEMOS/DemoQuote.v} in the distribution
-
-\section{Classical tactics}
-\label{ClassicalTactics}
-
-In order to ease the proving process, when the {\tt Classical} module is loaded. A few more tactics are available. Make sure to load the module using the \texttt{Require Import} command.
-
-\subsection{{\tt classical\_left} and \tt classical\_right}
-\tacindex{classical\_left}
-\tacindex{classical\_right}
-
-The tactics \texttt{classical\_left} and \texttt{classical\_right} are the analog of the \texttt{left} and \texttt{right} but using classical logic. They can only be used for disjunctions.
-Use  \texttt{classical\_left} to prove the left part of the disjunction with the assumption that the negation of right part holds.
-Use \texttt{classical\_right} to prove the right part of the disjunction with the assumption that the negation of left part holds.
-
-\section{Automatizing
-\label{Automatizing}}
-
-% EXISTE ENCORE ?
-%
-% \subsection{\tt Prolog [ \term$_1$ \dots\ \term$_n$ ] \num}
-% \tacindex{Prolog}\label{Prolog}
-% This tactic, implemented by Chet Murthy, is based upon the concept of
-% existential variables of Gilles Dowek, stating that resolution is a
-% kind of unification. It tries to solve the current goal using the {\tt
-%   Assumption} tactic, the {\tt intro} tactic, and applying hypotheses
-% of the local context and terms of the given list {\tt [ \term$_1$
-%   \dots\ \term$_n$\ ]}.  It is more powerful than {\tt auto} since it
-% may apply to any theorem, even those of the form {\tt (x:A)(P x) -> Q}
-% where {\tt x} does not appear free in {\tt Q}.  The maximal search
-% depth is {\tt \num}.
-
-% \begin{ErrMsgs}
-% \item \errindex{Prolog failed}\\
-%   The Prolog tactic was not able to prove the subgoal.
-% \end{ErrMsgs}
-
-
-%% \subsection{{\tt jp} {\em (Jprover)}
-%% \tacindex{jp}
-%% \label{jprover}}
-
-%% The tactic \texttt{jp}, due to Huang Guan-Shieng, is an experimental
-%% port of the {\em Jprover}\cite{SLKN01} semi-decision procedure for
-%% first-order intuitionistic logic implemented in {\em
-%%   NuPRL}\cite{Kre02}.
-
-%% The tactic \texttt{jp}, due to Huang Guan-Shieng, is an {\it
-%%   experimental} port of the {\em Jprover}\cite{SLKN01} semi-decision
-%% procedure for first-order intuitionistic logic implemented in {\em
-%%   NuPRL}\cite{Kre02}.
-
-%% Search may optionally be bounded by a multiplicity parameter
-%% indicating how many (at most) copies of a formula may be used in
-%% the proof process, its absence may lead to non-termination of the tactic.
-
-%% %\begin{coq_eval}
-%% %Variable S:Set.
-%% %Variables P Q:S->Prop.
-%% %Variable f:S->S.
-%% %\end{coq_eval}
-
-%% %\begin{coq_example*}
-%% %Lemma example: (exists x |P x\/Q x)->(exists x |P x)\/(exists x |Q x).
-%% %jp.
-%% %Qed.
-
-%% %Lemma example2: (forall x ,P x->P (f x))->forall x,P x->P (f(f x)).
-%% %jp.
-%% %Qed.
-%% %\end{coq_example*}
-
-%% \begin{Variants}
-%%  \item {\tt jp $n$}\\
-%%    \tacindex{jp $n$}
-%%    Tries the {\em Jprover} procedure with multiplicities up to $n$,
-%%    starting from 1.
-%%  \item {\tt jp}\\
-%%    Tries the {\em Jprover} procedure without multiplicity bound,
-%%    possibly running forever.
-%% \end{Variants}
-
-%% \begin{ErrMsgs}
-%%  \item \errindex{multiplicity limit reached}\\
-%%    The procedure tried all multiplicities below the limit and
-%%    failed. Goal might be solved by increasing the multiplicity limit.
-%%  \item \errindex{formula is not provable}\\
-%%    The procedure determined that goal was not provable in
-%%    intuitionistic first-order logic, no matter how big the
-%%    multiplicity is.
-%% \end{ErrMsgs}
-
-
-% \subsection[\tt Linear]{\tt Linear\tacindex{Linear}\label{Linear}}
-% The tactic \texttt{Linear}, due to Jean-Christophe Filli{\^a}atre
-% \cite{Fil94}, implements a decision procedure for {\em Direct
-%   Predicate Calculus}, that is first-order Gentzen's Sequent Calculus
-% without contraction rules \cite{KeWe84,BeKe92}.  Intuitively, a
-% first-order goal is provable in Direct Predicate Calculus if it can be
-% proved using each hypothesis at most once.
-
-% Unlike the previous tactics, the \texttt{Linear} tactic does not belong
-% to the initial state of the system, and it must be loaded explicitly
-% with the command
-
-% \begin{coq_example*}
-% Require Linear.
-% \end{coq_example*}
-
-% For instance, assuming that \texttt{even} and \texttt{odd} are two
-% predicates on natural numbers, and \texttt{a} of type \texttt{nat}, the
-% tactic \texttt{Linear} solves the following goal
-
-% \begin{coq_eval}
-% Variables even,odd : nat -> Prop.
-% Variable a:nat.
-% \end{coq_eval}
-
-% \begin{coq_example*}
-% Lemma example : (even a)
-%               -> ((x:nat)((even x)->(odd (S x))))
-%               -> (EX y | (odd y)).
-% \end{coq_example*}
-
-% You can find examples of the use of \texttt{Linear} in
-% \texttt{theories/DEMOS/DemoLinear.v}.
-% \begin{coq_eval}
-% Abort.
-% \end{coq_eval}
-
-% \begin{Variants}
-% \item {\tt Linear with \ident$_1$ \dots\ \ident$_n$}\\
-%   \tacindex{Linear with}
-%   Is equivalent to apply first {\tt generalize \ident$_1$ \dots
-%     \ident$_n$} (see Section~\ref{generalize}) then the \texttt{Linear}
-%   tactic.  So one can use axioms, lemmas or hypotheses of the local
-%   context with \texttt{Linear} in this way.
-% \end{Variants}
-
-% \begin{ErrMsgs}
-% \item \errindex{Not provable in Direct Predicate Calculus}
-% \item \errindex{Found $n$ classical proof(s) but no intuitionistic one}\\
-%   The decision procedure looks actually for classical proofs of the
-%   goals, and then checks that they are intuitionistic.  In that case,
-%   classical proofs have been found, which do not correspond to
-%   intuitionistic ones.
-% \end{ErrMsgs}
-
-
-\subsection{\tt btauto}
-\tacindex{btauto}
-\label{btauto}
-
-The tactic \texttt{btauto} implements a reflexive solver for boolean tautologies. It
-solves goals of the form {\tt t = u} where {\tt t} and {\tt u} are constructed
-over the following grammar:
-
-$$\mathtt{t} ::= x \mid \mathtt{true} \mid \mathtt{false}\mid \mathtt{orb\ t_1\ t_2}
-\mid \mathtt{andb\ t_1\ t_2} \mid\mathtt{xorb\ t_1\ t_2} \mid\mathtt{negb\ t}
-\mid\mathtt{if\ t_1\ then\ t_2\ else\ t_3}
-$$
-
-Whenever the formula supplied is not a tautology, it also provides a counter-example.
-
-Internally, it uses a system very similar to the one of the {\tt ring} tactic.
-
-\subsection{\tt omega}
-\tacindex{omega}
-\label{omega}
-
-The tactic \texttt{omega}, due to Pierre Cr{\'e}gut,
-is an automatic decision procedure for Presburger
-arithmetic. It solves quantifier-free
-formulas built with \verb|~|, \verb|\/|, \verb|/\|,
-\verb|->| on top of equalities, inequalities and disequalities on
-both the type \texttt{nat} of natural numbers and \texttt{Z} of binary
-integers. This tactic must be loaded by the command \texttt{Require Import
-  Omega}. See the additional documentation about \texttt{omega}
-(see Chapter~\ref{OmegaChapter}).
-
-\subsection{{\tt ring} and \tt ring\_simplify \term$_1$ \mbox{\dots} \term$_n$}
-\tacindex{ring}
-\tacindex{ring\_simplify}
-\comindex{Add Ring}
-\comindex{Print Rings}
-
-The {\tt ring} tactic solves equations upon polynomial expressions of
-a ring (or semi-ring) structure. It proceeds by normalizing both hand
-sides of the equation (w.r.t. associativity, commutativity and
+
+.. exn:: Hypothesis @ident must contain at least one Function
+.. exn:: Cannot find inversion information for hypothesis @ident
+
+  This error may be raised when some inversion lemma failed to be generated by
+  Function.
+
+
+.. tacv:: functional inversion @num
+
+  This does the same thing as intros until num thenfunctional inversion ident
+  where ident is the identifier for the last introduced hypothesis.
+
+.. tacv:: functional inversion ident qualid
+.. tacv:: functional inversion num qualid
+
+  If the hypothesis :n:`@ident` (or :n:`@num`) has a type of the form
+  :n:`@qualid`:sub:`1` :n:`@term`:sub:`1` ... :n:`@term`:sub:`n` :n:`=
+  @qualid`:sub:`2` :n:`@term`:sub:`n+1` ... :n:`@term`:sub:`n+m` where
+  :n:`@qualid`:sub:`1` and :n:`@qualid`:sub:`2` are valid candidates to
+  functional inversion, this variant allows choosing which :n:`@qualid` is
+  inverted.
+
+.. tacn:: quote @ident
+   :name: quote
+
+This kind of inversion has nothing to do with the tactic :tacn:`inversion`
+above. This tactic does :g:`change (@ident t)`, where `t` is a term built in
+order to ensure the convertibility. In other words, it does inversion of the
+function :n:`@ident`. This function must be a fixpoint on a simple recursive
+datatype: see :ref:`TODO-10.3-quote` for the full details.
+
+
+.. exn:: quote: not a simple fixpoint
+
+  Happens when quote is not able to perform inversion properly.
+
+
+.. tacv::  quote ident {* @ident}
+
+  All terms that are built only with :n:`{* @ident}` will be considered by quote
+  as constants rather than variables.
+
+Classical tactics
+-----------------
+
+In order to ease the proving process, when the Classical module is
+loaded. A few more tactics are available. Make sure to load the module
+using the ``Require Import`` command.
+
+.. tacn:: classical_left
+   :name: classical_left
+.. tacv:: classical_right
+   :name: classical_right
+
+   The tactics ``classical_left`` and ``classical_right`` are the analog of the
+   left and right but using classical logic. They can only be used for
+   disjunctions. Use ``classical_left`` to prove the left part of the
+   disjunction with the assumption that the negation of right part holds.
+   Use ``classical_right`` to prove the right part of the disjunction with
+   the assumption that the negation of left part holds.
+
+Automatizing
+------------
+
+
+.. tacn:: btauto
+   :name: btauto
+
+The tactic :tacn:`btauto` implements a reflexive solver for boolean
+tautologies. It solves goals of the form :g:`t = u` where `t` and `u` are
+constructed over the following grammar:
+
+.. _btauto_grammar:
+
+  .. productionlist:: `sentence`
+     t : x
+       :∣ true
+       :∣ false
+       :∣ orb t1 t2
+       :∣ andb t1 t2
+       :∣ xorb t1 t2
+       :∣ negb t
+       :∣ if t1 then t2 else t3
+
+  Whenever the formula supplied is not a tautology, it also provides a
+  counter-example.
+
+  Internally, it uses a system very similar to the one of the ring
+  tactic.
+
+
+.. tacn:: omega
+   :name: omega
+
+The tactic :tacn:`omega`, due to Pierre Crégut, is an automatic decision
+procedure for Presburger arithmetic. It solves quantifier-free
+formulas built with `~`, `\/`, `/\`, `->` on top of equalities,
+inequalities and disequalities on both the type :g:`nat` of natural numbers
+and :g:`Z` of binary integers. This tactic must be loaded by the command
+``Require Import Omega``. See the additional documentation about omega
+(see Chapter :ref:`TODO-21-omega`).
+
+
+.. tacn:: ring
+   :name: ring
+.. tacn:: ring_simplify {+ @term}
+   :name: ring_simplify
+
+The :n:`ring` tactic solves equations upon polynomial expressions of a ring
+(or semi-ring) structure. It proceeds by normalizing both hand sides
+of the equation (w.r.t. associativity, commutativity and
 distributivity, constant propagation) and comparing syntactically the
 results.
 
-{\tt ring\_simplify} applies the normalization procedure described
-above to the terms given. The tactic then replaces all occurrences of
-the terms given in the conclusion of the goal by their normal
-forms. If no term is given, then the conclusion should be an equation
-and both hand sides are normalized.
-
-See Chapter~\ref{ring} for more information on the tactic and how to
-declare new ring structures.  All declared field structures can be
-printed with the {\tt Print Rings} command.
-
-\subsection{{\tt field}, {\tt field\_simplify \term$_1$ \mbox{\dots}
-  \term$_n$}, and \tt field\_simplify\_eq}
-\tacindex{field}
-\tacindex{field\_simplify}
-\tacindex{field\_simplify\_eq}
-\comindex{Add Field}
-\comindex{Print Fields}
-
-The {\tt field} tactic is built on the same ideas as {\tt ring}: this
-is a reflexive tactic that solves or simplifies equations in a field
+:n:`ring_simplify` applies the normalization procedure described above to
+the terms given. The tactic then replaces all occurrences of the terms
+given in the conclusion of the goal by their normal forms. If no term
+is given, then the conclusion should be an equation and both hand
+sides are normalized.
+
+See :ref:`TODO-Chapter-25-Theringandfieldtacticfamilies` for more information on
+the tactic and how to declare new ring structures. All declared field structures
+can be printed with the ``Print Rings`` command.
+
+.. tacn:: field
+   :name: field
+.. tacn:: field_simplify {+ @term}
+   :name: field_simplify
+.. tacn:: field_simplify_eq
+   :name: field_simplify_eq
+
+The field tactic is built on the same ideas as ring: this is a
+reflexive tactic that solves or simplifies equations in a field
 structure. The main idea is to reduce a field expression (which is an
 extension of ring expressions with the inverse and division
 operations) to a fraction made of two polynomial expressions.
 
-Tactic {\tt field} is used to solve subgoals, whereas {\tt
-  field\_simplify \term$_1$\dots\term$_n$} replaces the provided terms
-by their reduced fraction. {\tt field\_simplify\_eq} applies when the
-conclusion is an equation: it simplifies both hand sides and multiplies
-so as to cancel denominators. So it produces an equation without
-division nor inverse.
+Tactic :n:`field` is used to solve subgoals, whereas :n:`field_simplify {+ @term}`
+replaces the provided terms by their reduced fraction.
+:n:`field_simplify_eq` applies when the conclusion is an equation: it
+simplifies both hand sides and multiplies so as to cancel
+denominators. So it produces an equation without division nor inverse.
 
 All of these 3 tactics may generate a subgoal in order to prove that
 denominators are different from zero.
 
-See Chapter~\ref{ring} for more information on the tactic and how to
-declare new field structures.  All declared field structures can be
-printed with the {\tt Print Fields} command.
-
-\Example
-\begin{coq_example*}
-Require Import Reals.
-Goal forall x y:R,
-    (x * y > 0)%R ->
-    (x * (1 / x + x / (x + y)))%R =
-    ((- 1 / y) * y * (- x * (x / (x + y)) - 1))%R.
-\end{coq_example*}
-
-\begin{coq_example}
-intros; field.
-\end{coq_example}
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-
-\SeeAlso file {\tt plugins/setoid\_ring/RealField.v} for an example of instantiation,\\
-\phantom{\SeeAlso}theory {\tt theories/Reals} for many examples of use of {\tt
-field}.
-
-\subsection{\tt fourier}
-\tacindex{fourier}
-
-This tactic written by Lo{\"\i}c Pottier solves linear inequalities on
-real numbers using Fourier's method~\cite{Fourier}. This tactic must
-be loaded by {\tt Require Import Fourier}.
-
-\Example
-\begin{coq_example*}
-Require Import Reals.
-Require Import Fourier.
-Goal forall x y:R, (x < y)%R -> (y + 1 >= x - 1)%R.
-\end{coq_example*}
-
-\begin{coq_example}
-intros; fourier.
-\end{coq_example}
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-
-\section{Non-logical tactics}
-
-\subsection[\tt cycle \num]{\tt cycle \num\tacindex{cycle}}
-
-This tactic puts the {\num} first goals at the end of the list of
-goals. If {\num} is negative, it will put the last $\left|\num\right|$ goals at
-the beginning of the list.
-
-\Example
-\begin{coq_example*}
-Parameter P : nat -> Prop.
-Goal P 1 /\ P 2 /\ P 3 /\ P 4 /\ P 5.
-\end{coq_example*}
-\begin{coq_example}
-repeat split.
-all: cycle 2.
-all: cycle -3.
-\end{coq_example}
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-
-\subsection[\tt swap \num$_1$ \num$_2$]{\tt swap \num$_1$ \num$_2$\tacindex{swap}}
-
-This tactic switches the position of the goals of indices $\num_1$ and $\num_2$. If either $\num_1$ or $\num_2$ is negative then goals are counted from the end of the focused goal list. Goals are indexed from $1$, there is no goal with position $0$.
-
-\Example
-\begin{coq_example*}
-Parameter P : nat -> Prop.
-Goal P 1 /\ P 2 /\ P 3 /\ P 4 /\ P 5.
-\end{coq_example*}
-\begin{coq_example}
-repeat split.
-all: swap 1 3.
-all: swap 1 -1.
-\end{coq_example}
-
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
-
-\subsection[\tt revgoals]{\tt revgoals\tacindex{revgoals}}
+See :ref:`TODO-Chapter-25-Theringandfieldtacticfamilies` for more information on the tactic and how to
+declare new field structures. All declared field structures can be
+printed with the Print Fields command.
 
-This tactics reverses the list of the focused goals.
+.. example::
+   .. coqtop:: reset all
+
+      Require Import Reals.
+      Goal forall x y:R,
+      (x * y > 0)%R ->
+      (x * (1 / x + x / (x + y)))%R =
+      ((- 1 / y) * y * (- x * (x / (x + y)) - 1))%R.
+
+      intros; field.
+
+See also: file plugins/setoid_ring/RealField.v for an example of instantiation,
+theory theories/Reals for many examples of use of field.
 
-\Example
-\begin{coq_example*}
-Parameter P : nat -> Prop.
-Goal P 1 /\ P 2 /\ P 3 /\ P 4 /\ P 5.
-\end{coq_example*}
-\begin{coq_example}
-repeat split.
-all: revgoals.
-\end{coq_example}
+.. tacn:: fourier
+   :name: fourier
 
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
+This tactic written by Loïc Pottier solves linear inequalities on real
+numbers using Fourier’s method :cite:`Fourier`. This tactic must be loaded by
+``Require Import Fourier``.
 
+.. example::
+   .. coqtop:: reset all
 
+      Require Import Reals.
+      Require Import Fourier.
+      Goal forall x y:R, (x < y)%R -> (y + 1 >= x - 1)%R.
+      intros; fourier.
 
-\subsection[\tt shelve]{\tt shelve\tacindex{shelve}\label{shelve}}
+Non-logical tactics
+------------------------
 
-This tactic moves all goals under focus to a shelf. While on the shelf, goals
-will not be focused on. They can be solved by unification, or they can be called
-back into focus with the command {\tt Unshelve} (Section~\ref{unshelve}).
 
-\begin{Variants}
-  \item \texttt{shelve\_unifiable}\tacindex{shelve\_unifiable}
+.. tacn:: cycle @num
+   :name: cycle
 
-    Shelves only the goals under focus that are mentioned in other goals.
-    Goals that appear in the type of other goals can be solved by unification.
+   This tactic puts the :n:`@num` first goals at the end of the list of goals.
+   If :n:`@num` is negative, it will put the last :math:`|num|` goals at the
+   beginning of the list.
 
-\Example
-\begin{coq_example}
-Goal exists n, n=0.
-refine (ex_intro _ _ _).
-all:shelve_unifiable.
-reflexivity.
-\end{coq_example}
+.. example::
 
-\begin{coq_eval}
-Reset Initial.
-\end{coq_eval}
+   .. coqtop:: all reset
 
-\end{Variants}
+      Parameter P : nat -> Prop.
+      Goal P 1 /\ P 2 /\ P 3 /\ P 4 /\ P 5.
+      repeat split.
+      all: cycle 2.
+      all: cycle -3.
 
-\subsection[\tt Unshelve]{\tt Unshelve\comindex{Unshelve}\label{unshelve}}
+.. tacn:: swap @num @num
+   :name: swap
+
+   This tactic switches the position of the goals of indices :n:`@num` and
+   :n:`@num`. If either :n:`@num` or :n:`@num` is negative then goals are
+   counted from the end of the focused goal list. Goals are indexed from 1,
+   there is no goal with position 0.
+
+.. example::
+
+   .. coqtop:: reset all
+
+      Parameter P : nat -> Prop.
+      Goal P 1 /\ P 2 /\ P 3 /\ P 4 /\ P 5.
+      repeat split.
+      all: swap 1 3.
+      all: swap 1 -1.
+
+.. tacn:: revgoals
+   :name: revgoals
+
+This tactics reverses the list of the focused goals.
 
-This command moves all the goals on the shelf (see Section~\ref{shelve}) from the
-shelf into focus, by appending them to the end of the current list of focused goals.
+.. example::
 
-\subsection[\tt give\_up]{\tt give\_up\tacindex{give\_up}}
+   .. coqtop:: all reset
 
-This tactic removes the focused goals from the proof. They are not solved, and cannot
-be solved later in the proof. As the goals are not solved, the proof cannot be closed.
+      Parameter P : nat -> Prop.
+      Goal P 1 /\ P 2 /\ P 3 /\ P 4 /\ P 5.
+      repeat split.
+      all: revgoals.
 
-The {\tt give\_up} tactic can be used while editing a proof, to choose to write the
-proof script in a non-sequential order.
+.. tacn:: shelve
+   :name: shelve
 
-\section{Simple tactic macros}
-\index{Tactic macros}
-\label{TacticDefinition}
+   This tactic moves all goals under focus to a shelf. While on the
+   shelf, goals will not be focused on. They can be solved by
+   unification, or they can be called back into focus with the command
+   :tacn:`Unshelve`.
+
+.. tacv:: shelve_unifiable
+
+   Shelves only the goals under focus that are mentioned in other goals.
+   Goals that appear in the type of other goals can be solved by unification.
+
+.. example::
+
+   .. coqtop:: all reset
+
+      Goal exists n, n=0.
+      refine (ex_intro _ _ _).
+      all:shelve_unifiable.
+      reflexivity.
+
+.. tacn:: Unshelve
+   :name: Unshelve
+
+   This command moves all the goals on the shelf (see :tacn:`shelve`)
+   from the shelf into focus, by appending them to the end of the current
+   list of focused goals.
+
+.. tacn:: give_up
+   :name: give_up
+
+   This tactic removes the focused goals from the proof. They are not
+   solved, and cannot be solved later in the proof. As the goals are not
+   solved, the proof cannot be closed.
+
+   The ``give_up`` tactic can be used while editing a proof, to choose to
+   write the proof script in a non-sequential order.
+
+Simple tactic macros
+-------------------------
 
 A simple example has more value than a long explanation:
 
-\begin{coq_example}
-Ltac Solve := simpl; intros; auto.
-Ltac ElimBoolRewrite b H1 H2 :=
-  elim b; [ intros; rewrite H1; eauto | intros; rewrite H2; eauto ].
-\end{coq_example}
+.. example::
+   .. coqtop:: reset all
 
-The tactics macros are synchronous with the \Coq\ section mechanism:
-a tactic definition is deleted from the current environment
-when you close the section (see also \ref{Section})
-where it was defined. If you want that a
-tactic macro defined in a module is usable in the modules that
-require it, you should put it outside of any section.
+      Ltac Solve := simpl; intros; auto.
 
-Chapter~\ref{TacticLanguage} gives examples of more complex
-user-defined tactics.
+      Ltac ElimBoolRewrite b H1 H2 :=
+      elim b; [ intros; rewrite H1; eauto | intros; rewrite H2; eauto ].
+
+The tactics macros are synchronous with the Coq section mechanism: a
+tactic definition is deleted from the current environment when you
+close the section (see also :ref:`TODO-2.4Sectionmechanism`) where it was
+defined. If you want that a tactic macro defined in a module is usable in the
+modules that require it, you should put it outside of any section.
 
+:ref:`TODO-9-Thetacticlanguage` gives examples of more complex
+user-defined tactics.
 
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "Reference-Manual"
-%%% TeX-master: "Reference-Manual"
-%%% End:
+.. [1] Actually, only the second subgoal will be generated since the
+  other one can be automatically checked.
+.. [2] This corresponds to the cut rule of sequent calculus.
+.. [3] Reminder: opaque constants will not be expanded by δ reductions.
+.. [4] The behavior of this tactic has much changed compared to the
+  versions available in the previous distributions (V6). This may cause
+  significant changes in your theories to obtain the same result. As a
+  drawback of the re-engineering of the code, this tactic has also been
+  completely revised to get a very compact and readable version.