diff --git a/docs/tutorial/choice.rst b/docs/tutorial/choice.rst index 046fc1b00..55133f0f6 100644 --- a/docs/tutorial/choice.rst +++ b/docs/tutorial/choice.rst @@ -109,9 +109,11 @@ We have this output: As we set the `proxy_mode` variable from a user data file, we now have specified a value which is **not** a default value, and -the output of the rougail CLI explicitly shows that a user data value has been entered. +the output of the rougail CLI explicitly shows that a user data value has been entered, +it shows which user data file this value comes from, and it also indicates +what the default value is for information purposes. -.. type-along:: The constraints that come with the `choice` property +.. type-along:: The constraints that come with the choices The `proxy_mode` variable's possible values is *constrained*. @@ -125,7 +127,7 @@ We have the list of the possible (authorized) values: .. questions:: Question - What happens if I set a value that is not available in the `choice` list? + What happens if I set a value that is not available in the choices? .. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_010/config/04/config.yml :linenos: @@ -184,7 +186,7 @@ Then we have an `error` output instead of a `warning` output: Indeed, in the Firefox configuration, it is possible to define several configuration modes, from no proxy at all to different kind of automatic or manual configuration modes. - The `choice` parameter, that is the list of available values for a variable, can help us to handle this situation. + The choices, the list of available values for a variable, can help us to handle this situation. **Progress** diff --git a/docs/tutorial/preliminary.rst b/docs/tutorial/preliminary.rst index f79238678..2d972055a 100644 --- a/docs/tutorial/preliminary.rst +++ b/docs/tutorial/preliminary.rst @@ -342,7 +342,7 @@ which gives us this output: ┗━━ 📓 proxy_mode: No proxy ◀ loaded from the YAML file "config/02/config.yml" -Now the `proxy_mode`'s new `No proxy` value is the same as the default value but we see that the value +Now the `proxy_mode`'s new `No proxy` value is the same as the default value but we see in the rougail CLI output that the value comes from the :file:`config/02/config.yml` user data file. From now on this `proxy_mode` variable's value is a user data value and not a default value (even if it's actually the same value).