Merge branch 'v2.0' into 2733

ecadbdf4 · Christophe Maudoux · 46c0cdd1 · 3fc401bf · ecadbdf4
Commit ecadbdf4 authored May 14, 2022 by Christophe Maudoux 🐛
--- a/doc/sources/admin/exportedvars.rst
+++ b/doc/sources/admin/exportedvars.rst
@@ -62,7 +62,7 @@ portal:

    Macros can be used for rewriting or overloading exported variables
    but it can lead to some side effects. Be aware of alphabetical order
-    and keep in mind that exported variables are set then macros and
+    and keep in mind that exported variables are set. Then macros and
    groups are computed.

 .. code-block:: perl