diff --git a/doc/changelog/06-Ltac2-language/18432-ltac2-typed-notation.rst b/doc/changelog/06-Ltac2-language/18432-ltac2-typed-notation.rst
new file mode 100644
index 000000000000..8a3ec953076c
--- /dev/null
+++ b/doc/changelog/06-Ltac2-language/18432-ltac2-typed-notation.rst
@@ -0,0 +1,10 @@
+- **Changed:**
+  Ltac2 are typechecked at declaration time by default.
+  This should produce better errors when a notation argument does not have the expected type
+  (e.g. wrong branch type in `match! goal`).
+  The previous behaviour of typechecking only the expansion result can be
+  recovered using :flag:`Ltac2 Typed Notations`. We believe there are no real
+  use cases for this, please report if you have any
+  (`#18432 <https://github.com/coq/coq/pull/18432>`_,
+  fixes `#17477 <https://github.com/coq/coq/issues/17477>`_,
+  by Gaëtan Gilbert).
diff --git a/doc/sphinx/proof-engine/ltac2.rst b/doc/sphinx/proof-engine/ltac2.rst
index 862b12710f17..e42af2fb211b 100644
--- a/doc/sphinx/proof-engine/ltac2.rst
+++ b/doc/sphinx/proof-engine/ltac2.rst
@@ -1220,11 +1220,22 @@ Notations
    side (before the `:=`) defines the syntax to recognize and gives formal parameter
    names for the syntactic values.  :n:`@integer` is the level of the notation.
    When the notation is used, the values are substituted
-   into the right-hand side.  The right-hand side is typechecked when the notation is used,
-   not when it is defined.  In the following example, `x` is the formal parameter name and
+   into the right-hand side.  In the following example, `x` is the formal parameter name and
    `constr` is its :ref:`syntactic class<syntactic_classes>`.  `print` and `of_constr` are
    functions provided by Coq through `Message.v`.
 
+   .. flag:: Ltac2 Typed Notations
+
+      By default Ltac2 notations are typechecked at declaration time.
+      This assigns an expected type to notation arguments.
+
+      When a notation is declared with this flag unset, it is not
+      typechecked at declaration time and its expansion is typechecked
+      when it is used. This may allow slightly more flexible use of
+      the notation arguments at the cost of worse error messages when
+      incorrectly using the notation. It is not believed to be useful
+      in practice, please report any real use cases you find.
+
    .. todo "print" doesn't seem to pay attention to "Set Printing All"
 
    .. example:: Printing a :n:`@term`