diff --git a/docs/tutorial/multiple.rst b/docs/tutorial/multiple.rst index a32b02501..b70f02272 100644 --- a/docs/tutorial/multiple.rst +++ b/docs/tutorial/multiple.rst @@ -29,7 +29,7 @@ A conditional disabled variable with type web_address ------------------------------------------------------------- First we need to add a variable as part of our use case with a type we haven't used yet, the `web_address` type. -It is related to the automatic proxy configuration situation. +It is related to the automatic proxy configuration :term:`situation `. Let's put it in the new :file:`firefox/30-auto.yml` :term:`structure file`. Note that this variable has a :term:`disabled` property defined: @@ -78,4 +78,22 @@ we have this output: Variables: ┣━━ πŸ““ Configure Proxy Access to the Internet: Automatic proxy configuration URL β—€ loaded from the YAML file "config/03/config.yml" (⏳ No proxy) ┗━━ πŸ““ Automatic proxy configuration URL: https://auto.proxy.net/wpad.dat β—€ loaded from the YAML file "config/03/config.yml" - + +We can see that the `auto` variable has been activated here in this :term:`situation `. + +A conditional disabled non mandatory variable with type domainname and parameters +-------------------------------------------------------------------------------------- + +.. type-along:: For those who follow the tutorial with the help of the git repository + + Now you need to checkout the :tutorial:`v1.1_110 ` version:: + + git switch --detach v1.1_110 + + +In order to fit with our use case, we need to define a variable in which we could store domain names on which the proxy could be disabled. +We already used before in this tutorial the `domainname` type, which perfectly matches our needs. +We will just need to add certain parameters to this `domainname` type, as we will see. + +.. This time we would need some kind of a container type, which would allow us to list the web addresses for which the proxy will be disabled. + diff --git a/docs/tutorial/preliminary.rst b/docs/tutorial/preliminary.rst index 608f02f59..ea3dce1ca 100644 --- a/docs/tutorial/preliminary.rst +++ b/docs/tutorial/preliminary.rst @@ -404,6 +404,7 @@ We need to set the values ​​in separate files, called `user data files`. We call configuration the whole system structure and user values, and when we speak of consistency, it is in relation to this whole set. + It's a state, a possibility of state for the system, a situation. .. keypoints:: Key points progress