Merge branch 'master' into no-private-module-name

doc/index.rst

@@ -19,5 +19,6 @@ Welcome to jbuilder's documentation!
    usage
    advanced-topics
    configurator
+   menhir
    faq
    known-issues

doc/jbuild.rst

@@ -521,30 +521,8 @@ To use a different rule mode, use the long form:
 menhir
 ------
 
-The basic form for defining menhir parsers (analogous to ocamlyacc) is:
-
-.. code:: scheme
-
-    (menhir
-     ((modules (<parser1> <parser2> ...))))
-
-Modular parsers can be defined by adding a ``merge_into`` field. This correspond
-to the ``--base`` command line option of ``menhir``. With this option, a single
-parser named ``base_name`` is generated.
-
-.. code:: scheme
-
-    (menhir
-     ((merge_into <base_name>)
-      (modules (<parser1> <parser2> ...))))
-
-Extra flags can be passed to menhir using the ``flags`` flag:
-
-.. code:: scheme
-
-    (menhir
-     ((flags (<option1> <option2> ...))
-      (modules (<parser1> <parser2> ...))))
+A ``menhir`` stanza is available to support the menhir_ parser generator. See
+the :ref:`menhir-main` section for details.
 
 alias
 -----

doc/menhir.rst

@@ -0,0 +1,32 @@
+.. _menhir-main:
+
+******
+Menhir
+******
+
+The basic form for defining menhir_ parsers (analogous to ocamlyacc) is:
+
+.. code:: scheme
+
+    (menhir
+     ((modules (<parser1> <parser2> ...))))
+
+Modular parsers can be defined by adding a ``merge_into`` field. This correspond
+to the ``--base`` command line option of ``menhir``. With this option, a single
+parser named ``base_name`` is generated.
+
+.. code:: scheme
+
+    (menhir
+     ((merge_into <base_name>)
+      (modules (<parser1> <parser2> ...))))
+
+Extra flags can be passed to menhir using the ``flags`` flag:
+
+.. code:: scheme
+
+    (menhir
+     ((flags (<option1> <option2> ...))
+      (modules (<parser1> <parser2> ...))))
+
+.. _menhir: https://gitlab.inria.fr/fpottier/menhir