diff --git a/docs/tutorial/calculated.rst b/docs/tutorial/calculated.rst index 18af20383..d05008e78 100644 --- a/docs/tutorial/calculated.rst +++ b/docs/tutorial/calculated.rst @@ -228,8 +228,7 @@ We have this result: The `https_proxy` variable's value is indeed modified, but the default value is still a calculated value (so the default value is indeed the value of the variable `http_proxy.address`, i.e., `"http.proxy.net"`), while the value defined by the user is `https.proxy.net`. -The Rougial CLI always displays the default value of a variable, even if a value has been assigned to it, meaning the default value is not used. -Here we see that the variable's default value is not changed, but rather its actual value. +The Rougail CLI output usually displays the default value of a variable, even if a value has been assigned to this variable, meaning the default value is not used. Here we see that the variable's default value is not changed, but rather its actual value. .. keypoints:: Key points progress diff --git a/docs/tutorial/dynfam.rst b/docs/tutorial/dynfam.rst index 16bf5ff52..a12e7586e 100644 --- a/docs/tutorial/dynfam.rst +++ b/docs/tutorial/dynfam.rst @@ -220,9 +220,6 @@ Here is our dynamically built familiy in situation in the :file:`firefox/20-manu variable: __.http_proxy.port ... -When we launch the Rougail CLI, we can see the concrete families -and variables that have been created: - Here is the user data file on which we will launch the Rougail CLI: .. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_060/config/01/config.yml @@ -247,9 +244,6 @@ Here is the user data file on which we will launch the Rougail CLI: .. rougail -m firefox/ -u yaml -yf config/01/config.yml - -The Rougail CLI outputs this: - .. raw:: html :url: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_060/config/01/output_ro.html :class: output @@ -290,9 +284,7 @@ A conditional disabled variable with dynamic identifier git switch --detach v1.1_061 -Here is the final version of the HTTPS and SOCKS structure file: - -We have added: +Here is the final version of the HTTPS and SOCKS structure file, we have added: - a conditional hidden family property - a default value @@ -340,7 +332,10 @@ We have added: ... The disabled `property` is assigned here to the `version` variable -in the case where the identifier is HTTPS. +in the case where the identifier is `HTTPS`. + +This means that when the current dynamically built family is determined by the identifier `HTTPS`, the variable `version` is disabled +(therefore considered as non-existent) and when the identifier is `SOCKS` the variable is present (it is accessible). .. version: