diff --git a/README.md b/README.md
index d456f07..984f179 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
- [Summary](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/branch/1.1/README.md)
-- [[tutorial 012] Conditional desactived family](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_012/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_012~1..v1.1_012))
+- [[tutorial 013] A sub family](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_013/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_013~1..v1.1_013))
-# [tutorial 013] A sub family
+# [tutorial 014] Family in "shorthand" mode
-[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_013~1..v1.1_013)
+[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_014~1..v1.1_014)
## Screenshot
@@ -47,6 +47,10 @@ manual:
description: HTTP Proxy
type: family
+ address:
+ description: HTTP address
+ type: domainname
+
```
### Generated documentation
@@ -55,11 +59,240 @@ foo@bar:~$ rougail -v 1.1 -m firefox/ -o doc -do github
```
### Variables
-| Variable | Description |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **proxy_mode**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Configure Proxy Access to the Internet.
**Choices**:
- No proxy ← (default)
- Auto-detect proxy settings for this network
- Use system proxy settings
- Manual proxy configuration
- Automatic proxy configuration URL |
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **proxy_mode**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Configure Proxy Access to the Internet.
**Choices**:
- No proxy ← (default)
- Auto-detect proxy settings for this network
- Use system proxy settings
- Manual proxy configuration
- Automatic proxy configuration URL |
+
+#### Manual proxy configuration
+
+_`disabled`_
+
+**Disabled**: proxy_mode.
+
+##### HTTP Proxy
+
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **manual.http_proxy.address**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTP address. |
+## User data
+
+### Example 1
+
+#### config/01/config.yaml
-- [[tutorial 014] Family in "shorthand" mode](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_014/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_014~1..v1.1_014))
+```yml
+---
+
+```
+#### Output
+
+```console
+foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/01/config.yaml
+```
+
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +│ Unmodifiable variable │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┗━━ 📓 proxy_mode: No proxy ++#### Output in read write mode + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/01/config.yaml --exporter.read_write +``` +
+### Example 2 + +#### config/02/config.yaml + + +```yml +--- +proxy_mode: Manual proxy configuration + +``` +#### Output + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/02/config.yaml +``` +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┗━━ 📓 proxy_mode: No proxy ++
🛑 ERRORS +┣━━ The following variables are mandatory but have no value: +┗━━ - manual.http_proxy.address (HTTP address) ++#### Output in read write mode + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/02/config.yaml --exporter.read_write +``` +
+### Example 3 + +#### config/03/config.yaml + + +```yml +--- +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net + +``` +#### Output + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/03/config.yaml +``` +🛑 ERRORS +┣━━ The following variables are mandatory but have no value: +┗━━ - manual.http_proxy.address (HTTP address) ++
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net ++#### Output in read write mode + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/03/config.yaml --exporter.read_write +``` +
+### Example 4 + +#### config/04/config.yaml + + +```yml +--- +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net + port: '3128' + +``` +#### Output + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/04/config.yaml +``` +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net ++
🛑 ERRORS +┗━━ unknown option "port" in optiondescription "manual.http_proxy" (HTTP Proxy) +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net ++#### Output in read write mode + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/04/config.yaml --exporter.read_write +``` +
+### Example 5 + +#### config/05/config.yaml + + +```yml +--- +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: http.proxy.net + port: '3128' + use_for_https: false + https_proxy: + address: https.proxy.net + +``` +#### Output + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/05/config.yaml +``` +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net ++
🛑 ERRORS +┣━━ unknown option "port" in optiondescription "manual.http_proxy" (HTTP Proxy) +┣━━ unknown option "use_for_https" in optiondescription "manual" (Manual proxy configuration) +┗━━ unknown option "https_proxy" in optiondescription "manual" (Manual proxy configuration) +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: http.proxy.net ++#### Output in read write mode + +```console +foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/05/config.yaml --exporter.read_write +``` +
+ + +- [[tutorial 015] Family in "shorthand" mode](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_015/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_015~1..v1.1_015)) diff --git a/config/01/config.yaml b/config/01/config.yaml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/config/01/config.yaml @@ -0,0 +1 @@ +--- diff --git a/config/01/output_ro.html b/config/01/output_ro.html new file mode 100644 index 0000000..cdecbe8 --- /dev/null +++ b/config/01/output_ro.html @@ -0,0 +1,9 @@ +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: http.proxy.net ++
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +│ Unmodifiable variable │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┗━━ 📓 proxy_mode: No proxy +diff --git a/config/01/output_rw.html b/config/01/output_rw.html new file mode 100644 index 0000000..f74f3a6 --- /dev/null +++ b/config/01/output_rw.html @@ -0,0 +1,8 @@ +
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┗━━ 📓 proxy_mode: No proxy +diff --git a/config/02/config.yaml b/config/02/config.yaml new file mode 100644 index 0000000..74edb22 --- /dev/null +++ b/config/02/config.yaml @@ -0,0 +1,2 @@ +--- +proxy_mode: Manual proxy configuration diff --git a/config/02/output_ro.html b/config/02/output_ro.html new file mode 100644 index 0000000..28450ac --- /dev/null +++ b/config/02/output_ro.html @@ -0,0 +1,4 @@ +
🛑 ERRORS +┣━━ The following variables are mandatory but have no value: +┗━━ - manual.http_proxy.address (HTTP address) +diff --git a/config/02/output_rw.html b/config/02/output_rw.html new file mode 100644 index 0000000..28450ac --- /dev/null +++ b/config/02/output_rw.html @@ -0,0 +1,4 @@ +
🛑 ERRORS +┣━━ The following variables are mandatory but have no value: +┗━━ - manual.http_proxy.address (HTTP address) +diff --git a/config/03/config.yaml b/config/03/config.yaml new file mode 100644 index 0000000..e3db924 --- /dev/null +++ b/config/03/config.yaml @@ -0,0 +1,5 @@ +--- +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net diff --git a/config/03/output_ro.html b/config/03/output_ro.html new file mode 100644 index 0000000..9ea732e --- /dev/null +++ b/config/03/output_ro.html @@ -0,0 +1,11 @@ +
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net +diff --git a/config/03/output_rw.html b/config/03/output_rw.html new file mode 100644 index 0000000..9ea732e --- /dev/null +++ b/config/03/output_rw.html @@ -0,0 +1,11 @@ +
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net +diff --git a/config/04/config.yaml b/config/04/config.yaml new file mode 100644 index 0000000..c8d73af --- /dev/null +++ b/config/04/config.yaml @@ -0,0 +1,6 @@ +--- +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net + port: '3128' diff --git a/config/04/output_ro.html b/config/04/output_ro.html new file mode 100644 index 0000000..b07fec9 --- /dev/null +++ b/config/04/output_ro.html @@ -0,0 +1,13 @@ +
🛑 ERRORS +┗━━ unknown option "port" in optiondescription "manual.http_proxy" (HTTP Proxy) +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net +diff --git a/config/04/output_rw.html b/config/04/output_rw.html new file mode 100644 index 0000000..9ea732e --- /dev/null +++ b/config/04/output_rw.html @@ -0,0 +1,11 @@ +
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: example.net +diff --git a/config/05/config.yaml b/config/05/config.yaml new file mode 100644 index 0000000..4a1f789 --- /dev/null +++ b/config/05/config.yaml @@ -0,0 +1,9 @@ +--- +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: http.proxy.net + port: '3128' + use_for_https: false + https_proxy: + address: https.proxy.net diff --git a/config/05/output_ro.html b/config/05/output_ro.html new file mode 100644 index 0000000..4f8e0ee --- /dev/null +++ b/config/05/output_ro.html @@ -0,0 +1,15 @@ +
🛑 ERRORS +┣━━ unknown option "port" in optiondescription "manual.http_proxy" (HTTP Proxy) +┣━━ unknown option "use_for_https" in optiondescription "manual" (Manual proxy configuration) +┗━━ unknown option "https_proxy" in optiondescription "manual" (Manual proxy configuration) +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: http.proxy.net +diff --git a/config/05/output_rw.html b/config/05/output_rw.html new file mode 100644 index 0000000..f810fdc --- /dev/null +++ b/config/05/output_rw.html @@ -0,0 +1,11 @@ +
╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Manual proxy configuration (No proxy) +┗━━ 📂 manual + ┗━━ 📂 http_proxy + ┗━━ 📓 address: http.proxy.net +