diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 7f13f2ac..00000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Modified variable
-
-| Variable | Description |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **proxy_dns_socks5**
[`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` *`disabled`* | Use proxy DNS when using SOCKS v5.
**Default**: false
**Disabled**: if "[Configure Proxy Access to the Internet](#proxy_mode)" is not "Manual proxy configuration"
or "[SOCKS host version used by proxy](#manual.socks_proxy.version)" is "v4". |
diff --git a/README.md b/README.md
index 2d44c2be..4edea91b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
- [List of all the tutorial steps](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/branch/1.1/README.md)
-- [[Previous tutorial v1.1_131] A boolean variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_131/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_132~1..v1.1_132))
+- [[Previous tutorial v1.1_132] A Jinja conditional disabled boolean variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_132/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_140~1..v1.1_140))
-# [tutorial v1.1_132] A Jinja conditional disabled boolean variable
+# [tutorial v1.1_140] Disabled a variable when an other variable are disabled
-- [Read the tutorial "A Jinja conditional disabled boolean variable" in the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/whatsnext.html#a-jinja-conditional-disabled-boolean-variable)
-- [View the changes in the files](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_132~1..v1.1_132)
+- [Read the tutorial "Disabled a variable when an other variable are disabled" in the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/whatsnext.html#disabled-a-variable-when-an-other-variable-are-disabled)
+- [View the changes in the files](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_140~1..v1.1_140)
## Screenshot
@@ -26,24 +26,24 @@ pip install rougail-cli rougail-output-exporter rougail-output-doc rougail-user-
Then switch to the tutorial page:
```shell
-git switch --detach v1.1_132
+git switch --detach v1.1_140
```
## Structure
-.
- ├── firefox
- │ ├── 00-proxy.yml
- │ ├── 10-manual.yml
- │ ├── 20-manual.yml
- │ ├── 30-auto.yml
- │ ├── 40-no_proxy.yml
- │ ├── 50-prompt_authentication.yml
- │ └── 55-proxy_dns_socks5.yml
- └── types
- └── proxy
- └── 00-type.yml
+.
+ ├── firefox
+ │ ├── 00-proxy.yml
+ │ ├── 10-manual.yml
+ │ ├── 20-manual.yml
+ │ ├── 30-auto.yml
+ │ ├── 40-no_proxy.yml
+ │ ├── 50-prompt_authentication.yml
+ │ └── 55-proxy_dns_socks5.yml
+ └── types
+ └── proxy
+ └── 00-type.yml
🛑 Caution -┗━━ proxy_dns_socks5 (Use proxy DNS when using SOCKS v5) - ┣━━ 🔔 unexpected error "cannot access to option "version" (SOCKS host - ┃ version used by proxy) because has property "disabled"" in function - ┃ "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is - ┃ not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is - ┃ "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', - ┃ '__internal_type': 'boolean', '__internal_multi': False, - ┃ '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], - ┃ '__internal_attribute': 'disabled', '__internal_variable': - ┃ 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': - ┃ 'Manual proxy configuration', '_.manual.socks_proxy.version': - ┃ PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy - ┃ DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml", it will - ┃ be ignored - ┗━━ 🛑 unexpected error "cannot access to option "version" (SOCKS host - version used by proxy) because has property "disabled"" in function - "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is - not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is - "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', - '__internal_type': 'boolean', '__internal_multi': False, - '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], - '__internal_attribute': 'disabled', '__internal_variable': - 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': - 'Manual proxy configuration', '_.manual.socks_proxy.version': - PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy - DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml" +╭───────────────────── Caption ─────────────────────╮ +│ Variable Default value │ +│ Unmodifiable variable Modified value │ +│ (⏳ Original default value) │ +╰───────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode (Configure Proxy Access to the Internet): Manual proxy +┃ configuration ◀ loaded from the YAML file "config/02/config.yml" (⏳ No +┃ proxy) +┣━━ 📂 manual (Manual proxy configuration) +┃ ┣━━ 📂 http_proxy (HTTP Proxy) +┃ ┃ ┣━━ 📓 address (HTTP proxy address): http.proxy.net ◀ loaded from the +┃ ┃ ┃ YAML file "config/02/config.yml" +┃ ┃ ┗━━ 📓 port (HTTP proxy port): 8080 +┃ ┣━━ 📓 use_for_https (Also use this proxy for HTTPS): true +┃ ┣━━ 📂 https_proxy (HTTPS Proxy) +┃ ┃ ┣━━ 📓 address (HTTPS proxy address): http.proxy.net +┃ ┃ ┗━━ 📓 port (HTTPS proxy port): 8080 +┃ ┗━━ 📂 socks_proxy (SOCKS Proxy) +┃ ┗━━ 📓 address (SOCKS proxy address): null +┣━━ 📓 no_proxy (Address for which proxy will be desactivated): [] +┗━━ 📓 prompt_authentication (Prompt for authentication if password is saved): + truediff --git a/config/03/output_ro.html b/config/03/output_ro.html index 1c649c3c..c69168f8 100644 --- a/config/03/output_ro.html +++ b/config/03/output_ro.html @@ -1,54 +1,29 @@ -🛑 Caution -┗━━ proxy_dns_socks5 (Use proxy DNS when using SOCKS v5) - ┣━━ 🔔 unexpected error "cannot access to option "version" (SOCKS host - ┃ version used by proxy) because has property "disabled"" in function - ┃ "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is - ┃ not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is - ┃ "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', - ┃ '__internal_type': 'boolean', '__internal_multi': False, - ┃ '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], - ┃ '__internal_attribute': 'disabled', '__internal_variable': - ┃ 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': - ┃ 'Manual proxy configuration', '_.manual.socks_proxy.version': - ┃ PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy - ┃ DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml", it will - ┃ be ignored - ┣━━ 🔔 unexpected error "cannot access to option "version" (SOCKS host - ┃ version used by proxy) because has property "disabled"" in function - ┃ "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is - ┃ not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is - ┃ "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', - ┃ '__internal_type': 'boolean', '__internal_multi': False, - ┃ '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], - ┃ '__internal_attribute': 'disabled', '__internal_variable': - ┃ 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': - ┃ 'Manual proxy configuration', '_.manual.socks_proxy.version': - ┃ PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy - ┃ DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml", it will - ┃ be ignored - ┣━━ 🔔 unexpected error "cannot access to option "version" (SOCKS host - ┃ version used by proxy) because has property "disabled"" in function - ┃ "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is - ┃ not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is - ┃ "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', - ┃ '__internal_type': 'boolean', '__internal_multi': False, - ┃ '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], - ┃ '__internal_attribute': 'disabled', '__internal_variable': - ┃ 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': - ┃ 'Manual proxy configuration', '_.manual.socks_proxy.version': - ┃ PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy - ┃ DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml", it will - ┃ be ignored when loading from the YAML file "config/03/config.yml" - ┗━━ 🛑 unexpected error "cannot access to option "version" (SOCKS host - version used by proxy) because has property "disabled"" in function - "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is - not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is - "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', - '__internal_type': 'boolean', '__internal_multi': False, - '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], - '__internal_attribute': 'disabled', '__internal_variable': - 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': - 'Manual proxy configuration', '_.manual.socks_proxy.version': - PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy - DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml" +🔔 Warning +┗━━ proxy_dns_socks5 (Use proxy DNS when using SOCKS v5): 🔔 variable has + property disabled, it will be ignored when loading from the YAML file + "config/03/config.yml" + +╭───────────────────── Caption ─────────────────────╮ +│ Variable Default value │ +│ Unmodifiable variable Modified value │ +│ (⏳ Original default value) │ +╰───────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode (Configure Proxy Access to the Internet): Manual proxy +┃ configuration ◀ loaded from the YAML file "config/03/config.yml" (⏳ No +┃ proxy) +┣━━ 📂 manual (Manual proxy configuration) +┃ ┣━━ 📂 http_proxy (HTTP Proxy) +┃ ┃ ┣━━ 📓 address (HTTP proxy address): http.proxy.net ◀ loaded from the +┃ ┃ ┃ YAML file "config/03/config.yml" +┃ ┃ ┗━━ 📓 port (HTTP proxy port): 8080 +┃ ┣━━ 📓 use_for_https (Also use this proxy for HTTPS): true +┃ ┣━━ 📂 https_proxy (HTTPS Proxy) +┃ ┃ ┣━━ 📓 address (HTTPS proxy address): http.proxy.net +┃ ┃ ┗━━ 📓 port (HTTPS proxy port): 8080 +┃ ┗━━ 📂 socks_proxy (SOCKS Proxy) +┃ ┗━━ 📓 address (SOCKS proxy address): null +┣━━ 📓 no_proxy (Address for which proxy will be desactivated): [] +┗━━ 📓 prompt_authentication (Prompt for authentication if password is saved): + truediff --git a/config/04/output_ro.html b/config/04/output_ro.html index ac1b9f42..61682fce 100644 --- a/config/04/output_ro.html +++ b/config/04/output_ro.html @@ -1,46 +1,31 @@ -🛑 Caution -┣━━ proxy_dns_socks5 (Use proxy DNS when using SOCKS v5) -┃ ┣━━ 🔔 unexpected error "cannot access to option "version" (SOCKS host -┃ ┃ version used by proxy) because has property "disabled"" in function -┃ ┃ "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is -┃ ┃ not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is -┃ ┃ "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', -┃ ┃ '__internal_type': 'boolean', '__internal_multi': False, -┃ ┃ '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], -┃ ┃ '__internal_attribute': 'disabled', '__internal_variable': -┃ ┃ 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': -┃ ┃ 'Manual proxy configuration', '_.manual.socks_proxy.version': -┃ ┃ PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy -┃ ┃ DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml", it will -┃ ┃ be ignored -┃ ┣━━ 🔔 unexpected error "cannot access to option "version" (SOCKS host -┃ ┃ version used by proxy) because has property "disabled"" in function -┃ ┃ "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is -┃ ┃ not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is -┃ ┃ "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', -┃ ┃ '__internal_type': 'boolean', '__internal_multi': False, -┃ ┃ '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], -┃ ┃ '__internal_attribute': 'disabled', '__internal_variable': -┃ ┃ 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': -┃ ┃ 'Manual proxy configuration', '_.manual.socks_proxy.version': -┃ ┃ PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy -┃ ┃ DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml", it will -┃ ┃ be ignored -┃ ┗━━ 🛑 unexpected error "cannot access to option "version" (SOCKS host -┃ version used by proxy) because has property "disabled"" in function -┃ "jinja_to_property" with arguments "['disabled', 'if "_.proxy_mode" is -┃ not "Manual proxy configuration"\nor "_.manual.socks_proxy.version" is -┃ "v4"']" and "{'__internal_jinja': 'disabled_proxy_dns_socks5', -┃ '__internal_type': 'boolean', '__internal_multi': False, -┃ '__internal_files': ['firefox/55-proxy_dns_socks5.yml'], -┃ '__internal_attribute': 'disabled', '__internal_variable': -┃ 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': -┃ 'Manual proxy configuration', '_.manual.socks_proxy.version': -┃ PropertiesOptionError(None)}" for option "proxy_dns_socks5" (Use proxy -┃ DNS when using SOCKS v5) in "firefox/55-proxy_dns_socks5.yml" -┗━━ manual (Manual proxy configuration) - ┗━━ socks_proxy (SOCKS Proxy) - ┗━━ version (SOCKS host version used by proxy): 🔔 variable has property - disabled, it will be ignored when loading from the YAML file - "config/04/config.yml" +🔔 Warning +┗━━ manual (Manual proxy configuration) + ┗━━ socks_proxy (SOCKS Proxy) + ┗━━ version (SOCKS host version used by proxy): 🔔 variable has property + disabled, it will be ignored when loading from the YAML file + "config/04/config.yml" + +╭───────────────────── Caption ─────────────────────╮ +│ Variable Default value │ +│ Unmodifiable variable Modified value │ +│ (⏳ Original default value) │ +╰───────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode (Configure Proxy Access to the Internet): Manual proxy +┃ configuration ◀ loaded from the YAML file "config/04/config.yml" (⏳ No +┃ proxy) +┣━━ 📂 manual (Manual proxy configuration) +┃ ┣━━ 📂 http_proxy (HTTP Proxy) +┃ ┃ ┣━━ 📓 address (HTTP proxy address): http.proxy.net ◀ loaded from the +┃ ┃ ┃ YAML file "config/04/config.yml" +┃ ┃ ┗━━ 📓 port (HTTP proxy port): 8080 +┃ ┣━━ 📓 use_for_https (Also use this proxy for HTTPS): true +┃ ┣━━ 📂 https_proxy (HTTPS Proxy) +┃ ┃ ┣━━ 📓 address (HTTPS proxy address): http.proxy.net +┃ ┃ ┗━━ 📓 port (HTTPS proxy port): 8080 +┃ ┗━━ 📂 socks_proxy (SOCKS Proxy) +┃ ┗━━ 📓 address (SOCKS proxy address): null +┣━━ 📓 no_proxy (Address for which proxy will be desactivated): [] +┗━━ 📓 prompt_authentication (Prompt for authentication if password is saved): + truediff --git a/tree.html b/tree.html index e58916be..fb133599 100644 --- a/tree.html +++ b/tree.html @@ -1,14 +1,14 @@-.
\ No newline at end of file
- ├── firefox
- │ ├── 00-proxy.yml
- │ ├── 10-manual.yml
- │ ├── 20-manual.yml
- │ ├── 30-auto.yml
- │ ├── 40-no_proxy.yml
- │ ├── 50-prompt_authentication.yml
- │ └── 55-proxy_dns_socks5.yml
- └── types
- └── proxy
- └── 00-type.yml
+.
+ ├── firefox
+ │ ├── 00-proxy.yml
+ │ ├── 10-manual.yml
+ │ ├── 20-manual.yml
+ │ ├── 30-auto.yml
+ │ ├── 40-no_proxy.yml
+ │ ├── 50-prompt_authentication.yml
+ │ └── 55-proxy_dns_socks5.yml
+ └── types
+ └── proxy
+ └── 00-type.yml