Update test and documentation

Signed-off-by: Ulysse Gérard <[email protected]>

Author: voodoos

doc/usage.rst

@@ -549,7 +549,10 @@ Querying Merlin configuration
 Since version 2.8 Dune does not promote ``.merlin`` files to the source
 directories any more. Instead these configurations are stored in the `_build`
 folder and Merlin communicates directly with Dune to obtain its configuration
-via the `ocaml-merlin` subcommand.
+via the `ocaml-merlin` subcommand. The Merlin configuration is now stanza
+specific allowing finer control. The following commands are not needed for
+normal use of Dune and Merlin but can provide insightful informations when
+debugging or configuring non-standard projects.
 
 Printing the configuration
 --------------------------
@@ -574,14 +577,16 @@ Merlin configuration syntax by running the following command:
 
 ::
 
-    $ dune ocaml-merlin --dump-dot-merlin > .merlin
+    $ dune ocaml dump-dot-merlin > .merlin
 
 In that case only one configuration will be printed which is the result of a
 coarse merge of the configurations of the various modules present in the current
 folder. This folder must be in a Dune workspace and the project must be already
 built. Preprocessing directives and other flags will be commented out and must
-be un-commented afterward.
+be un-commented afterward. This feature does not aim at writing exact or correct
+``.merlin`` files, its sole purpose is to lessen the burden of writing the
+configuration from scratch.
 
-Both these commands also support an optional argument to specify the target
-directory. This directory must be in a Dune workspace and the project must be
-already built.
+Both these commands also support an optional path to specify the target
+directory. This directory must be in a Dune workspace and the project must have
+already been built.

test/blackbox-tests/test-cases/merlin/dump-dot-merlin.t/run.t

@@ -1,13 +1,13 @@
   $ dune build
-  $ dune ocaml-merlin --dump-dot-merlin
+  $ dune ocaml dump-dot-merlin
 
   EXCLUDE_QUERY_DIR
   B $TESTCASE_ROOT/_build/default/.foo.eobjs/byte
   S $TESTCASE_ROOT
   # FLG -pp $TESTCASE_ROOT/_build/default/pp/pp.exe
   # FLG -open Dune__exe -w @[email protected]@30..39@[email protected]@[email protected] -strict-sequence -strict-formats -short-paths -keep-locs
   
-  $ dune ocaml-merlin --dump-dot-merlin="pp"
+  $ dune ocaml dump-dot-merlin "pp"
 
   EXCLUDE_QUERY_DIR
   B $TESTCASE_ROOT/_build/default/pp/.pp.eobjs/byte