From ca65bd0ebdae2c733b4bbb14165ec41c37695afe Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 6 May 2026 11:25:22 +0200 Subject: [PATCH] fix: example for partial documentation --- src/rougail/output_doc/example.py | 6 +- tests/result_tutorial/090/doc.json | 67 +- tests/result_tutorial/090/doc.sh | 27 +- tests/result_tutorial/090/doc_changelog.sh | 26 +- tests/result_tutorial/{102 => 091}/doc.json | 133 +- tests/result_tutorial/{102 => 091}/doc.sh | 58 +- tests/result_tutorial/091/doc_changelog.sh | 29 + tests/result_tutorial/100/doc.json | 94 +- tests/result_tutorial/100/doc.sh | 40 +- tests/result_tutorial/100/doc_changelog.sh | 19 +- tests/result_tutorial/101/doc.json | 428 ------ tests/result_tutorial/101/doc.sh | 158 --- tests/result_tutorial/101/doc_changelog.sh | 21 - tests/result_tutorial/102/doc_changelog.sh | 21 - tests/result_tutorial/103/doc_changelog.sh | 25 - tests/result_tutorial/110/doc.json | 106 +- tests/result_tutorial/110/doc.sh | 42 +- tests/result_tutorial/110/doc_changelog.sh | 13 +- tests/result_tutorial/111/doc.json | 121 +- tests/result_tutorial/111/doc.sh | 45 +- tests/result_tutorial/111/doc_changelog.sh | 18 +- tests/result_tutorial/120/doc.json | 131 +- tests/result_tutorial/120/doc.sh | 47 +- tests/result_tutorial/120/doc_changelog.sh | 25 + tests/result_tutorial/{104 => 121}/doc.json | 55 +- tests/result_tutorial/{104 => 121}/doc.sh | 25 +- .../{104 => 121}/doc_changelog.sh | 0 tests/result_tutorial/130/doc.json | 95 +- tests/result_tutorial/130/doc.sh | 34 +- tests/result_tutorial/130/doc_changelog.sh | 17 +- tests/result_tutorial/{103 => 131}/doc.json | 111 +- tests/result_tutorial/{103 => 131}/doc.sh | 41 +- tests/result_tutorial/131/doc_changelog.sh | 9 + tests/result_tutorial/{112 => 132}/doc.json | 55 +- tests/result_tutorial/{112 => 132}/doc.sh | 25 +- .../{112 => 132}/doc_changelog.sh | 0 tests/result_tutorial/140/doc.json | 89 +- tests/result_tutorial/140/doc.sh | 41 +- tests/result_tutorial/140/doc_changelog.sh | 9 - tests/result_tutorial/141/doc.json | 579 -------- tests/result_tutorial/141/doc_changelog.sh | 16 - tests/result_tutorial/150/doc.json | 173 +-- tests/result_tutorial/150/doc.sh | 62 +- tests/result_tutorial/150/doc_changelog.sh | 20 +- tests/result_tutorial/160/doc.json | 996 ++++++-------- tests/result_tutorial/160/doc.sh | 136 +- tests/result_tutorial/160/doc_changelog.sh | 175 +-- tests/result_tutorial/161/doc.json | 1079 +++++++-------- tests/result_tutorial/161/doc.sh | 130 +- tests/result_tutorial/161/doc_changelog.sh | 16 + tests/result_tutorial/{142 => 162}/doc.json | 55 +- tests/result_tutorial/{142 => 162}/doc.sh | 25 +- .../{142 => 162}/doc_changelog.sh | 0 tests/result_tutorial/170/doc.json | 1197 ++++++++--------- tests/result_tutorial/170/doc.sh | 148 +- tests/result_tutorial/170/doc_changelog.sh | 20 +- tests/result_tutorial/180/doc.json | 122 +- tests/result_tutorial/180/doc.sh | 54 +- tests/result_tutorial/180/doc_changelog.sh | 182 ++- tests/result_tutorial/181/doc.json | 129 +- tests/result_tutorial/181/doc.sh | 55 +- tests/result_tutorial/181/doc_changelog.sh | 12 - tests/result_tutorial/190/doc.json | 107 +- tests/result_tutorial/190/doc.sh | 41 +- tests/result_tutorial/190/doc_changelog.sh | 18 +- tests/result_tutorial/200/doc.json | 234 +--- tests/result_tutorial/200/doc.sh | 84 +- tests/result_tutorial/200/doc_changelog.sh | 48 +- tests/result_tutorial/201/doc.json | 714 ++++++++++ tests/result_tutorial/{141 => 201}/doc.sh | 160 ++- tests/result_tutorial/201/doc_changelog.sh | 12 + tests/result_tutorial/{182 => 202}/doc.json | 55 +- tests/result_tutorial/{182 => 202}/doc.sh | 25 +- .../{182 => 202}/doc_changelog.sh | 0 tests/result_tutorial/210/doc.json | 238 +--- tests/result_tutorial/210/doc.sh | 83 +- tests/result_tutorial/210/doc_changelog.sh | 26 +- tests/result_tutorial/220/doc.json | 886 ++++++++++++ tests/result_tutorial/220/doc.sh | 316 +++++ tests/result_tutorial/220/doc_changelog.sh | 49 + tests/result_tutorial/230/doc.json | 936 +++++++++++++ tests/result_tutorial/230/doc.sh | 331 +++++ tests/result_tutorial/230/doc_changelog.sh | 21 + tests/result_tutorial/{211 => 231}/doc.json | 55 +- tests/result_tutorial/{211 => 231}/doc.sh | 25 +- .../{211 => 231}/doc_changelog.sh | 0 86 files changed, 6303 insertions(+), 5848 deletions(-) rename tests/result_tutorial/{102 => 091}/doc.json (76%) rename tests/result_tutorial/{102 => 091}/doc.sh (75%) create mode 100644 tests/result_tutorial/091/doc_changelog.sh delete mode 100644 tests/result_tutorial/101/doc.json delete mode 100644 tests/result_tutorial/101/doc.sh delete mode 100644 tests/result_tutorial/101/doc_changelog.sh delete mode 100644 tests/result_tutorial/102/doc_changelog.sh delete mode 100644 tests/result_tutorial/103/doc_changelog.sh rename tests/result_tutorial/{104 => 121}/doc.json (92%) rename tests/result_tutorial/{104 => 121}/doc.sh (93%) rename tests/result_tutorial/{104 => 121}/doc_changelog.sh (100%) rename tests/result_tutorial/{103 => 131}/doc.json (82%) rename tests/result_tutorial/{103 => 131}/doc.sh (84%) create mode 100644 tests/result_tutorial/131/doc_changelog.sh rename tests/result_tutorial/{112 => 132}/doc.json (93%) rename tests/result_tutorial/{112 => 132}/doc.sh (93%) rename tests/result_tutorial/{112 => 132}/doc_changelog.sh (100%) delete mode 100644 tests/result_tutorial/141/doc.json delete mode 100644 tests/result_tutorial/141/doc_changelog.sh rename tests/result_tutorial/{142 => 162}/doc.json (94%) rename tests/result_tutorial/{142 => 162}/doc.sh (94%) rename tests/result_tutorial/{142 => 162}/doc_changelog.sh (100%) create mode 100644 tests/result_tutorial/201/doc.json rename tests/result_tutorial/{141 => 201}/doc.sh (67%) create mode 100644 tests/result_tutorial/201/doc_changelog.sh rename tests/result_tutorial/{182 => 202}/doc.json (95%) rename tests/result_tutorial/{182 => 202}/doc.sh (95%) rename tests/result_tutorial/{182 => 202}/doc_changelog.sh (100%) create mode 100644 tests/result_tutorial/220/doc.json create mode 100644 tests/result_tutorial/220/doc.sh create mode 100644 tests/result_tutorial/220/doc_changelog.sh create mode 100644 tests/result_tutorial/230/doc.json create mode 100644 tests/result_tutorial/230/doc.sh create mode 100644 tests/result_tutorial/230/doc_changelog.sh rename tests/result_tutorial/{211 => 231}/doc.json (96%) rename tests/result_tutorial/{211 => 231}/doc.sh (96%) rename tests/result_tutorial/{211 => 231}/doc_changelog.sh (100%) diff --git a/src/rougail/output_doc/example.py b/src/rougail/output_doc/example.py index 4571d3f09..31b1ab585 100644 --- a/src/rougail/output_doc/example.py +++ b/src/rougail/output_doc/example.py @@ -20,6 +20,7 @@ from ruamel.yaml import CommentedMap from ruamel.yaml.representer import RoundTripRepresenter from tiramisu import Calculation, owners +from tiramisu.error import PropertiesOptionError from .utils import _, dump, to_phrase @@ -126,7 +127,10 @@ class Examples: # pylint: disable=no-member,too-few-public-methods for calculated_too in [False, True]: for option in config.value.mandatory(): if not calculated_too: - uncalculated = option.value.default(uncalculated=True) + try: + uncalculated = option.value.default(uncalculated=True) + except PropertiesOptionError: + continue if isinstance(uncalculated, Calculation): continue self._set_value_example(option, self._get_an_example(option)) diff --git a/tests/result_tutorial/090/doc.json b/tests/result_tutorial/090/doc.json index d640997cb..2938557e6 100644 --- a/tests/result_tutorial/090/doc.json +++ b/tests/result_tutorial/090/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -291,14 +273,7 @@ "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -340,43 +315,5 @@ } } } - }, - "auto": { - "path": "auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } } } \ No newline at end of file diff --git a/tests/result_tutorial/090/doc.sh b/tests/result_tutorial/090/doc.sh index 5c1a0c937..3e0bb71f1 100644 --- a/tests/result_tutorial/090/doc.sh +++ b/tests/result_tutorial/090/doc.sh @@ -98,12 +98,9 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ @@ -113,9 +110,7 @@ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ @@ -123,21 +118,3 @@ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ -โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ -โ”‚ โ”‚ URL". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/090/doc_changelog.sh b/tests/result_tutorial/090/doc_changelog.sh index fb09a10d9..428c2e7a7 100644 --- a/tests/result_tutorial/090/doc_changelog.sh +++ b/tests/result_tutorial/090/doc_changelog.sh @@ -1,20 +1,24 @@ -New variable +Modified variables โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  mandatory   domainname   standard  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ -โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ -โ”‚ โ”‚ URL". โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: the value of the variable  โ”‚ +โ”‚ โ”‚ "HTTP proxy port"  โ”‚ +โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ 1080 โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/102/doc.json b/tests/result_tutorial/091/doc.json similarity index 76% rename from tests/result_tutorial/102/doc.json rename to tests/result_tutorial/091/doc.json index 6165cb16b..b7b8e074a 100644 --- a/tests/result_tutorial/102/doc.json +++ b/tests/result_tutorial/091/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -340,83 +341,5 @@ } } } - }, - "auto": { - "path": "auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } - }, - "no_proxy": { - "path": "no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - }, - "multiple": true } } \ No newline at end of file diff --git a/tests/result_tutorial/102/doc.sh b/tests/result_tutorial/091/doc.sh similarity index 75% rename from tests/result_tutorial/102/doc.sh rename to tests/result_tutorial/091/doc.sh index 33f9317f6..fca7010a8 100644 --- a/tests/result_tutorial/102/doc.sh +++ b/tests/result_tutorial/091/doc.sh @@ -98,61 +98,31 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ -โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ -โ”‚ โ”‚ URL". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ -โ”‚ disabled   unique  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/091/doc_changelog.sh b/tests/result_tutorial/091/doc_changelog.sh new file mode 100644 index 000000000..1f53521cc --- /dev/null +++ b/tests/result_tutorial/091/doc_changelog.sh @@ -0,0 +1,29 @@ +Modified variables + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS  โ”‚ +โ”‚ โ”‚ proxy address"  โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ +โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS  โ”‚ +โ”‚ โ”‚ proxy address"  โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/100/doc.json b/tests/result_tutorial/100/doc.json index 5c37d0df9..08ad8157e 100644 --- a/tests/result_tutorial/100/doc.json +++ b/tests/result_tutorial/100/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -378,44 +379,5 @@ "the domain name can be a hostname" ] } - }, - "no_proxy": { - "path": "no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - } } } \ No newline at end of file diff --git a/tests/result_tutorial/100/doc.sh b/tests/result_tutorial/100/doc.sh index 54b3e2fd6..97018774d 100644 --- a/tests/result_tutorial/100/doc.sh +++ b/tests/result_tutorial/100/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -139,20 +142,5 @@ โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ โ”‚ โ”‚ URL". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  domainname   basic   mandatory    โ”‚ desactivated. โ”‚ -โ”‚ disabled  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/100/doc_changelog.sh b/tests/result_tutorial/100/doc_changelog.sh index 7e36eebab..fb09a10d9 100644 --- a/tests/result_tutorial/100/doc_changelog.sh +++ b/tests/result_tutorial/100/doc_changelog.sh @@ -3,19 +3,18 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  domainname   basic   mandatory    โ”‚ desactivated. โ”‚ -โ”‚ disabled  โ”‚ Validators: โ”‚ +โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ +โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ +โ”‚ โ”‚ URL". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/101/doc.json b/tests/result_tutorial/101/doc.json deleted file mode 100644 index 34b139cca..000000000 --- a/tests/result_tutorial/101/doc.json +++ /dev/null @@ -1,428 +0,0 @@ -{ - "proxy_mode": { - "path": "proxy_mode", - "name": "proxy_mode", - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "No proxy" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "No proxy", - "Auto-detect proxy settings for this network", - "Use system proxy settings", - "Manual proxy configuration", - "Automatic proxy configuration URL" - ] - } - }, - "manual": { - "type": "family", - "informations": { - "path": "manual", - "name": "manual", - "description": "Manual proxy configuration", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic" - }, - "children": { - "http_proxy": { - "type": "family", - "informations": { - "path": "manual.http_proxy", - "name": "http_proxy", - "description": "HTTP Proxy", - "properties": [], - "mode": "basic" - }, - "children": { - "address": { - "path": "manual.http_proxy.address", - "name": "address", - "description": "HTTP proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.http_proxy.port", - "name": "port", - "description": "HTTP proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "use_for_https": { - "path": "manual.use_for_https", - "name": "use_for_https", - "description": "Also use this proxy for HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "https_proxy": { - "type": "family", - "informations": { - "path": "manual.https_proxy", - "name": "https_proxy", - "description": "HTTPS Proxy", - "properties": [ - { - "type": "property", - "name": "hidden", - "ori_name": "hidden", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"true\".", - "path": { - "path": "manual.use_for_https" - }, - "description": "Also use this proxy for HTTPS" - } - } - ], - "mode": "standard" - }, - "children": { - "address": { - "path": "manual.https_proxy.address", - "name": "address", - "description": "HTTPS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.https_proxy.port", - "name": "port", - "description": "HTTPS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "socks_proxy": { - "type": "family", - "informations": { - "path": "manual.socks_proxy", - "name": "socks_proxy", - "description": "SOCKS Proxy", - "properties": [], - "mode": "standard" - }, - "children": { - "address": { - "path": "manual.socks_proxy.address", - "name": "address", - "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.socks_proxy.port", - "name": "port", - "description": "SOCKS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "version": { - "path": "manual.socks_proxy.version", - "name": "version", - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - } - } - } - } - } - }, - "auto": { - "path": "auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } - }, - "no_proxy": { - "path": "no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - }, - "multiple": true - } -} \ No newline at end of file diff --git a/tests/result_tutorial/101/doc.sh b/tests/result_tutorial/101/doc.sh deleted file mode 100644 index a5d832e6c..000000000 --- a/tests/result_tutorial/101/doc.sh +++ /dev/null @@ -1,158 +0,0 @@ -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ proxy_mode โ”‚ Configure Proxy Access to the โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ 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 - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ Path: manual -โ–Œ  basic   disabled  -โ–Œ Disabled: when the variable "Configure Proxy Access to the Internet" -โ–Œ (proxy_mode) hasn't the value "Manual proxy configuration". - - HTTP Proxy - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ Path: manual.http_proxy -โ–Œ  basic  - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ -โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: 8080 โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ -โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - - HTTPS Proxy - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ Path: manual.https_proxy -โ–Œ  standard   hidden  -โ–Œ Hidden: when the variable "Also use this proxy for HTTPS" -โ–Œ (manual.use_for_https) has the value "true". - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - - SOCKS Proxy - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ Path: manual.socks_proxy -โ–Œ  standard  - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ -โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ -โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ -โ”‚ โ”‚ URL". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  domainname   multiple   basic    โ”‚ desactivated. โ”‚ -โ”‚ mandatory   disabled   unique  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/101/doc_changelog.sh b/tests/result_tutorial/101/doc_changelog.sh deleted file mode 100644 index 210559688..000000000 --- a/tests/result_tutorial/101/doc_changelog.sh +++ /dev/null @@ -1,21 +0,0 @@ -Modified variable - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  multiple   domainname   basic    โ”‚ desactivated. โ”‚ -โ”‚ mandatory   disabled   unique  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/102/doc_changelog.sh b/tests/result_tutorial/102/doc_changelog.sh deleted file mode 100644 index 1a9332e53..000000000 --- a/tests/result_tutorial/102/doc_changelog.sh +++ /dev/null @@ -1,21 +0,0 @@ -Modified variable - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  basic   standard   mandatory    โ”‚ desactivated. โ”‚ -โ”‚ domainname   multiple   standard    โ”‚ Validators: โ”‚ -โ”‚ disabled   unique  โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/103/doc_changelog.sh b/tests/result_tutorial/103/doc_changelog.sh deleted file mode 100644 index 496fdbc57..000000000 --- a/tests/result_tutorial/103/doc_changelog.sh +++ /dev/null @@ -1,25 +0,0 @@ -Modified variable - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ -โ”‚ disabled   unique  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Examples: โ”‚ -โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ -โ”‚ โ”‚ โ€ข .net.nz โ”‚ -โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/110/doc.json b/tests/result_tutorial/110/doc.json index d23252f26..69f06ad2d 100644 --- a/tests/result_tutorial/110/doc.json +++ b/tests/result_tutorial/110/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -383,9 +384,6 @@ "path": "no_proxy", "name": "no_proxy", "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], "properties": [ { "type": "property", @@ -399,12 +397,6 @@ }, "description": "Configure Proxy Access to the Internet" } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false } ], "mode": "standard", @@ -419,48 +411,6 @@ "the domain name can be an IP", "the domain name can be network in CIDR format" ] - }, - "multiple": true, - "examples": { - "name": "Examples", - "values": [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] } - }, - "prompt_authentication": { - "path": "prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/110/doc.sh b/tests/result_tutorial/110/doc.sh index beeb2005c..f42be4336 100644 --- a/tests/result_tutorial/110/doc.sh +++ b/tests/result_tutorial/110/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -141,10 +144,7 @@ โ”‚ โ”‚ URL". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ -โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ -โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ -โ”‚ โ”‚ proxied. โ”‚ +โ”‚  domainname   standard   disabled  โ”‚ desactivated. โ”‚ โ”‚ โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ @@ -153,18 +153,6 @@ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Examples: โ”‚ -โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ -โ”‚ โ”‚ โ€ข .net.nz โ”‚ -โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ -โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ -โ”‚ disabled  โ”‚ Default: true โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ diff --git a/tests/result_tutorial/110/doc_changelog.sh b/tests/result_tutorial/110/doc_changelog.sh index 8d778fe03..7a9f83cb4 100644 --- a/tests/result_tutorial/110/doc_changelog.sh +++ b/tests/result_tutorial/110/doc_changelog.sh @@ -3,9 +3,16 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ -โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ -โ”‚ disabled  โ”‚ Default: true โ”‚ +โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚  domainname   standard   disabled  โ”‚ desactivated. โ”‚ +โ”‚ โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ +โ”‚ โ”‚ dot โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ +โ”‚ โ”‚ CIDR format โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ diff --git a/tests/result_tutorial/111/doc.json b/tests/result_tutorial/111/doc.json index af137a65b..d082ffc56 100644 --- a/tests/result_tutorial/111/doc.json +++ b/tests/result_tutorial/111/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -383,9 +384,6 @@ "path": "no_proxy", "name": "no_proxy", "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], "properties": [ { "type": "property", @@ -420,67 +418,6 @@ "the domain name can be network in CIDR format" ] }, - "multiple": true, - "examples": { - "name": "Examples", - "values": [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - } - }, - "prompt_authentication": { - "path": "prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "proxy_dns_socks5": { - "path": "proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" + "multiple": true } } \ No newline at end of file diff --git a/tests/result_tutorial/111/doc.sh b/tests/result_tutorial/111/doc.sh index 3cfb78270..109ec7b31 100644 --- a/tests/result_tutorial/111/doc.sh +++ b/tests/result_tutorial/111/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -142,10 +145,7 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ -โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ -โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ -โ”‚ โ”‚ proxied. โ”‚ -โ”‚ โ”‚ Validators: โ”‚ +โ”‚ disabled   unique  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ โ”‚ โ”‚ dot โ”‚ @@ -153,24 +153,9 @@ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Examples: โ”‚ -โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ -โ”‚ โ”‚ โ€ข .net.nz โ”‚ -โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ โ”‚ โ”‚ "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ -โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ -โ”‚ disabled  โ”‚ Default: true โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ -โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/111/doc_changelog.sh b/tests/result_tutorial/111/doc_changelog.sh index 8e1df076f..c2e628d3c 100644 --- a/tests/result_tutorial/111/doc_changelog.sh +++ b/tests/result_tutorial/111/doc_changelog.sh @@ -1,9 +1,21 @@ -New variable +Modified variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ -โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ +โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚  multiple   domainname   standard    โ”‚ desactivated. โ”‚ +โ”‚ disabled   unique  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ +โ”‚ โ”‚ dot โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ +โ”‚ โ”‚ CIDR format โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/120/doc.json b/tests/result_tutorial/120/doc.json index db23ae9dd..fdd81c7f2 100644 --- a/tests/result_tutorial/120/doc.json +++ b/tests/result_tutorial/120/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -383,9 +384,6 @@ "path": "no_proxy", "name": "no_proxy", "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], "properties": [ { "type": "property", @@ -429,78 +427,5 @@ "192.168.1.0/24" ] } - }, - "prompt_authentication": { - "path": "prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "proxy_dns_socks5": { - "path": "proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", - "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, - { - "path": "manual.socks_proxy.version", - "description": "SOCKS host version used by proxy" - } - ], - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/120/doc.sh b/tests/result_tutorial/120/doc.sh index 741cc2526..1a8ec43b0 100644 --- a/tests/result_tutorial/120/doc.sh +++ b/tests/result_tutorial/120/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -142,10 +145,7 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ -โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ -โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ -โ”‚ โ”‚ proxied. โ”‚ -โ”‚ โ”‚ Validators: โ”‚ +โ”‚ disabled   unique  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ โ”‚ โ”‚ dot โ”‚ @@ -161,22 +161,5 @@ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ โ”‚ โ”‚ "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ -โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ -โ”‚ disabled  โ”‚ Default: true โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ -โ”‚  boolean   standard   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ 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/tests/result_tutorial/120/doc_changelog.sh b/tests/result_tutorial/120/doc_changelog.sh index e69de29bb..496fdbc57 100644 --- a/tests/result_tutorial/120/doc_changelog.sh +++ b/tests/result_tutorial/120/doc_changelog.sh @@ -0,0 +1,25 @@ +Modified variable + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ +โ”‚ disabled   unique  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ +โ”‚ โ”‚ dot โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ +โ”‚ โ”‚ CIDR format โ”‚ +โ”‚ โ”‚ Examples: โ”‚ +โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ +โ”‚ โ”‚ โ€ข .net.nz โ”‚ +โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/104/doc.json b/tests/result_tutorial/121/doc.json similarity index 92% rename from tests/result_tutorial/104/doc.json rename to tests/result_tutorial/121/doc.json index 8ca8e4c1f..49e8cd88b 100644 --- a/tests/result_tutorial/104/doc.json +++ b/tests/result_tutorial/121/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", diff --git a/tests/result_tutorial/104/doc.sh b/tests/result_tutorial/121/doc.sh similarity index 93% rename from tests/result_tutorial/104/doc.sh rename to tests/result_tutorial/121/doc.sh index e1ad65333..e8d25c4f9 100644 --- a/tests/result_tutorial/104/doc.sh +++ b/tests/result_tutorial/121/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ diff --git a/tests/result_tutorial/104/doc_changelog.sh b/tests/result_tutorial/121/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/104/doc_changelog.sh rename to tests/result_tutorial/121/doc_changelog.sh diff --git a/tests/result_tutorial/130/doc.json b/tests/result_tutorial/130/doc.json index 33e1d8500..d15687a91 100644 --- a/tests/result_tutorial/130/doc.json +++ b/tests/result_tutorial/130/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -462,45 +463,5 @@ "values": true }, "variable_type": "boolean" - }, - "proxy_dns_socks5": { - "path": "proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", - "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, - { - "path": "manual.socks_proxy.version", - "description": "SOCKS host version used by proxy" - } - ], - "type": "jinja" - } - } - ], - "mode": "advanced", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/130/doc.sh b/tests/result_tutorial/130/doc.sh index 231aba55d..77620865d 100644 --- a/tests/result_tutorial/130/doc.sh +++ b/tests/result_tutorial/130/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -169,14 +172,5 @@ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ โ”‚ โ”‚ "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ -โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ 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/tests/result_tutorial/130/doc_changelog.sh b/tests/result_tutorial/130/doc_changelog.sh index ce67879f3..8d778fe03 100644 --- a/tests/result_tutorial/130/doc_changelog.sh +++ b/tests/result_tutorial/130/doc_changelog.sh @@ -1,15 +1,14 @@ -Modified variable +New variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ -โ”‚  standard   advanced   boolean    โ”‚ Default: false โ”‚ -โ”‚ advanced   mandatory   disabled  โ”‚ 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". โ”‚ +โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ +โ”‚ disabled  โ”‚ Default: true โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/103/doc.json b/tests/result_tutorial/131/doc.json similarity index 82% rename from tests/result_tutorial/103/doc.json rename to tests/result_tutorial/131/doc.json index 5da886d22..c8cdfc8cb 100644 --- a/tests/result_tutorial/103/doc.json +++ b/tests/result_tutorial/131/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -383,6 +384,9 @@ "path": "no_proxy", "name": "no_proxy", "description": "Address for which proxy will be desactivated.", + "help": [ + "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." + ], "properties": [ { "type": "property", @@ -426,5 +430,58 @@ "192.168.1.0/24" ] } + }, + "prompt_authentication": { + "path": "prompt_authentication", + "name": "prompt_authentication", + "description": "Prompt for authentication if password is saved.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "proxy_dns_socks5": { + "path": "proxy_dns_socks5", + "name": "proxy_dns_socks5", + "description": "Use proxy DNS when using SOCKS v5.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/103/doc.sh b/tests/result_tutorial/131/doc.sh similarity index 84% rename from tests/result_tutorial/103/doc.sh rename to tests/result_tutorial/131/doc.sh index 279bcce12..097cd85b7 100644 --- a/tests/result_tutorial/103/doc.sh +++ b/tests/result_tutorial/131/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -142,7 +145,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ -โ”‚ disabled   unique  โ”‚ Validators: โ”‚ +โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ +โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ +โ”‚ โ”‚ proxied. โ”‚ +โ”‚ โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ โ”‚ โ”‚ dot โ”‚ @@ -158,5 +164,16 @@ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ โ”‚ โ”‚ "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ +โ”‚ disabled  โ”‚ Default: true โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/131/doc_changelog.sh b/tests/result_tutorial/131/doc_changelog.sh new file mode 100644 index 000000000..8e1df076f --- /dev/null +++ b/tests/result_tutorial/131/doc_changelog.sh @@ -0,0 +1,9 @@ +New variable + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/112/doc.json b/tests/result_tutorial/132/doc.json similarity index 93% rename from tests/result_tutorial/112/doc.json rename to tests/result_tutorial/132/doc.json index db23ae9dd..63028886a 100644 --- a/tests/result_tutorial/112/doc.json +++ b/tests/result_tutorial/132/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", diff --git a/tests/result_tutorial/112/doc.sh b/tests/result_tutorial/132/doc.sh similarity index 93% rename from tests/result_tutorial/112/doc.sh rename to tests/result_tutorial/132/doc.sh index 741cc2526..638a872a2 100644 --- a/tests/result_tutorial/112/doc.sh +++ b/tests/result_tutorial/132/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ diff --git a/tests/result_tutorial/112/doc_changelog.sh b/tests/result_tutorial/132/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/112/doc_changelog.sh rename to tests/result_tutorial/132/doc_changelog.sh diff --git a/tests/result_tutorial/140/doc.json b/tests/result_tutorial/140/doc.json index 703ad35e0..63028886a 100644 --- a/tests/result_tutorial/140/doc.json +++ b/tests/result_tutorial/140/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -495,44 +496,12 @@ } } ], - "mode": "advanced", + "mode": "standard", "type": "variable", "default": { "name": "Default", "values": false }, "variable_type": "boolean" - }, - "dns_over_https": { - "type": "family", - "informations": { - "path": "dns_over_https", - "name": "dns_over_https", - "description": "DNS over HTTPS", - "properties": [], - "mode": "standard" - }, - "children": { - "enable_dns_over_https": { - "path": "dns_over_https.enable_dns_over_https", - "name": "enable_dns_over_https", - "description": "Enable DNS over HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - } - } } } \ No newline at end of file diff --git a/tests/result_tutorial/140/doc.sh b/tests/result_tutorial/140/doc.sh index 15d509f61..638a872a2 100644 --- a/tests/result_tutorial/140/doc.sh +++ b/tests/result_tutorial/140/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -171,7 +174,7 @@ โ”‚ โ”‚ "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ -โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ +โ”‚  boolean   standard   mandatory    โ”‚ Default: false โ”‚ โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ โ”‚ โ”‚ to the Internet" (proxy_mode) is not โ”‚ โ”‚ โ”‚ "Manual proxy configuration" โ”‚ @@ -180,17 +183,3 @@ โ”‚ โ”‚ is "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -DNS over HTTPS - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ Path: dns_over_https -โ–Œ  standard  - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ -โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/140/doc_changelog.sh b/tests/result_tutorial/140/doc_changelog.sh index a0a0ee75c..e69de29bb 100644 --- a/tests/result_tutorial/140/doc_changelog.sh +++ b/tests/result_tutorial/140/doc_changelog.sh @@ -1,9 +0,0 @@ -New variable - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ -โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/141/doc.json b/tests/result_tutorial/141/doc.json deleted file mode 100644 index 5bc90465a..000000000 --- a/tests/result_tutorial/141/doc.json +++ /dev/null @@ -1,579 +0,0 @@ -{ - "proxy_mode": { - "path": "proxy_mode", - "name": "proxy_mode", - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "No proxy" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "No proxy", - "Auto-detect proxy settings for this network", - "Use system proxy settings", - "Manual proxy configuration", - "Automatic proxy configuration URL" - ] - } - }, - "manual": { - "type": "family", - "informations": { - "path": "manual", - "name": "manual", - "description": "Manual proxy configuration", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic" - }, - "children": { - "http_proxy": { - "type": "family", - "informations": { - "path": "manual.http_proxy", - "name": "http_proxy", - "description": "HTTP Proxy", - "properties": [], - "mode": "basic" - }, - "children": { - "address": { - "path": "manual.http_proxy.address", - "name": "address", - "description": "HTTP proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.http_proxy.port", - "name": "port", - "description": "HTTP proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "use_for_https": { - "path": "manual.use_for_https", - "name": "use_for_https", - "description": "Also use this proxy for HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "https_proxy": { - "type": "family", - "informations": { - "path": "manual.https_proxy", - "name": "https_proxy", - "description": "HTTPS Proxy", - "properties": [ - { - "type": "property", - "name": "hidden", - "ori_name": "hidden", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"true\".", - "path": { - "path": "manual.use_for_https" - }, - "description": "Also use this proxy for HTTPS" - } - } - ], - "mode": "standard" - }, - "children": { - "address": { - "path": "manual.https_proxy.address", - "name": "address", - "description": "HTTPS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.https_proxy.port", - "name": "port", - "description": "HTTPS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "socks_proxy": { - "type": "family", - "informations": { - "path": "manual.socks_proxy", - "name": "socks_proxy", - "description": "SOCKS Proxy", - "properties": [], - "mode": "standard" - }, - "children": { - "address": { - "path": "manual.socks_proxy.address", - "name": "address", - "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.socks_proxy.port", - "name": "port", - "description": "SOCKS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "version": { - "path": "manual.socks_proxy.version", - "name": "version", - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - } - } - } - } - } - }, - "auto": { - "path": "auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } - }, - "no_proxy": { - "path": "no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - }, - "multiple": true, - "examples": { - "name": "Examples", - "values": [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - } - }, - "prompt_authentication": { - "path": "prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "proxy_dns_socks5": { - "path": "proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", - "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, - { - "path": "manual.socks_proxy.version", - "description": "SOCKS host version used by proxy" - } - ], - "type": "jinja" - } - } - ], - "mode": "advanced", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "dns_over_https": { - "type": "family", - "informations": { - "path": "dns_over_https", - "name": "dns_over_https", - "description": "DNS over HTTPS", - "properties": [], - "mode": "standard" - }, - "children": { - "enable_dns_over_https": { - "path": "dns_over_https.enable_dns_over_https", - "name": "enable_dns_over_https", - "description": "Enable DNS over HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "provider": { - "path": "dns_over_https.provider", - "name": "provider", - "description": "Use Provider.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"false\".", - "path": { - "path": "dns_over_https.enable_dns_over_https" - }, - "description": "Enable DNS over HTTPS" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] - } - } - } - } -} \ No newline at end of file diff --git a/tests/result_tutorial/141/doc_changelog.sh b/tests/result_tutorial/141/doc_changelog.sh deleted file mode 100644 index f9f78a3af..000000000 --- a/tests/result_tutorial/141/doc_changelog.sh +++ /dev/null @@ -1,16 +0,0 @@ -New variable - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ dns_over_https.provider โ”‚ Use Provider. โ”‚ -โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ -โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ -โ”‚ โ”‚ โ€ข NextDNS โ”‚ -โ”‚ โ”‚ โ€ข Custom โ”‚ -โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ -โ”‚ โ”‚ DNS over HTTPS" โ”‚ -โ”‚ โ”‚ (dns_over_https.enable_dns_over_httโ€ฆ โ”‚ -โ”‚ โ”‚ has the value "false". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/150/doc.json b/tests/result_tutorial/150/doc.json index aaf56ad35..90d123139 100644 --- a/tests/result_tutorial/150/doc.json +++ b/tests/result_tutorial/150/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -502,123 +503,5 @@ "values": false }, "variable_type": "boolean" - }, - "dns_over_https": { - "type": "family", - "informations": { - "path": "dns_over_https", - "name": "dns_over_https", - "description": "DNS over HTTPS", - "properties": [], - "mode": "basic" - }, - "children": { - "enable_dns_over_https": { - "path": "dns_over_https.enable_dns_over_https", - "name": "enable_dns_over_https", - "description": "Enable DNS over HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "provider": { - "path": "dns_over_https.provider", - "name": "provider", - "description": "Use Provider.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"false\".", - "path": { - "path": "dns_over_https.enable_dns_over_https" - }, - "description": "Enable DNS over HTTPS" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] - } - }, - "custom_dns_url": { - "path": "dns_over_https.custom_dns_url", - "name": "custom_dns_url", - "description": "Custom DNS URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Custom\".", - "variables": [ - { - "path": "dns_over_https.provider", - "description": "Use Provider" - } - ], - "type": "jinja" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only", - "type": "jinja" - } - ] - } - } - } } } \ No newline at end of file diff --git a/tests/result_tutorial/150/doc.sh b/tests/result_tutorial/150/doc.sh index 6d278b2d8..5958a0f4d 100644 --- a/tests/result_tutorial/150/doc.sh +++ b/tests/result_tutorial/150/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -180,40 +183,3 @@ โ”‚ โ”‚ is "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -DNS over HTTPS - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ Path: dns_over_https -โ–Œ  basic  - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ -โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ dns_over_https.provider โ”‚ Use Provider. โ”‚ -โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ -โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ -โ”‚ โ”‚ โ€ข NextDNS โ”‚ -โ”‚ โ”‚ โ€ข Custom โ”‚ -โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ -โ”‚ โ”‚ DNS over HTTPS" โ”‚ -โ”‚ โ”‚ (dns_over_https.enable_dns_over_httโ€ฆ โ”‚ -โ”‚ โ”‚ has the value "false". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ -โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ -โ”‚ โ”‚ (dns_over_https.provider) is not โ”‚ -โ”‚ โ”‚ "Custom". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/150/doc_changelog.sh b/tests/result_tutorial/150/doc_changelog.sh index f2c930254..ce67879f3 100644 --- a/tests/result_tutorial/150/doc_changelog.sh +++ b/tests/result_tutorial/150/doc_changelog.sh @@ -3,17 +3,13 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ -โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ -โ”‚ โ”‚ (dns_over_https.provider) is not โ”‚ -โ”‚ โ”‚ "Custom". โ”‚ +โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚  standard   advanced   boolean    โ”‚ Default: false โ”‚ +โ”‚ advanced   mandatory   disabled  โ”‚ 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/tests/result_tutorial/160/doc.json b/tests/result_tutorial/160/doc.json index 303f205ed..9ddc5bb61 100644 --- a/tests/result_tutorial/160/doc.json +++ b/tests/result_tutorial/160/doc.json @@ -1,138 +1,95 @@ { - "firefox": { - "type": "namespace", - "informations": { - "path": "firefox", - "name": "firefox", - "description": "Firefox", - "properties": [], - "mode": "basic", - "help": [ - "This family is a namespace" + "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "No proxy" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "No proxy", + "Auto-detect proxy settings for this network", + "Use system proxy settings", + "Manual proxy configuration", + "Automatic proxy configuration URL" ] + } + }, + "manual": { + "type": "family", + "informations": { + "path": "manual", + "name": "manual", + "description": "Manual proxy configuration", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic" }, "children": { - "proxy_mode": { - "path": "firefox.proxy_mode", - "name": "proxy_mode", - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "No proxy" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "No proxy", - "Auto-detect proxy settings for this network", - "Use system proxy settings", - "Manual proxy configuration", - "Automatic proxy configuration URL" - ] - } - }, - "manual": { + "http_proxy": { "type": "family", "informations": { - "path": "firefox.manual", - "name": "manual", - "description": "Manual proxy configuration", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], + "path": "manual.http_proxy", + "name": "http_proxy", + "description": "HTTP Proxy", + "properties": [], "mode": "basic" }, "children": { - "http_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.http_proxy", - "name": "http_proxy", - "description": "HTTP Proxy", - "properties": [], - "mode": "basic" - }, - "children": { - "address": { - "path": "firefox.manual.http_proxy.address", - "name": "address", - "description": "HTTP proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.http_proxy.port", - "name": "port", - "description": "HTTP proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } + "address": { + "path": "manual.http_proxy.address", + "name": "address", + "description": "HTTP proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false } + ], + "mode": "basic", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] } }, - "use_for_https": { - "path": "firefox.manual.use_for_https", - "name": "use_for_https", - "description": "Also use this proxy for HTTPS.", + "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP proxy port.", "properties": [ { "type": "property", @@ -145,327 +102,30 @@ "type": "variable", "default": { "name": "Default", - "values": true + "values": "8080" }, - "variable_type": "boolean" - }, - "https_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.https_proxy", - "name": "https_proxy", - "description": "HTTPS Proxy", - "properties": [ - { - "type": "property", - "name": "hidden", - "ori_name": "hidden", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"true\".", - "path": { - "path": "firefox.manual.use_for_https" - }, - "description": "Also use this proxy for HTTPS" - } - } - ], - "mode": "standard" - }, - "children": { - "address": { - "path": "firefox.manual.https_proxy.address", - "name": "address", - "description": "HTTPS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.https_proxy.port", - "name": "port", - "description": "HTTPS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "socks_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.socks_proxy", - "name": "socks_proxy", - "description": "SOCKS Proxy", - "properties": [], - "mode": "standard" - }, - "children": { - "address": { - "path": "firefox.manual.socks_proxy.address", - "name": "address", - "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.socks_proxy.port", - "name": "port", - "description": "SOCKS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "version": { - "path": "firefox.manual.socks_proxy.version", - "name": "version", - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - } - } + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] } } } }, - "auto": { - "path": "firefox.auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", + "use_for_https": { + "path": "manual.use_for_https", + "name": "use_for_https", + "description": "Also use this proxy for HTTPS.", "properties": [ { "type": "property", "name": "mandatory", "ori_name": "mandatory", "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } - }, - "no_proxy": { - "path": "firefox.no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - }, - "multiple": true, - "examples": { - "name": "Examples", - "values": [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - } - }, - "prompt_authentication": { - "path": "firefox.prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } } ], "mode": "standard", @@ -476,60 +136,34 @@ }, "variable_type": "boolean" }, - "proxy_dns_socks5": { - "path": "firefox.proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", - "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, - { - "path": "firefox.manual.socks_proxy.version", - "description": "SOCKS host version used by proxy" - } - ], - "type": "jinja" - } - } - ], - "mode": "advanced", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "dns_over_https": { + "https_proxy": { "type": "family", "informations": { - "path": "firefox.dns_over_https", - "name": "dns_over_https", - "description": "DNS over HTTPS", - "properties": [], - "mode": "basic" + "path": "manual.https_proxy", + "name": "https_proxy", + "description": "HTTPS Proxy", + "properties": [ + { + "type": "property", + "name": "hidden", + "ori_name": "hidden", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"true\".", + "path": { + "path": "manual.use_for_https" + }, + "description": "Also use this proxy for HTTPS" + } + } + ], + "mode": "standard" }, "children": { - "enable_dns_over_https": { - "path": "firefox.dns_over_https.enable_dns_over_https", - "name": "enable_dns_over_https", - "description": "Enable DNS over HTTPS.", + "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "HTTPS proxy address.", "properties": [ { "type": "property", @@ -542,98 +176,364 @@ "type": "variable", "default": { "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "provider": { - "path": "firefox.dns_over_https.provider", - "name": "provider", - "description": "Use Provider.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"false\".", - "path": { - "path": "firefox.dns_over_https.enable_dns_over_https" - }, - "description": "Enable DNS over HTTPS" - } + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "manual.http_proxy.address", + "type": "variable" + }, + "description": "HTTP proxy address" } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Cloudflare" }, - "variable_type": "choice", - "choices": { - "name": "Choices", + "variable_type": "domainname", + "validators": { + "name": "Validators", "values": [ - "Cloudflare", - "NextDNS", - "Custom" + "type domainname", + "the domain name can be an IP" ] } }, - "custom_dns_url": { - "path": "firefox.dns_over_https.custom_dns_url", - "name": "custom_dns_url", - "description": "Custom DNS URL.", + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "HTTPS proxy port.", "properties": [ { "type": "property", "name": "mandatory", "ori_name": "mandatory", "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Custom\".", - "variables": [ - { - "path": "firefox.dns_over_https.provider", - "description": "Use Provider" - } - ], - "type": "jinja" - } } ], - "mode": "basic", + "mode": "standard", "type": "variable", - "variable_type": "web address", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "manual.http_proxy.port", + "type": "variable" + }, + "description": "HTTP proxy port" + } + }, + "variable_type": "port", "validators": { "name": "Validators", "values": [ "well-known ports (1 to 1023) are allowed", "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "socks_proxy": { + "type": "family", + "informations": { + "path": "manual.socks_proxy", + "name": "socks_proxy", + "description": "SOCKS Proxy", + "properties": [], + "mode": "standard" + }, + "children": { + "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "SOCKS proxy address.", + "properties": [], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only", - "type": "jinja" + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "SOCKS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "1080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" ] } } } } } + }, + "auto": { + "path": "auto", + "name": "auto", + "description": "Automatic proxy configuration URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + }, + "no_proxy": { + "path": "no_proxy", + "name": "no_proxy", + "description": "Address for which proxy will be desactivated.", + "help": [ + "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." + ], + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, + "multiple": true, + "examples": { + "name": "Examples", + "values": [ + ".mozilla.org", + ".net.nz", + "192.168.1.0/24" + ] + } + }, + "prompt_authentication": { + "path": "prompt_authentication", + "name": "prompt_authentication", + "description": "Prompt for authentication if password is saved.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "proxy_dns_socks5": { + "path": "proxy_dns_socks5", + "name": "proxy_dns_socks5", + "description": "Use proxy DNS when using SOCKS v5.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "variables": [ + { + "path": "proxy_mode", + "description": "Configure Proxy Access to the Internet" + }, + { + "path": "manual.socks_proxy.version", + "description": "SOCKS host version used by proxy" + } + ], + "type": "jinja" + } + } + ], + "mode": "advanced", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "dns_over_https": { + "type": "family", + "informations": { + "path": "dns_over_https", + "name": "dns_over_https", + "description": "DNS over HTTPS", + "properties": [], + "mode": "standard" + }, + "children": { + "enable_dns_over_https": { + "path": "dns_over_https.enable_dns_over_https", + "name": "enable_dns_over_https", + "description": "Enable DNS over HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + } + } } } \ No newline at end of file diff --git a/tests/result_tutorial/160/doc.sh b/tests/result_tutorial/160/doc.sh index eadf804a6..bb09da909 100644 --- a/tests/result_tutorial/160/doc.sh +++ b/tests/result_tutorial/160/doc.sh @@ -1,15 +1,7 @@ -Firefox - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family is a namespace. -โ–Œ Path: firefox -โ–Œ  basic  - โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ +โ”‚ proxy_mode โ”‚ Configure Proxy Access to the โ”‚ โ”‚  choice   standard   mandatory  โ”‚ Internet. โ”‚ โ”‚ โ”‚ Choices: โ”‚ โ”‚ โ”‚ โ€ข No proxy โ† (default) โ”‚ @@ -20,31 +12,31 @@ โ”‚ โ”‚ โ€ข Automatic proxy configuration URL โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - Manual proxy configuration +Manual proxy configuration โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual +โ–Œ Path: manual โ–Œ  basic   disabled  โ–Œ Disabled: when the variable "Configure Proxy Access to the Internet" -โ–Œ (firefox.proxy_mode) hasn't the value "Manual proxy configuration". +โ–Œ (proxy_mode) hasn't the value "Manual proxy configuration". - HTTP Proxy + HTTP Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.http_proxy +โ–Œ Path: manual.http_proxy โ–Œ  basic  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ +โ”‚ manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ +โ”‚ manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -58,31 +50,31 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ +โ”‚ manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - HTTPS Proxy + HTTPS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.https_proxy +โ–Œ Path: manual.https_proxy โ–Œ  standard   hidden  โ–Œ Hidden: when the variable "Also use this proxy for HTTPS" -โ–Œ (firefox.manual.use_for_https) has the value "true". +โ–Œ (manual.use_for_https) has the value "true". โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ +โ”‚ manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ +โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ +โ”‚ manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -92,49 +84,52 @@ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - SOCKS Proxy + SOCKS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.socks_proxy +โ–Œ Path: manual.socks_proxy โ–Œ  standard  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -144,11 +139,11 @@ โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ -โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ -โ”‚ โ”‚ configuration URL". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ +โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ +โ”‚ โ”‚ URL". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ @@ -167,63 +162,38 @@ โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ โ”‚ disabled  โ”‚ Default: true โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ +โ”‚ โ”‚ to the Internet" (proxy_mode) is not โ”‚ +โ”‚ โ”‚ "Manual proxy configuration" โ”‚ โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ -โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ +โ”‚ โ”‚ proxy" (manual.socks_proxy.version) โ”‚ โ”‚ โ”‚ is "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - DNS over HTTPS +DNS over HTTPS โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.dns_over_https -โ–Œ  basic  +โ–Œ Path: dns_over_https +โ–Œ  standard  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ -โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ -โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ -โ”‚ โ”‚ โ€ข NextDNS โ”‚ -โ”‚ โ”‚ โ€ข Custom โ”‚ -โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ -โ”‚ โ”‚ DNS over HTTPS" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ -โ”‚ โ”‚ has the value "false". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ -โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ -โ”‚ โ”‚ not "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/160/doc_changelog.sh b/tests/result_tutorial/160/doc_changelog.sh index 4ec7c8805..a0a0ee75c 100644 --- a/tests/result_tutorial/160/doc_changelog.sh +++ b/tests/result_tutorial/160/doc_changelog.sh @@ -1,180 +1,9 @@ -New variables +New variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Internet. โ”‚ -โ”‚ โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข No proxy โ† (default) โ”‚ -โ”‚ โ”‚ โ€ข Auto-detect proxy settings for โ”‚ -โ”‚ โ”‚ this network โ”‚ -โ”‚ โ”‚ โ€ข Use system proxy settings โ”‚ -โ”‚ โ”‚ โ€ข Manual proxy configuration โ”‚ -โ”‚ โ”‚ โ€ข Automatic proxy configuration URL โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ -โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: 8080 โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ -โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ -โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ -โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ -โ”‚ โ”‚ configuration URL". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ -โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ -โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ -โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ -โ”‚ โ”‚ proxied. โ”‚ -โ”‚ โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ -โ”‚ โ”‚ dot โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ -โ”‚ โ”‚ CIDR format โ”‚ -โ”‚ โ”‚ Examples: โ”‚ -โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ -โ”‚ โ”‚ โ€ข .net.nz โ”‚ -โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ -โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ -โ”‚ disabled  โ”‚ Default: true โ”‚ -โ”‚ โ”‚ Disabled: when the variable โ”‚ -โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ -โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ -โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ -โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ -โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ -โ”‚ โ”‚ โ€ข NextDNS โ”‚ -โ”‚ โ”‚ โ€ข Custom โ”‚ -โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ -โ”‚ โ”‚ DNS over HTTPS" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ -โ”‚ โ”‚ has the value "false". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ -โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ -โ”‚ โ”‚ not "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -Deleted variables - - -โ€ข proxy_mode -โ€ข manual.http_proxy.address -โ€ข manual.http_proxy.port -โ€ข manual.use_for_https -โ€ข manual.https_proxy.address -โ€ข manual.https_proxy.port -โ€ข manual.socks_proxy.address -โ€ข manual.socks_proxy.port -โ€ข manual.socks_proxy.version -โ€ข auto -โ€ข no_proxy -โ€ข prompt_authentication -โ€ข proxy_dns_socks5 -โ€ข dns_over_https.enable_dns_over_https -โ€ข dns_over_https.provider -โ€ข dns_over_https.custom_dns_url - diff --git a/tests/result_tutorial/161/doc.json b/tests/result_tutorial/161/doc.json index 303f205ed..2ac054b28 100644 --- a/tests/result_tutorial/161/doc.json +++ b/tests/result_tutorial/161/doc.json @@ -1,138 +1,95 @@ { - "firefox": { - "type": "namespace", - "informations": { - "path": "firefox", - "name": "firefox", - "description": "Firefox", - "properties": [], - "mode": "basic", - "help": [ - "This family is a namespace" + "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "No proxy" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "No proxy", + "Auto-detect proxy settings for this network", + "Use system proxy settings", + "Manual proxy configuration", + "Automatic proxy configuration URL" ] + } + }, + "manual": { + "type": "family", + "informations": { + "path": "manual", + "name": "manual", + "description": "Manual proxy configuration", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic" }, "children": { - "proxy_mode": { - "path": "firefox.proxy_mode", - "name": "proxy_mode", - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "No proxy" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "No proxy", - "Auto-detect proxy settings for this network", - "Use system proxy settings", - "Manual proxy configuration", - "Automatic proxy configuration URL" - ] - } - }, - "manual": { + "http_proxy": { "type": "family", "informations": { - "path": "firefox.manual", - "name": "manual", - "description": "Manual proxy configuration", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], + "path": "manual.http_proxy", + "name": "http_proxy", + "description": "HTTP Proxy", + "properties": [], "mode": "basic" }, "children": { - "http_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.http_proxy", - "name": "http_proxy", - "description": "HTTP Proxy", - "properties": [], - "mode": "basic" - }, - "children": { - "address": { - "path": "firefox.manual.http_proxy.address", - "name": "address", - "description": "HTTP proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.http_proxy.port", - "name": "port", - "description": "HTTP proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } + "address": { + "path": "manual.http_proxy.address", + "name": "address", + "description": "HTTP proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false } + ], + "mode": "basic", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] } }, - "use_for_https": { - "path": "firefox.manual.use_for_https", - "name": "use_for_https", - "description": "Also use this proxy for HTTPS.", + "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP proxy port.", "properties": [ { "type": "property", @@ -145,327 +102,30 @@ "type": "variable", "default": { "name": "Default", - "values": true + "values": "8080" }, - "variable_type": "boolean" - }, - "https_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.https_proxy", - "name": "https_proxy", - "description": "HTTPS Proxy", - "properties": [ - { - "type": "property", - "name": "hidden", - "ori_name": "hidden", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"true\".", - "path": { - "path": "firefox.manual.use_for_https" - }, - "description": "Also use this proxy for HTTPS" - } - } - ], - "mode": "standard" - }, - "children": { - "address": { - "path": "firefox.manual.https_proxy.address", - "name": "address", - "description": "HTTPS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.https_proxy.port", - "name": "port", - "description": "HTTPS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "socks_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.socks_proxy", - "name": "socks_proxy", - "description": "SOCKS Proxy", - "properties": [], - "mode": "standard" - }, - "children": { - "address": { - "path": "firefox.manual.socks_proxy.address", - "name": "address", - "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.socks_proxy.port", - "name": "port", - "description": "SOCKS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "version": { - "path": "firefox.manual.socks_proxy.version", - "name": "version", - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - } - } + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] } } } }, - "auto": { - "path": "firefox.auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", + "use_for_https": { + "path": "manual.use_for_https", + "name": "use_for_https", + "description": "Also use this proxy for HTTPS.", "properties": [ { "type": "property", "name": "mandatory", "ori_name": "mandatory", "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } - }, - "no_proxy": { - "path": "firefox.no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - }, - "multiple": true, - "examples": { - "name": "Examples", - "values": [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - } - }, - "prompt_authentication": { - "path": "firefox.prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } } ], "mode": "standard", @@ -476,10 +136,408 @@ }, "variable_type": "boolean" }, - "proxy_dns_socks5": { - "path": "firefox.proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", + "https_proxy": { + "type": "family", + "informations": { + "path": "manual.https_proxy", + "name": "https_proxy", + "description": "HTTPS Proxy", + "properties": [ + { + "type": "property", + "name": "hidden", + "ori_name": "hidden", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"true\".", + "path": { + "path": "manual.use_for_https" + }, + "description": "Also use this proxy for HTTPS" + } + } + ], + "mode": "standard" + }, + "children": { + "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "HTTPS proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "manual.http_proxy.address", + "type": "variable" + }, + "description": "HTTP proxy address" + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "HTTPS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "manual.http_proxy.port", + "type": "variable" + }, + "description": "HTTP proxy port" + } + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "socks_proxy": { + "type": "family", + "informations": { + "path": "manual.socks_proxy", + "name": "socks_proxy", + "description": "SOCKS Proxy", + "properties": [], + "mode": "standard" + }, + "children": { + "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "SOCKS proxy address.", + "properties": [], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "SOCKS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "1080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } + } + } + } + } + }, + "auto": { + "path": "auto", + "name": "auto", + "description": "Automatic proxy configuration URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + }, + "no_proxy": { + "path": "no_proxy", + "name": "no_proxy", + "description": "Address for which proxy will be desactivated.", + "help": [ + "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." + ], + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, + "multiple": true, + "examples": { + "name": "Examples", + "values": [ + ".mozilla.org", + ".net.nz", + "192.168.1.0/24" + ] + } + }, + "prompt_authentication": { + "path": "prompt_authentication", + "name": "prompt_authentication", + "description": "Prompt for authentication if password is saved.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "proxy_dns_socks5": { + "path": "proxy_dns_socks5", + "name": "proxy_dns_socks5", + "description": "Use proxy DNS when using SOCKS v5.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "variables": [ + { + "path": "proxy_mode", + "description": "Configure Proxy Access to the Internet" + }, + { + "path": "manual.socks_proxy.version", + "description": "SOCKS host version used by proxy" + } + ], + "type": "jinja" + } + } + ], + "mode": "advanced", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "dns_over_https": { + "type": "family", + "informations": { + "path": "dns_over_https", + "name": "dns_over_https", + "description": "DNS over HTTPS", + "properties": [], + "mode": "standard" + }, + "children": { + "enable_dns_over_https": { + "path": "dns_over_https.enable_dns_over_https", + "name": "enable_dns_over_https", + "description": "Enable DNS over HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "provider": { + "path": "dns_over_https.provider", + "name": "provider", + "description": "Use Provider.", "properties": [ { "type": "property", @@ -493,145 +551,28 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", - "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, - { - "path": "firefox.manual.socks_proxy.version", - "description": "SOCKS host version used by proxy" - } - ], - "type": "jinja" + "message": "when the variable {0} has the value \"false\".", + "path": { + "path": "dns_over_https.enable_dns_over_https" + }, + "description": "Enable DNS over HTTPS" } } ], - "mode": "advanced", + "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": false + "values": "Cloudflare" }, - "variable_type": "boolean" - }, - "dns_over_https": { - "type": "family", - "informations": { - "path": "firefox.dns_over_https", - "name": "dns_over_https", - "description": "DNS over HTTPS", - "properties": [], - "mode": "basic" - }, - "children": { - "enable_dns_over_https": { - "path": "firefox.dns_over_https.enable_dns_over_https", - "name": "enable_dns_over_https", - "description": "Enable DNS over HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "provider": { - "path": "firefox.dns_over_https.provider", - "name": "provider", - "description": "Use Provider.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"false\".", - "path": { - "path": "firefox.dns_over_https.enable_dns_over_https" - }, - "description": "Enable DNS over HTTPS" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] - } - }, - "custom_dns_url": { - "path": "firefox.dns_over_https.custom_dns_url", - "name": "custom_dns_url", - "description": "Custom DNS URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Custom\".", - "variables": [ - { - "path": "firefox.dns_over_https.provider", - "description": "Use Provider" - } - ], - "type": "jinja" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only", - "type": "jinja" - } - ] - } - } + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] } } } diff --git a/tests/result_tutorial/161/doc.sh b/tests/result_tutorial/161/doc.sh index eadf804a6..5723060cc 100644 --- a/tests/result_tutorial/161/doc.sh +++ b/tests/result_tutorial/161/doc.sh @@ -1,15 +1,7 @@ -Firefox - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family is a namespace. -โ–Œ Path: firefox -โ–Œ  basic  - โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ +โ”‚ proxy_mode โ”‚ Configure Proxy Access to the โ”‚ โ”‚  choice   standard   mandatory  โ”‚ Internet. โ”‚ โ”‚ โ”‚ Choices: โ”‚ โ”‚ โ”‚ โ€ข No proxy โ† (default) โ”‚ @@ -20,31 +12,31 @@ โ”‚ โ”‚ โ€ข Automatic proxy configuration URL โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - Manual proxy configuration +Manual proxy configuration โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual +โ–Œ Path: manual โ–Œ  basic   disabled  โ–Œ Disabled: when the variable "Configure Proxy Access to the Internet" -โ–Œ (firefox.proxy_mode) hasn't the value "Manual proxy configuration". +โ–Œ (proxy_mode) hasn't the value "Manual proxy configuration". - HTTP Proxy + HTTP Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.http_proxy +โ–Œ Path: manual.http_proxy โ–Œ  basic  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ +โ”‚ manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ +โ”‚ manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -58,31 +50,31 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ +โ”‚ manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - HTTPS Proxy + HTTPS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.https_proxy +โ–Œ Path: manual.https_proxy โ–Œ  standard   hidden  โ–Œ Hidden: when the variable "Also use this proxy for HTTPS" -โ–Œ (firefox.manual.use_for_https) has the value "true". +โ–Œ (manual.use_for_https) has the value "true". โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ +โ”‚ manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ +โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ +โ”‚ manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -92,49 +84,52 @@ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - SOCKS Proxy + SOCKS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.socks_proxy +โ–Œ Path: manual.socks_proxy โ–Œ  standard  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -144,11 +139,11 @@ โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ -โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ -โ”‚ โ”‚ configuration URL". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ +โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ +โ”‚ โ”‚ URL". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ @@ -167,63 +162,48 @@ โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ โ”‚ disabled  โ”‚ Default: true โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ +โ”‚ โ”‚ to the Internet" (proxy_mode) is not โ”‚ +โ”‚ โ”‚ "Manual proxy configuration" โ”‚ โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ -โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ +โ”‚ โ”‚ proxy" (manual.socks_proxy.version) โ”‚ โ”‚ โ”‚ is "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - DNS over HTTPS +DNS over HTTPS โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.dns_over_https -โ–Œ  basic  +โ–Œ Path: dns_over_https +โ–Œ  standard  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ +โ”‚ dns_over_https.provider โ”‚ Use Provider. โ”‚ โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ โ”‚ โ”‚ โ€ข NextDNS โ”‚ โ”‚ โ”‚ โ€ข Custom โ”‚ โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ โ”‚ โ”‚ DNS over HTTPS" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ +โ”‚ โ”‚ (dns_over_https.enable_dns_over_httโ€ฆ โ”‚ โ”‚ โ”‚ has the value "false". โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ -โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ -โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ -โ”‚ โ”‚ not "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/161/doc_changelog.sh b/tests/result_tutorial/161/doc_changelog.sh index e69de29bb..f9f78a3af 100644 --- a/tests/result_tutorial/161/doc_changelog.sh +++ b/tests/result_tutorial/161/doc_changelog.sh @@ -0,0 +1,16 @@ +New variable + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ dns_over_https.provider โ”‚ Use Provider. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ +โ”‚ โ”‚ โ€ข NextDNS โ”‚ +โ”‚ โ”‚ โ€ข Custom โ”‚ +โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ +โ”‚ โ”‚ DNS over HTTPS" โ”‚ +โ”‚ โ”‚ (dns_over_https.enable_dns_over_httโ€ฆ โ”‚ +โ”‚ โ”‚ has the value "false". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/142/doc.json b/tests/result_tutorial/162/doc.json similarity index 94% rename from tests/result_tutorial/142/doc.json rename to tests/result_tutorial/162/doc.json index 4249257f5..47a13b5fb 100644 --- a/tests/result_tutorial/142/doc.json +++ b/tests/result_tutorial/162/doc.json @@ -245,27 +245,9 @@ "path": "manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -285,20 +267,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -320,6 +308,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", diff --git a/tests/result_tutorial/142/doc.sh b/tests/result_tutorial/162/doc.sh similarity index 94% rename from tests/result_tutorial/142/doc.sh rename to tests/result_tutorial/162/doc.sh index 7ee4401cb..74898ce75 100644 --- a/tests/result_tutorial/142/doc.sh +++ b/tests/result_tutorial/162/doc.sh @@ -98,29 +98,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ diff --git a/tests/result_tutorial/142/doc_changelog.sh b/tests/result_tutorial/162/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/142/doc_changelog.sh rename to tests/result_tutorial/162/doc_changelog.sh diff --git a/tests/result_tutorial/170/doc.json b/tests/result_tutorial/170/doc.json index da4cca8b5..f407ce84f 100644 --- a/tests/result_tutorial/170/doc.json +++ b/tests/result_tutorial/170/doc.json @@ -1,138 +1,95 @@ { - "firefox": { - "type": "namespace", - "informations": { - "path": "firefox", - "name": "firefox", - "description": "Firefox", - "properties": [], - "mode": "basic", - "help": [ - "This family is a namespace" + "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "No proxy" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "No proxy", + "Auto-detect proxy settings for this network", + "Use system proxy settings", + "Manual proxy configuration", + "Automatic proxy configuration URL" ] + } + }, + "manual": { + "type": "family", + "informations": { + "path": "manual", + "name": "manual", + "description": "Manual proxy configuration", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic" }, "children": { - "proxy_mode": { - "path": "firefox.proxy_mode", - "name": "proxy_mode", - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "No proxy" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "No proxy", - "Auto-detect proxy settings for this network", - "Use system proxy settings", - "Manual proxy configuration", - "Automatic proxy configuration URL" - ] - } - }, - "manual": { + "http_proxy": { "type": "family", "informations": { - "path": "firefox.manual", - "name": "manual", - "description": "Manual proxy configuration", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], + "path": "manual.http_proxy", + "name": "http_proxy", + "description": "HTTP Proxy", + "properties": [], "mode": "basic" }, "children": { - "http_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.http_proxy", - "name": "http_proxy", - "description": "HTTP Proxy", - "properties": [], - "mode": "basic" - }, - "children": { - "address": { - "path": "firefox.manual.http_proxy.address", - "name": "address", - "description": "HTTP proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.http_proxy.port", - "name": "port", - "description": "HTTP proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } + "address": { + "path": "manual.http_proxy.address", + "name": "address", + "description": "HTTP proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false } + ], + "mode": "basic", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] } }, - "use_for_https": { - "path": "firefox.manual.use_for_https", - "name": "use_for_https", - "description": "Also use this proxy for HTTPS.", + "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP proxy port.", "properties": [ { "type": "property", @@ -145,219 +102,442 @@ "type": "variable", "default": { "name": "Default", - "values": true + "values": "8080" }, - "variable_type": "boolean" - }, - "https_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.https_proxy", - "name": "https_proxy", - "description": "HTTPS Proxy", - "properties": [ - { - "type": "property", - "name": "hidden", - "ori_name": "hidden", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"true\".", - "path": { - "path": "firefox.manual.use_for_https" - }, - "description": "Also use this proxy for HTTPS" - } - } - ], - "mode": "standard" - }, - "children": { - "address": { - "path": "firefox.manual.https_proxy.address", - "name": "address", - "description": "HTTPS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.https_proxy.port", - "name": "port", - "description": "HTTPS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "socks_proxy": { - "type": "family", - "informations": { - "path": "firefox.manual.socks_proxy", - "name": "socks_proxy", - "description": "SOCKS Proxy", - "properties": [], - "mode": "standard" - }, - "children": { - "address": { - "path": "firefox.manual.socks_proxy.address", - "name": "address", - "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "firefox.manual.socks_proxy.port", - "name": "port", - "description": "SOCKS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "version": { - "path": "firefox.manual.socks_proxy.version", - "name": "version", - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - } - } + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] } } } }, - "auto": { - "path": "firefox.auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", + "use_for_https": { + "path": "manual.use_for_https", + "name": "use_for_https", + "description": "Also use this proxy for HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "https_proxy": { + "type": "family", + "informations": { + "path": "manual.https_proxy", + "name": "https_proxy", + "description": "HTTPS Proxy", + "properties": [ + { + "type": "property", + "name": "hidden", + "ori_name": "hidden", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"true\".", + "path": { + "path": "manual.use_for_https" + }, + "description": "Also use this proxy for HTTPS" + } + } + ], + "mode": "standard" + }, + "children": { + "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "HTTPS proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "manual.http_proxy.address", + "type": "variable" + }, + "description": "HTTP proxy address" + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "HTTPS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "manual.http_proxy.port", + "type": "variable" + }, + "description": "HTTP proxy port" + } + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "socks_proxy": { + "type": "family", + "informations": { + "path": "manual.socks_proxy", + "name": "socks_proxy", + "description": "SOCKS Proxy", + "properties": [], + "mode": "standard" + }, + "children": { + "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "SOCKS proxy address.", + "properties": [], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "SOCKS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "1080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } + } + } + } + } + }, + "auto": { + "path": "auto", + "name": "auto", + "description": "Automatic proxy configuration URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + }, + "no_proxy": { + "path": "no_proxy", + "name": "no_proxy", + "description": "Address for which proxy will be desactivated.", + "help": [ + "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." + ], + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, + "multiple": true, + "examples": { + "name": "Examples", + "values": [ + ".mozilla.org", + ".net.nz", + "192.168.1.0/24" + ] + } + }, + "prompt_authentication": { + "path": "prompt_authentication", + "name": "prompt_authentication", + "description": "Prompt for authentication if password is saved.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "proxy_dns_socks5": { + "path": "proxy_dns_socks5", + "name": "proxy_dns_socks5", + "description": "Use proxy DNS when using SOCKS v5.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "variables": [ + { + "path": "proxy_mode", + "description": "Configure Proxy Access to the Internet" + }, + { + "path": "manual.socks_proxy.version", + "description": "SOCKS host version used by proxy" + } + ], + "type": "jinja" + } + } + ], + "mode": "advanced", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "dns_over_https": { + "type": "family", + "informations": { + "path": "dns_over_https", + "name": "dns_over_https", + "description": "DNS over HTTPS", + "properties": [], + "mode": "basic" + }, + "children": { + "enable_dns_over_https": { + "path": "dns_over_https.enable_dns_over_https", + "name": "enable_dns_over_https", + "description": "Enable DNS over HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "provider": { + "path": "dns_over_https.provider", + "name": "provider", + "description": "Use Provider.", "properties": [ { "type": "property", @@ -371,11 +551,55 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", + "message": "when the variable {0} has the value \"false\".", "path": { - "path": "firefox.proxy_mode" + "path": "dns_over_https.enable_dns_over_https" }, - "description": "Configure Proxy Access to the Internet" + "description": "Enable DNS over HTTPS" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } + }, + "custom_dns_url": { + "path": "dns_over_https.custom_dns_url", + "name": "custom_dns_url", + "description": "Custom DNS URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Custom\".", + "variables": [ + { + "path": "dns_over_https.provider", + "description": "Use Provider" + } + ], + "type": "jinja" } } ], @@ -388,313 +612,12 @@ "well-known ports (1 to 1023) are allowed", "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can be a hostname" - ] - } - }, - "no_proxy": { - "path": "firefox.no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - }, - "multiple": true, - "examples": { - "name": "Examples", - "values": [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - } - }, - "prompt_authentication": { - "path": "firefox.prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "firefox.proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "proxy_dns_socks5": { - "path": "firefox.proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", - "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, - { - "path": "firefox.manual.socks_proxy.version", - "description": "SOCKS host version used by proxy" - } - ], + { + "description": "must starts with 'https://' only", "type": "jinja" } - } - ], - "mode": "advanced", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "dns_over_https": { - "type": "family", - "informations": { - "path": "firefox.dns_over_https", - "name": "dns_over_https", - "description": "DNS over HTTPS", - "properties": [], - "mode": "basic" - }, - "children": { - "enable_dns_over_https": { - "path": "firefox.dns_over_https.enable_dns_over_https", - "name": "enable_dns_over_https", - "description": "Enable DNS over HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - }, - "provider": { - "path": "firefox.dns_over_https.provider", - "name": "provider", - "description": "Use Provider.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"false\".", - "path": { - "path": "firefox.dns_over_https.enable_dns_over_https" - }, - "description": "Enable DNS over HTTPS" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] - } - }, - "custom_dns_url": { - "path": "firefox.dns_over_https.custom_dns_url", - "name": "custom_dns_url", - "description": "Custom DNS URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Custom\".", - "variables": [ - { - "path": "firefox.dns_over_https.provider", - "description": "Use Provider" - } - ], - "type": "jinja" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only", - "type": "jinja" - } - ] - } - } - } - } - } - }, - "foxyproxy": { - "type": "namespace", - "informations": { - "path": "foxyproxy", - "name": "foxyproxy", - "description": "Foxyproxy", - "properties": [], - "mode": "basic", - "help": [ - "This family is a namespace" - ] - }, - "children": { - "proxies": { - "type": "leadership", - "informations": { - "path": "foxyproxy.proxies", - "name": "proxies", - "description": "Proxy configuration", - "properties": [], - "mode": "basic", - "help": [ - "This family contains lists of variable blocks" ] - }, - "children": { - "title": { - "path": "foxyproxy.proxies.title", - "name": "title", - "description": "Title or Description.", - "properties": [ - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "string", - "multiple": true - }, - "color": { - "path": "foxyproxy.proxies.color", - "name": "color", - "description": "Color.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "string" - } } } } diff --git a/tests/result_tutorial/170/doc.sh b/tests/result_tutorial/170/doc.sh index 02456e84a..534d54bf1 100644 --- a/tests/result_tutorial/170/doc.sh +++ b/tests/result_tutorial/170/doc.sh @@ -1,15 +1,7 @@ -Firefox - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family is a namespace. -โ–Œ Path: firefox -โ–Œ  basic  - โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ +โ”‚ proxy_mode โ”‚ Configure Proxy Access to the โ”‚ โ”‚  choice   standard   mandatory  โ”‚ Internet. โ”‚ โ”‚ โ”‚ Choices: โ”‚ โ”‚ โ”‚ โ€ข No proxy โ† (default) โ”‚ @@ -20,31 +12,31 @@ โ”‚ โ”‚ โ€ข Automatic proxy configuration URL โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - Manual proxy configuration +Manual proxy configuration โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual +โ–Œ Path: manual โ–Œ  basic   disabled  โ–Œ Disabled: when the variable "Configure Proxy Access to the Internet" -โ–Œ (firefox.proxy_mode) hasn't the value "Manual proxy configuration". +โ–Œ (proxy_mode) hasn't the value "Manual proxy configuration". - HTTP Proxy + HTTP Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.http_proxy +โ–Œ Path: manual.http_proxy โ–Œ  basic  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ +โ”‚ manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ +โ”‚ manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -58,31 +50,31 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ +โ”‚ manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - HTTPS Proxy + HTTPS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.https_proxy +โ–Œ Path: manual.https_proxy โ–Œ  standard   hidden  โ–Œ Hidden: when the variable "Also use this proxy for HTTPS" -โ–Œ (firefox.manual.use_for_https) has the value "true". +โ–Œ (manual.use_for_https) has the value "true". โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ +โ”‚ manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ +โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ +โ”‚ manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -92,49 +84,52 @@ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - SOCKS Proxy + SOCKS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.manual.socks_proxy +โ–Œ Path: manual.socks_proxy โ–Œ  standard  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.address) has the โ”‚ +โ”‚ โ”‚ value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -144,11 +139,11 @@ โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ -โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ -โ”‚ โ”‚ configuration URL". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ +โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ +โ”‚ โ”‚ URL". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ @@ -167,53 +162,51 @@ โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ โ”‚ disabled  โ”‚ Default: true โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ -โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ +โ”‚ โ”‚ "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ +โ”‚ โ”‚ to the Internet" (proxy_mode) is not โ”‚ +โ”‚ โ”‚ "Manual proxy configuration" โ”‚ โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ -โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ +โ”‚ โ”‚ proxy" (manual.socks_proxy.version) โ”‚ โ”‚ โ”‚ is "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - DNS over HTTPS +DNS over HTTPS โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: firefox.dns_over_https +โ–Œ Path: dns_over_https โ–Œ  basic  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ +โ”‚ dns_over_https.provider โ”‚ Use Provider. โ”‚ โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ โ”‚ โ”‚ โ€ข NextDNS โ”‚ โ”‚ โ”‚ โ€ข Custom โ”‚ โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ โ”‚ โ”‚ DNS over HTTPS" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ +โ”‚ โ”‚ (dns_over_https.enable_dns_over_httโ€ฆ โ”‚ โ”‚ โ”‚ has the value "false". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ +โ”‚ dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -223,34 +216,7 @@ โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ -โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ -โ”‚ โ”‚ not "Custom". โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - -Foxyproxy - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family is a namespace. -โ–Œ Path: foxyproxy -โ–Œ  basic  - - Proxy configuration - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family contains lists of variable blocks. -โ–Œ Path: foxyproxy.proxies -โ–Œ  basic  - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ -โ”‚  string   multiple   standard    โ”‚ โ”‚ -โ”‚ unique  โ”‚ โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ”‚ โ”‚ (dns_over_https.provider) is not โ”‚ +โ”‚ โ”‚ "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/170/doc_changelog.sh b/tests/result_tutorial/170/doc_changelog.sh index b0cdaace1..f2c930254 100644 --- a/tests/result_tutorial/170/doc_changelog.sh +++ b/tests/result_tutorial/170/doc_changelog.sh @@ -1,13 +1,19 @@ -New variables +Modified variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ -โ”‚  string   multiple   standard    โ”‚ โ”‚ -โ”‚ unique  โ”‚ โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ”‚ dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ +โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ +โ”‚ โ”‚ (dns_over_https.provider) is not โ”‚ +โ”‚ โ”‚ "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/180/doc.json b/tests/result_tutorial/180/doc.json index f1a4ca7b4..e582fc495 100644 --- a/tests/result_tutorial/180/doc.json +++ b/tests/result_tutorial/180/doc.json @@ -258,27 +258,9 @@ "path": "firefox.manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -298,20 +280,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -333,6 +321,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -635,72 +636,5 @@ } } } - }, - "foxyproxy": { - "type": "namespace", - "informations": { - "path": "foxyproxy", - "name": "foxyproxy", - "description": "Foxyproxy", - "properties": [], - "mode": "basic", - "help": [ - "This family is a namespace" - ] - }, - "children": { - "proxies": { - "type": "leadership", - "informations": { - "path": "foxyproxy.proxies", - "name": "proxies", - "description": "Proxy configuration", - "properties": [], - "mode": "basic", - "help": [ - "This family contains lists of variable blocks" - ] - }, - "children": { - "title": { - "path": "foxyproxy.proxies.title", - "name": "title", - "description": "Title or Description.", - "properties": [ - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "string", - "multiple": true - }, - "color": { - "path": "foxyproxy.proxies.color", - "name": "color", - "description": "Color.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - } - } - } - } - } } } \ No newline at end of file diff --git a/tests/result_tutorial/180/doc.sh b/tests/result_tutorial/180/doc.sh index b610006d5..fd5b99863 100644 --- a/tests/result_tutorial/180/doc.sh +++ b/tests/result_tutorial/180/doc.sh @@ -106,29 +106,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -227,32 +230,3 @@ โ”‚ โ”‚ not "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -Foxyproxy - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family is a namespace. -โ–Œ Path: foxyproxy -โ–Œ  basic  - - Proxy configuration - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family contains lists of variable blocks. -โ–Œ Path: foxyproxy.proxies -โ–Œ  basic  - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ -โ”‚  string   multiple   standard    โ”‚ โ”‚ -โ”‚ unique  โ”‚ โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  regexp   basic   mandatory  โ”‚ Validator: text based with regular โ”‚ -โ”‚ โ”‚ expressions โ”‚ -โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/180/doc_changelog.sh b/tests/result_tutorial/180/doc_changelog.sh index 72779b33a..f6dadab88 100644 --- a/tests/result_tutorial/180/doc_changelog.sh +++ b/tests/result_tutorial/180/doc_changelog.sh @@ -1,11 +1,183 @@ -Modified variable +New variables โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  string   regexp   basic   mandatory  โ”‚ Validator: text based with regular  โ”‚ -โ”‚ โ”‚ expressions  โ”‚ -โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ +โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ Internet. โ”‚ +โ”‚ โ”‚ Choices: โ”‚ +โ”‚ โ”‚ โ€ข No proxy โ† (default) โ”‚ +โ”‚ โ”‚ โ€ข Auto-detect proxy settings for โ”‚ +โ”‚ โ”‚ this network โ”‚ +โ”‚ โ”‚ โ€ข Use system proxy settings โ”‚ +โ”‚ โ”‚ โ€ข Manual proxy configuration โ”‚ +โ”‚ โ”‚ โ€ข Automatic proxy configuration URL โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ +โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ +โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: 8080 โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ +โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: the value of the variable โ”‚ +โ”‚ โ”‚ "HTTP proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ +โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: the value of the variable โ”‚ +โ”‚ โ”‚ "HTTP proxy port" โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ +โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ +โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ +โ”‚ โ”‚ configuration URL". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ +โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ +โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ +โ”‚ โ”‚ proxied. โ”‚ +โ”‚ โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ +โ”‚ โ”‚ dot โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ +โ”‚ โ”‚ CIDR format โ”‚ +โ”‚ โ”‚ Examples: โ”‚ +โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ +โ”‚ โ”‚ โ€ข .net.nz โ”‚ +โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ +โ”‚ disabled  โ”‚ Default: true โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ +โ”‚ โ”‚ to the Internet" โ”‚ +โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ +โ”‚ โ”‚ proxy configuration" โ”‚ +โ”‚ โ”‚ or "SOCKS host version used by โ”‚ +โ”‚ โ”‚ proxy" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ +โ”‚ โ”‚ is "v4". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ +โ”‚ โ”‚ โ€ข NextDNS โ”‚ +โ”‚ โ”‚ โ€ข Custom โ”‚ +โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ +โ”‚ โ”‚ DNS over HTTPS" โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ +โ”‚ โ”‚ has the value "false". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ +โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ +โ”‚ โ”‚ not "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ +Deleted variables + + +โ€ข proxy_mode +โ€ข manual.http_proxy.address +โ€ข manual.http_proxy.port +โ€ข manual.use_for_https +โ€ข manual.https_proxy.address +โ€ข manual.https_proxy.port +โ€ข manual.socks_proxy.address +โ€ข manual.socks_proxy.port +โ€ข manual.socks_proxy.version +โ€ข auto +โ€ข no_proxy +โ€ข prompt_authentication +โ€ข proxy_dns_socks5 +โ€ข dns_over_https.enable_dns_over_https +โ€ข dns_over_https.provider +โ€ข dns_over_https.custom_dns_url + diff --git a/tests/result_tutorial/181/doc.json b/tests/result_tutorial/181/doc.json index d7247213a..e582fc495 100644 --- a/tests/result_tutorial/181/doc.json +++ b/tests/result_tutorial/181/doc.json @@ -258,27 +258,9 @@ "path": "firefox.manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -298,20 +280,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -333,6 +321,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -635,79 +636,5 @@ } } } - }, - "foxyproxy": { - "type": "namespace", - "informations": { - "path": "foxyproxy", - "name": "foxyproxy", - "description": "Foxyproxy", - "properties": [], - "mode": "standard", - "help": [ - "This family is a namespace" - ] - }, - "children": { - "proxies": { - "type": "leadership", - "informations": { - "path": "foxyproxy.proxies", - "name": "proxies", - "description": "Proxy configuration", - "properties": [], - "mode": "standard", - "help": [ - "This family contains lists of variable blocks" - ] - }, - "children": { - "title": { - "path": "foxyproxy.proxies.title", - "name": "title", - "description": "Title or Description.", - "properties": [ - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "string", - "multiple": true - }, - "color": { - "path": "foxyproxy.proxies.color", - "name": "color", - "description": "Color.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value.", - "type": "jinja" - } - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - } - } - } - } - } } } \ No newline at end of file diff --git a/tests/result_tutorial/181/doc.sh b/tests/result_tutorial/181/doc.sh index 66d26d4f2..fd5b99863 100644 --- a/tests/result_tutorial/181/doc.sh +++ b/tests/result_tutorial/181/doc.sh @@ -106,29 +106,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -227,33 +230,3 @@ โ”‚ โ”‚ not "Custom". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -Foxyproxy - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family is a namespace. -โ–Œ Path: foxyproxy -โ–Œ  standard  - - Proxy configuration - -โ–Œ ๐Ÿ›ˆ Informations -โ–Œ  -โ–Œ This family contains lists of variable blocks. -โ–Œ Path: foxyproxy.proxies -โ–Œ  standard  - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ -โ”‚  string   multiple   standard    โ”‚ โ”‚ -โ”‚ unique  โ”‚ โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  regexp   standard   mandatory  โ”‚ Validator: text based with regular โ”‚ -โ”‚ โ”‚ expressions โ”‚ -โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ -โ”‚ โ”‚ Default: random color value. โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/181/doc_changelog.sh b/tests/result_tutorial/181/doc_changelog.sh index f7cd84bde..e69de29bb 100644 --- a/tests/result_tutorial/181/doc_changelog.sh +++ b/tests/result_tutorial/181/doc_changelog.sh @@ -1,12 +0,0 @@ -Modified variable - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  basic   standard   regexp   standard โ”‚ Validator: text based with regular โ”‚ -โ”‚ mandatory  โ”‚ expressions โ”‚ -โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ -โ”‚ โ”‚ Default: random color value. โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/result_tutorial/190/doc.json b/tests/result_tutorial/190/doc.json index f42ce3513..70de6e485 100644 --- a/tests/result_tutorial/190/doc.json +++ b/tests/result_tutorial/190/doc.json @@ -258,27 +258,9 @@ "path": "firefox.manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -298,20 +280,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -333,6 +321,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -679,39 +680,6 @@ "variable_type": "string", "multiple": true }, - "type": { - "path": "foxyproxy.proxies.type", - "name": "type", - "description": "Proxy Type.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Direct (no proxy)" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "HTTP", - "HTTPS/SSL", - "SOCKS4", - "SOCKS5", - "PAC URL", - "WPAD", - "System (use system settings)", - "Direct (no proxy)" - ] - } - }, "color": { "path": "foxyproxy.proxies.color", "name": "color", @@ -722,28 +690,11 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false - }, - { - "type": "property", - "name": "auto modified", - "ori_name": "force_store_value", - "access_control": false } ], "mode": "basic", "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value.", - "type": "jinja" - } - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - } + "variable_type": "string" } } } diff --git a/tests/result_tutorial/190/doc.sh b/tests/result_tutorial/190/doc.sh index ff8c94779..0ebf23d1e 100644 --- a/tests/result_tutorial/190/doc.sh +++ b/tests/result_tutorial/190/doc.sh @@ -106,29 +106,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -250,21 +253,7 @@ โ”‚  string   multiple   standard    โ”‚ โ”‚ โ”‚ unique  โ”‚ โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข HTTP โ”‚ -โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ -โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ -โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ -โ”‚ โ”‚ โ€ข PAC URL โ”‚ -โ”‚ โ”‚ โ€ข WPAD โ”‚ -โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ -โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  regexp   basic   mandatory   auto  โ”‚ Validator: text based with regular โ”‚ -โ”‚ modified  โ”‚ expressions โ”‚ -โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ -โ”‚ โ”‚ Default: random color value. โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/190/doc_changelog.sh b/tests/result_tutorial/190/doc_changelog.sh index 7662b21fa..b0cdaace1 100644 --- a/tests/result_tutorial/190/doc_changelog.sh +++ b/tests/result_tutorial/190/doc_changelog.sh @@ -1,17 +1,13 @@ -New variable +New variables โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข HTTP โ”‚ -โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ -โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ -โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ -โ”‚ โ”‚ โ€ข PAC URL โ”‚ -โ”‚ โ”‚ โ€ข WPAD โ”‚ -โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ -โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ +โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ +โ”‚  string   multiple   standard    โ”‚ โ”‚ +โ”‚ unique  โ”‚ โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/200/doc.json b/tests/result_tutorial/200/doc.json index 41b17c765..b3bc314fd 100644 --- a/tests/result_tutorial/200/doc.json +++ b/tests/result_tutorial/200/doc.json @@ -258,27 +258,9 @@ "path": "firefox.manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -298,20 +280,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -333,6 +321,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -679,39 +680,6 @@ "variable_type": "string", "multiple": true }, - "type": { - "path": "foxyproxy.proxies.type", - "name": "type", - "description": "Proxy Type.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Direct (no proxy)" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "HTTP", - "HTTPS/SSL", - "SOCKS4", - "SOCKS5", - "PAC URL", - "WPAD", - "System (use system settings)", - "Direct (no proxy)" - ] - } - }, "color": { "path": "foxyproxy.proxies.color", "name": "color", @@ -722,161 +690,15 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false - }, - { - "type": "property", - "name": "auto modified", - "ori_name": "force_store_value", - "access_control": false } ], "mode": "basic", "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value.", - "type": "jinja" - } - }, "variable_type": "regexp", "validators": { "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" } - }, - "address": { - "path": "foxyproxy.proxies.address", - "name": "address", - "description": "IP address, DNS name, server name.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is not \"Manual\".", - "type": "variable", - "ori_path": "firefox.manual.http_proxy.address", - "optional": false, - "propertyerror": false - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be a hostname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "foxyproxy.proxies.port", - "name": "port", - "description": "Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP port if proxy is not \"Manual\".", - "type": "variable", - "ori_path": "firefox.manual.http_proxy.port", - "optional": false, - "propertyerror": false - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "url": { - "path": "foxyproxy.proxies.url", - "name": "url", - "description": "URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type is not in:\n- PAC URL\n- WPAD.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is \"Auto\".", - "type": "variable", - "ori_path": "firefox.auto", - "optional": false, - "propertyerror": false - } - }, - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } } } } diff --git a/tests/result_tutorial/200/doc.sh b/tests/result_tutorial/200/doc.sh index 933a177f9..fb59fdd66 100644 --- a/tests/result_tutorial/200/doc.sh +++ b/tests/result_tutorial/200/doc.sh @@ -106,29 +106,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -250,64 +253,9 @@ โ”‚  string   multiple   standard    โ”‚ โ”‚ โ”‚ unique  โ”‚ โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข HTTP โ”‚ -โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ -โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ -โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ -โ”‚ โ”‚ โ€ข PAC URL โ”‚ -โ”‚ โ”‚ โ€ข WPAD โ”‚ -โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ -โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  regexp   basic   mandatory   auto  โ”‚ Validator: text based with regular โ”‚ -โ”‚ modified  โ”‚ expressions โ”‚ +โ”‚  regexp   basic   mandatory  โ”‚ Validator: text based with regular โ”‚ +โ”‚ โ”‚ expressions โ”‚ โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ -โ”‚ โ”‚ Default: random color value. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ -โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ -โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ -โ”‚ โ”‚ not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ -โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is "Auto". โ”‚ -โ”‚ โ”‚ Disabled: if type is not in: โ”‚ -โ”‚ โ”‚ - PAC URL โ”‚ -โ”‚ โ”‚ - WPAD. โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/200/doc_changelog.sh b/tests/result_tutorial/200/doc_changelog.sh index 12191d472..72779b33a 100644 --- a/tests/result_tutorial/200/doc_changelog.sh +++ b/tests/result_tutorial/200/doc_changelog.sh @@ -1,49 +1,11 @@ -New variables +Modified variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ -โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ -โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ -โ”‚ โ”‚ not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ -โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is "Auto". โ”‚ -โ”‚ โ”‚ Disabled: if type is not in: โ”‚ -โ”‚ โ”‚ - PAC URL โ”‚ -โ”‚ โ”‚ - WPAD. โ”‚ +โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ +โ”‚  string   regexp   basic   mandatory  โ”‚ Validator: text based with regular  โ”‚ +โ”‚ โ”‚ expressions  โ”‚ +โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/201/doc.json b/tests/result_tutorial/201/doc.json new file mode 100644 index 000000000..1b4e2be5f --- /dev/null +++ b/tests/result_tutorial/201/doc.json @@ -0,0 +1,714 @@ +{ + "firefox": { + "type": "namespace", + "informations": { + "path": "firefox", + "name": "firefox", + "description": "Firefox", + "properties": [], + "mode": "basic", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "No proxy" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "No proxy", + "Auto-detect proxy settings for this network", + "Use system proxy settings", + "Manual proxy configuration", + "Automatic proxy configuration URL" + ] + } + }, + "manual": { + "type": "family", + "informations": { + "path": "firefox.manual", + "name": "manual", + "description": "Manual proxy configuration", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic" + }, + "children": { + "http_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.http_proxy", + "name": "http_proxy", + "description": "HTTP Proxy", + "properties": [], + "mode": "basic" + }, + "children": { + "address": { + "path": "firefox.manual.http_proxy.address", + "name": "address", + "description": "HTTP proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "HTTP proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "8080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "use_for_https": { + "path": "firefox.manual.use_for_https", + "name": "use_for_https", + "description": "Also use this proxy for HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "https_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.https_proxy", + "name": "https_proxy", + "description": "HTTPS Proxy", + "properties": [ + { + "type": "property", + "name": "hidden", + "ori_name": "hidden", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"true\".", + "path": { + "path": "firefox.manual.use_for_https" + }, + "description": "Also use this proxy for HTTPS" + } + } + ], + "mode": "standard" + }, + "children": { + "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "HTTPS proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "firefox.manual.http_proxy.address", + "type": "variable" + }, + "description": "HTTP proxy address" + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "HTTPS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "firefox.manual.http_proxy.port", + "type": "variable" + }, + "description": "HTTP proxy port" + } + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "socks_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.socks_proxy", + "name": "socks_proxy", + "description": "SOCKS Proxy", + "properties": [], + "mode": "standard" + }, + "children": { + "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "SOCKS proxy address.", + "properties": [], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "SOCKS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "1080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } + } + } + } + } + }, + "auto": { + "path": "firefox.auto", + "name": "auto", + "description": "Automatic proxy configuration URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + }, + "no_proxy": { + "path": "firefox.no_proxy", + "name": "no_proxy", + "description": "Address for which proxy will be desactivated.", + "help": [ + "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." + ], + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, + "multiple": true, + "examples": { + "name": "Examples", + "values": [ + ".mozilla.org", + ".net.nz", + "192.168.1.0/24" + ] + } + }, + "prompt_authentication": { + "path": "firefox.prompt_authentication", + "name": "prompt_authentication", + "description": "Prompt for authentication if password is saved.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "proxy_dns_socks5": { + "path": "firefox.proxy_dns_socks5", + "name": "proxy_dns_socks5", + "description": "Use proxy DNS when using SOCKS v5.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "variables": [ + { + "path": "firefox.proxy_mode", + "description": "Configure Proxy Access to the Internet" + }, + { + "path": "firefox.manual.socks_proxy.version", + "description": "SOCKS host version used by proxy" + } + ], + "type": "jinja" + } + } + ], + "mode": "advanced", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "dns_over_https": { + "type": "family", + "informations": { + "path": "firefox.dns_over_https", + "name": "dns_over_https", + "description": "DNS over HTTPS", + "properties": [], + "mode": "basic" + }, + "children": { + "enable_dns_over_https": { + "path": "firefox.dns_over_https.enable_dns_over_https", + "name": "enable_dns_over_https", + "description": "Enable DNS over HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "provider": { + "path": "firefox.dns_over_https.provider", + "name": "provider", + "description": "Use Provider.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"false\".", + "path": { + "path": "firefox.dns_over_https.enable_dns_over_https" + }, + "description": "Enable DNS over HTTPS" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } + }, + "custom_dns_url": { + "path": "firefox.dns_over_https.custom_dns_url", + "name": "custom_dns_url", + "description": "Custom DNS URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Custom\".", + "variables": [ + { + "path": "firefox.dns_over_https.provider", + "description": "Use Provider" + } + ], + "type": "jinja" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only", + "type": "jinja" + } + ] + } + } + } + } + } + }, + "foxyproxy": { + "type": "namespace", + "informations": { + "path": "foxyproxy", + "name": "foxyproxy", + "description": "Foxyproxy", + "properties": [], + "mode": "standard", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "proxies": { + "type": "leadership", + "informations": { + "path": "foxyproxy.proxies", + "name": "proxies", + "description": "Proxy configuration", + "properties": [], + "mode": "standard", + "help": [ + "This family contains lists of variable blocks" + ] + }, + "children": { + "title": { + "path": "foxyproxy.proxies.title", + "name": "title", + "description": "Title or Description.", + "properties": [ + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "string", + "multiple": true + }, + "color": { + "path": "foxyproxy.proxies.color", + "name": "color", + "description": "Color.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "random color value.", + "type": "jinja" + } + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/tests/result_tutorial/141/doc.sh b/tests/result_tutorial/201/doc.sh similarity index 67% rename from tests/result_tutorial/141/doc.sh rename to tests/result_tutorial/201/doc.sh index 34d8a3273..5c9c3fb42 100644 --- a/tests/result_tutorial/141/doc.sh +++ b/tests/result_tutorial/201/doc.sh @@ -1,7 +1,15 @@ +Firefox + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family is a namespace. +โ–Œ Path: firefox +โ–Œ  basic  + โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ proxy_mode โ”‚ Configure Proxy Access to the โ”‚ +โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ โ”‚  choice   standard   mandatory  โ”‚ Internet. โ”‚ โ”‚ โ”‚ Choices: โ”‚ โ”‚ โ”‚ โ€ข No proxy โ† (default) โ”‚ @@ -12,31 +20,31 @@ โ”‚ โ”‚ โ€ข Automatic proxy configuration URL โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -Manual proxy configuration + Manual proxy configuration โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: manual +โ–Œ Path: firefox.manual โ–Œ  basic   disabled  โ–Œ Disabled: when the variable "Configure Proxy Access to the Internet" -โ–Œ (proxy_mode) hasn't the value "Manual proxy configuration". +โ–Œ (firefox.proxy_mode) hasn't the value "Manual proxy configuration". - HTTP Proxy + HTTP Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: manual.http_proxy +โ–Œ Path: firefox.manual.http_proxy โ–Œ  basic  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ +โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ +โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -50,31 +58,31 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ +โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - HTTPS Proxy + HTTPS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: manual.https_proxy +โ–Œ Path: firefox.manual.https_proxy โ–Œ  standard   hidden  โ–Œ Hidden: when the variable "Also use this proxy for HTTPS" -โ–Œ (manual.use_for_https) has the value "true". +โ–Œ (firefox.manual.use_for_https) has the value "true". โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ +โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ +โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -84,49 +92,52 @@ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ Default: the value of the variable โ”‚ โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - SOCKS Proxy + SOCKS Proxy โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: manual.socks_proxy +โ–Œ Path: firefox.manual.socks_proxy โ–Œ  standard  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ @@ -136,11 +147,11 @@ โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) hasn't the โ”‚ -โ”‚ โ”‚ value "Automatic proxy configuration โ”‚ -โ”‚ โ”‚ URL". โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ +โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ +โ”‚ โ”‚ configuration URL". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ @@ -159,48 +170,93 @@ โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ โ”‚ disabled  โ”‚ Default: true โ”‚ โ”‚ โ”‚ Disabled: when the variable โ”‚ โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ -โ”‚ โ”‚ Internet" (proxy_mode) has the value โ”‚ -โ”‚ โ”‚ "No proxy". โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" (proxy_mode) is not โ”‚ -โ”‚ โ”‚ "Manual proxy configuration" โ”‚ +โ”‚ โ”‚ to the Internet" โ”‚ +โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ +โ”‚ โ”‚ proxy configuration" โ”‚ โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" (manual.socks_proxy.version) โ”‚ +โ”‚ โ”‚ proxy" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ โ”‚ โ”‚ is "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ -DNS over HTTPS + DNS over HTTPS โ–Œ ๐Ÿ›ˆ Informations โ–Œ  -โ–Œ Path: dns_over_https -โ–Œ  standard  +โ–Œ Path: firefox.dns_over_https +โ–Œ  basic  โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ dns_over_https.enable_dns_over_https โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ dns_over_https.provider โ”‚ Use Provider. โ”‚ +โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ โ”‚ โ”‚ โ€ข NextDNS โ”‚ โ”‚ โ”‚ โ€ข Custom โ”‚ โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ โ”‚ โ”‚ DNS over HTTPS" โ”‚ -โ”‚ โ”‚ (dns_over_https.enable_dns_over_httโ€ฆ โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ โ”‚ โ”‚ has the value "false". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ +โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ +โ”‚ โ”‚ not "Custom". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +Foxyproxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family is a namespace. +โ–Œ Path: foxyproxy +โ–Œ  standard  + + Proxy configuration + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family contains lists of variable blocks. +โ–Œ Path: foxyproxy.proxies +โ–Œ  standard  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ +โ”‚  string   multiple   standard    โ”‚ โ”‚ +โ”‚ unique  โ”‚ โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ +โ”‚  regexp   standard   mandatory  โ”‚ Validator: text based with regular โ”‚ +โ”‚ โ”‚ expressions โ”‚ +โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ +โ”‚ โ”‚ Default: random color value. โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/201/doc_changelog.sh b/tests/result_tutorial/201/doc_changelog.sh new file mode 100644 index 000000000..f7cd84bde --- /dev/null +++ b/tests/result_tutorial/201/doc_changelog.sh @@ -0,0 +1,12 @@ +Modified variable + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ +โ”‚  basic   standard   regexp   standard โ”‚ Validator: text based with regular โ”‚ +โ”‚ mandatory  โ”‚ expressions โ”‚ +โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ +โ”‚ โ”‚ Default: random color value. โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/182/doc.json b/tests/result_tutorial/202/doc.json similarity index 95% rename from tests/result_tutorial/182/doc.json rename to tests/result_tutorial/202/doc.json index a303c44b1..0baaf2257 100644 --- a/tests/result_tutorial/182/doc.json +++ b/tests/result_tutorial/202/doc.json @@ -258,27 +258,9 @@ "path": "firefox.manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -298,20 +280,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -333,6 +321,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", diff --git a/tests/result_tutorial/182/doc.sh b/tests/result_tutorial/202/doc.sh similarity index 95% rename from tests/result_tutorial/182/doc.sh rename to tests/result_tutorial/202/doc.sh index 05157662e..e468adc1f 100644 --- a/tests/result_tutorial/182/doc.sh +++ b/tests/result_tutorial/202/doc.sh @@ -106,29 +106,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ diff --git a/tests/result_tutorial/182/doc_changelog.sh b/tests/result_tutorial/202/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/182/doc_changelog.sh rename to tests/result_tutorial/202/doc_changelog.sh diff --git a/tests/result_tutorial/210/doc.json b/tests/result_tutorial/210/doc.json index 847fdd99b..1cdef4b81 100644 --- a/tests/result_tutorial/210/doc.json +++ b/tests/result_tutorial/210/doc.json @@ -258,27 +258,9 @@ "path": "firefox.manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -298,20 +280,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -333,6 +321,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", @@ -744,189 +745,6 @@ "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" } - }, - "address": { - "path": "foxyproxy.proxies.address", - "name": "address", - "description": "IP address, DNS name, server name.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is not \"Manual\".", - "type": "variable", - "ori_path": "firefox.manual.http_proxy.address", - "optional": false, - "propertyerror": false - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be a hostname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "foxyproxy.proxies.port", - "name": "port", - "description": "Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP port if proxy is not \"Manual\".", - "type": "variable", - "ori_path": "firefox.manual.http_proxy.port", - "optional": false, - "propertyerror": false - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "username": { - "path": "foxyproxy.proxies.username", - "name": "username", - "description": "Username.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false, - "annotation": { - "description": "if a password is set.", - "type": "jinja" - } - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "UNIX user" - }, - "password": { - "path": "foxyproxy.proxies.password", - "name": "password", - "description": "Password.", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "secret" - }, - "url": { - "path": "foxyproxy.proxies.url", - "name": "url", - "description": "URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type is not in:\n- PAC URL\n- WPAD.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is \"Auto\".", - "type": "variable", - "ori_path": "firefox.auto", - "optional": false, - "propertyerror": false - } - }, - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } } } } diff --git a/tests/result_tutorial/210/doc.sh b/tests/result_tutorial/210/doc.sh index 465f9e4f0..87f73bcdb 100644 --- a/tests/result_tutorial/210/doc.sh +++ b/tests/result_tutorial/210/doc.sh @@ -106,29 +106,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ @@ -266,63 +269,5 @@ โ”‚ modified  โ”‚ expressions โ”‚ โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ โ”‚ โ”‚ Default: random color value. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ -โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ -โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ -โ”‚ โ”‚ not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ -โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: if a password is set. โ”‚ -โ”‚ disabled  โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ -โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ -โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is "Auto". โ”‚ -โ”‚ โ”‚ Disabled: if type is not in: โ”‚ -โ”‚ โ”‚ - PAC URL โ”‚ -โ”‚ โ”‚ - WPAD. โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/210/doc_changelog.sh b/tests/result_tutorial/210/doc_changelog.sh index 84bac03f6..7662b21fa 100644 --- a/tests/result_tutorial/210/doc_changelog.sh +++ b/tests/result_tutorial/210/doc_changelog.sh @@ -1,21 +1,17 @@ -New variables +New variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ -โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: if a password is set. โ”‚ -โ”‚ disabled  โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ -โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ +โ”‚ โ”‚ โ€ข HTTP โ”‚ +โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ +โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ +โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ +โ”‚ โ”‚ โ€ข PAC URL โ”‚ +โ”‚ โ”‚ โ€ข WPAD โ”‚ +โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ +โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/result_tutorial/220/doc.json b/tests/result_tutorial/220/doc.json new file mode 100644 index 000000000..39e7ca771 --- /dev/null +++ b/tests/result_tutorial/220/doc.json @@ -0,0 +1,886 @@ +{ + "firefox": { + "type": "namespace", + "informations": { + "path": "firefox", + "name": "firefox", + "description": "Firefox", + "properties": [], + "mode": "basic", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "No proxy" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "No proxy", + "Auto-detect proxy settings for this network", + "Use system proxy settings", + "Manual proxy configuration", + "Automatic proxy configuration URL" + ] + } + }, + "manual": { + "type": "family", + "informations": { + "path": "firefox.manual", + "name": "manual", + "description": "Manual proxy configuration", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic" + }, + "children": { + "http_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.http_proxy", + "name": "http_proxy", + "description": "HTTP Proxy", + "properties": [], + "mode": "basic" + }, + "children": { + "address": { + "path": "firefox.manual.http_proxy.address", + "name": "address", + "description": "HTTP proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "HTTP proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "8080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "use_for_https": { + "path": "firefox.manual.use_for_https", + "name": "use_for_https", + "description": "Also use this proxy for HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "https_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.https_proxy", + "name": "https_proxy", + "description": "HTTPS Proxy", + "properties": [ + { + "type": "property", + "name": "hidden", + "ori_name": "hidden", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"true\".", + "path": { + "path": "firefox.manual.use_for_https" + }, + "description": "Also use this proxy for HTTPS" + } + } + ], + "mode": "standard" + }, + "children": { + "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "HTTPS proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "firefox.manual.http_proxy.address", + "type": "variable" + }, + "description": "HTTP proxy address" + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "HTTPS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "firefox.manual.http_proxy.port", + "type": "variable" + }, + "description": "HTTP proxy port" + } + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "socks_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.socks_proxy", + "name": "socks_proxy", + "description": "SOCKS Proxy", + "properties": [], + "mode": "standard" + }, + "children": { + "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "SOCKS proxy address.", + "properties": [], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "SOCKS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "1080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } + } + } + } + } + }, + "auto": { + "path": "firefox.auto", + "name": "auto", + "description": "Automatic proxy configuration URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + }, + "no_proxy": { + "path": "firefox.no_proxy", + "name": "no_proxy", + "description": "Address for which proxy will be desactivated.", + "help": [ + "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." + ], + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, + "multiple": true, + "examples": { + "name": "Examples", + "values": [ + ".mozilla.org", + ".net.nz", + "192.168.1.0/24" + ] + } + }, + "prompt_authentication": { + "path": "firefox.prompt_authentication", + "name": "prompt_authentication", + "description": "Prompt for authentication if password is saved.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "proxy_dns_socks5": { + "path": "firefox.proxy_dns_socks5", + "name": "proxy_dns_socks5", + "description": "Use proxy DNS when using SOCKS v5.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "variables": [ + { + "path": "firefox.proxy_mode", + "description": "Configure Proxy Access to the Internet" + }, + { + "path": "firefox.manual.socks_proxy.version", + "description": "SOCKS host version used by proxy" + } + ], + "type": "jinja" + } + } + ], + "mode": "advanced", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "dns_over_https": { + "type": "family", + "informations": { + "path": "firefox.dns_over_https", + "name": "dns_over_https", + "description": "DNS over HTTPS", + "properties": [], + "mode": "basic" + }, + "children": { + "enable_dns_over_https": { + "path": "firefox.dns_over_https.enable_dns_over_https", + "name": "enable_dns_over_https", + "description": "Enable DNS over HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "provider": { + "path": "firefox.dns_over_https.provider", + "name": "provider", + "description": "Use Provider.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"false\".", + "path": { + "path": "firefox.dns_over_https.enable_dns_over_https" + }, + "description": "Enable DNS over HTTPS" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } + }, + "custom_dns_url": { + "path": "firefox.dns_over_https.custom_dns_url", + "name": "custom_dns_url", + "description": "Custom DNS URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Custom\".", + "variables": [ + { + "path": "firefox.dns_over_https.provider", + "description": "Use Provider" + } + ], + "type": "jinja" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only", + "type": "jinja" + } + ] + } + } + } + } + } + }, + "foxyproxy": { + "type": "namespace", + "informations": { + "path": "foxyproxy", + "name": "foxyproxy", + "description": "Foxyproxy", + "properties": [], + "mode": "basic", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "proxies": { + "type": "leadership", + "informations": { + "path": "foxyproxy.proxies", + "name": "proxies", + "description": "Proxy configuration", + "properties": [], + "mode": "basic", + "help": [ + "This family contains lists of variable blocks" + ] + }, + "children": { + "title": { + "path": "foxyproxy.proxies.title", + "name": "title", + "description": "Title or Description.", + "properties": [ + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "string", + "multiple": true + }, + "type": { + "path": "foxyproxy.proxies.type", + "name": "type", + "description": "Proxy Type.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "Direct (no proxy)" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "HTTP", + "HTTPS/SSL", + "SOCKS4", + "SOCKS5", + "PAC URL", + "WPAD", + "System (use system settings)", + "Direct (no proxy)" + ] + } + }, + "color": { + "path": "foxyproxy.proxies.color", + "name": "color", + "description": "Color.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "auto modified", + "ori_name": "force_store_value", + "access_control": false + } + ], + "mode": "basic", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "random color value.", + "type": "jinja" + } + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } + }, + "address": { + "path": "foxyproxy.proxies.address", + "name": "address", + "description": "IP address, DNS name, server name.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is not \"Manual\".", + "type": "variable", + "ori_path": "firefox.manual.http_proxy.address", + "optional": false, + "propertyerror": false + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be a hostname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "foxyproxy.proxies.port", + "name": "port", + "description": "Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP port if proxy is not \"Manual\".", + "type": "variable", + "ori_path": "firefox.manual.http_proxy.port", + "optional": false, + "propertyerror": false + } + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "url": { + "path": "foxyproxy.proxies.url", + "name": "url", + "description": "URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type is not in:\n- PAC URL\n- WPAD.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is \"Auto\".", + "type": "variable", + "ori_path": "firefox.auto", + "optional": false, + "propertyerror": false + } + }, + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + } + } + } + } + } +} \ No newline at end of file diff --git a/tests/result_tutorial/220/doc.sh b/tests/result_tutorial/220/doc.sh new file mode 100644 index 000000000..ab17ac83a --- /dev/null +++ b/tests/result_tutorial/220/doc.sh @@ -0,0 +1,316 @@ +Firefox + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family is a namespace. +โ–Œ Path: firefox +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ 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 + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual +โ–Œ  basic   disabled  +โ–Œ Disabled: when the variable "Configure Proxy Access to the Internet" +โ–Œ (firefox.proxy_mode) hasn't the value "Manual proxy configuration". + + HTTP Proxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual.http_proxy +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ +โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ +โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: 8080 โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + + HTTPS Proxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual.https_proxy +โ–Œ  standard   hidden  +โ–Œ Hidden: when the variable "Also use this proxy for HTTPS" +โ–Œ (firefox.manual.use_for_https) has the value "true". + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ +โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: the value of the variable โ”‚ +โ”‚ โ”‚ "HTTP proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ +โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: the value of the variable โ”‚ +โ”‚ โ”‚ "HTTP proxy port" โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + + SOCKS Proxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual.socks_proxy +โ–Œ  standard  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ +โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ +โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ +โ”‚ โ”‚ configuration URL". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ +โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ +โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ +โ”‚ โ”‚ proxied. โ”‚ +โ”‚ โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ +โ”‚ โ”‚ dot โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ +โ”‚ โ”‚ CIDR format โ”‚ +โ”‚ โ”‚ Examples: โ”‚ +โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ +โ”‚ โ”‚ โ€ข .net.nz โ”‚ +โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ +โ”‚ disabled  โ”‚ Default: true โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ +โ”‚ โ”‚ to the Internet" โ”‚ +โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ +โ”‚ โ”‚ proxy configuration" โ”‚ +โ”‚ โ”‚ or "SOCKS host version used by โ”‚ +โ”‚ โ”‚ proxy" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ +โ”‚ โ”‚ is "v4". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + + DNS over HTTPS + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.dns_over_https +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ +โ”‚ โ”‚ โ€ข NextDNS โ”‚ +โ”‚ โ”‚ โ€ข Custom โ”‚ +โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ +โ”‚ โ”‚ DNS over HTTPS" โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ +โ”‚ โ”‚ has the value "false". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ +โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ +โ”‚ โ”‚ not "Custom". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +Foxyproxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family is a namespace. +โ–Œ Path: foxyproxy +โ–Œ  basic  + + Proxy configuration + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family contains lists of variable blocks. +โ–Œ Path: foxyproxy.proxies +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ +โ”‚  string   multiple   standard    โ”‚ โ”‚ +โ”‚ unique  โ”‚ โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ +โ”‚ โ”‚ โ€ข HTTP โ”‚ +โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ +โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ +โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ +โ”‚ โ”‚ โ€ข PAC URL โ”‚ +โ”‚ โ”‚ โ€ข WPAD โ”‚ +โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ +โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ +โ”‚  regexp   basic   mandatory   auto  โ”‚ Validator: text based with regular โ”‚ +โ”‚ modified  โ”‚ expressions โ”‚ +โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ +โ”‚ โ”‚ Default: random color value. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ +โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ +โ”‚ โ”‚ not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ +โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is "Auto". โ”‚ +โ”‚ โ”‚ Disabled: if type is not in: โ”‚ +โ”‚ โ”‚ - PAC URL โ”‚ +โ”‚ โ”‚ - WPAD. โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/220/doc_changelog.sh b/tests/result_tutorial/220/doc_changelog.sh new file mode 100644 index 000000000..12191d472 --- /dev/null +++ b/tests/result_tutorial/220/doc_changelog.sh @@ -0,0 +1,49 @@ +New variables + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ +โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ +โ”‚ โ”‚ not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ +โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is "Auto". โ”‚ +โ”‚ โ”‚ Disabled: if type is not in: โ”‚ +โ”‚ โ”‚ - PAC URL โ”‚ +โ”‚ โ”‚ - WPAD. โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/230/doc.json b/tests/result_tutorial/230/doc.json new file mode 100644 index 000000000..e68662b6f --- /dev/null +++ b/tests/result_tutorial/230/doc.json @@ -0,0 +1,936 @@ +{ + "firefox": { + "type": "namespace", + "informations": { + "path": "firefox", + "name": "firefox", + "description": "Firefox", + "properties": [], + "mode": "basic", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "No proxy" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "No proxy", + "Auto-detect proxy settings for this network", + "Use system proxy settings", + "Manual proxy configuration", + "Automatic proxy configuration URL" + ] + } + }, + "manual": { + "type": "family", + "informations": { + "path": "firefox.manual", + "name": "manual", + "description": "Manual proxy configuration", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic" + }, + "children": { + "http_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.http_proxy", + "name": "http_proxy", + "description": "HTTP Proxy", + "properties": [], + "mode": "basic" + }, + "children": { + "address": { + "path": "firefox.manual.http_proxy.address", + "name": "address", + "description": "HTTP proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "HTTP proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "8080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "use_for_https": { + "path": "firefox.manual.use_for_https", + "name": "use_for_https", + "description": "Also use this proxy for HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "https_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.https_proxy", + "name": "https_proxy", + "description": "HTTPS Proxy", + "properties": [ + { + "type": "property", + "name": "hidden", + "ori_name": "hidden", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"true\".", + "path": { + "path": "firefox.manual.use_for_https" + }, + "description": "Also use this proxy for HTTPS" + } + } + ], + "mode": "standard" + }, + "children": { + "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "HTTPS proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "firefox.manual.http_proxy.address", + "type": "variable" + }, + "description": "HTTP proxy address" + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "HTTPS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable {0}.", + "path": { + "path": "firefox.manual.http_proxy.port", + "type": "variable" + }, + "description": "HTTP proxy port" + } + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + } + } + }, + "socks_proxy": { + "type": "family", + "informations": { + "path": "firefox.manual.socks_proxy", + "name": "socks_proxy", + "description": "SOCKS Proxy", + "properties": [], + "mode": "standard" + }, + "children": { + "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "SOCKS proxy address.", + "properties": [], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "SOCKS proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "1080" + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } + } + } + } + } + }, + "auto": { + "path": "firefox.auto", + "name": "auto", + "description": "Automatic proxy configuration URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + }, + "no_proxy": { + "path": "firefox.no_proxy", + "name": "no_proxy", + "description": "Address for which proxy will be desactivated.", + "help": [ + "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." + ], + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, + "multiple": true, + "examples": { + "name": "Examples", + "values": [ + ".mozilla.org", + ".net.nz", + "192.168.1.0/24" + ] + } + }, + "prompt_authentication": { + "path": "firefox.prompt_authentication", + "name": "prompt_authentication", + "description": "Prompt for authentication if password is saved.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"No proxy\".", + "path": { + "path": "firefox.proxy_mode" + }, + "description": "Configure Proxy Access to the Internet" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "proxy_dns_socks5": { + "path": "firefox.proxy_dns_socks5", + "name": "proxy_dns_socks5", + "description": "Use proxy DNS when using SOCKS v5.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "variables": [ + { + "path": "firefox.proxy_mode", + "description": "Configure Proxy Access to the Internet" + }, + { + "path": "firefox.manual.socks_proxy.version", + "description": "SOCKS host version used by proxy" + } + ], + "type": "jinja" + } + } + ], + "mode": "advanced", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "dns_over_https": { + "type": "family", + "informations": { + "path": "firefox.dns_over_https", + "name": "dns_over_https", + "description": "DNS over HTTPS", + "properties": [], + "mode": "basic" + }, + "children": { + "enable_dns_over_https": { + "path": "firefox.dns_over_https.enable_dns_over_https", + "name": "enable_dns_over_https", + "description": "Enable DNS over HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" + }, + "provider": { + "path": "firefox.dns_over_https.provider", + "name": "provider", + "description": "Use Provider.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"false\".", + "path": { + "path": "firefox.dns_over_https.enable_dns_over_https" + }, + "description": "Enable DNS over HTTPS" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } + }, + "custom_dns_url": { + "path": "firefox.dns_over_https.custom_dns_url", + "name": "custom_dns_url", + "description": "Custom DNS URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Custom\".", + "variables": [ + { + "path": "firefox.dns_over_https.provider", + "description": "Use Provider" + } + ], + "type": "jinja" + } + } + ], + "mode": "basic", + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only", + "type": "jinja" + } + ] + } + } + } + } + } + }, + "foxyproxy": { + "type": "namespace", + "informations": { + "path": "foxyproxy", + "name": "foxyproxy", + "description": "Foxyproxy", + "properties": [], + "mode": "basic", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "proxies": { + "type": "leadership", + "informations": { + "path": "foxyproxy.proxies", + "name": "proxies", + "description": "Proxy configuration", + "properties": [], + "mode": "basic", + "help": [ + "This family contains lists of variable blocks" + ] + }, + "children": { + "title": { + "path": "foxyproxy.proxies.title", + "name": "title", + "description": "Title or Description.", + "properties": [ + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "string", + "multiple": true + }, + "type": { + "path": "foxyproxy.proxies.type", + "name": "type", + "description": "Proxy Type.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "Direct (no proxy)" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "HTTP", + "HTTPS/SSL", + "SOCKS4", + "SOCKS5", + "PAC URL", + "WPAD", + "System (use system settings)", + "Direct (no proxy)" + ] + } + }, + "color": { + "path": "foxyproxy.proxies.color", + "name": "color", + "description": "Color.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "auto modified", + "ori_name": "force_store_value", + "access_control": false + } + ], + "mode": "basic", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "random color value.", + "type": "jinja" + } + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } + }, + "address": { + "path": "foxyproxy.proxies.address", + "name": "address", + "description": "IP address, DNS name, server name.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is not \"Manual\".", + "type": "variable", + "ori_path": "firefox.manual.http_proxy.address", + "optional": false, + "propertyerror": false + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be a hostname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "foxyproxy.proxies.port", + "name": "port", + "description": "Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP port if proxy is not \"Manual\".", + "type": "variable", + "ori_path": "firefox.manual.http_proxy.port", + "optional": false, + "propertyerror": false + } + }, + "variable_type": "port", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + } + }, + "username": { + "path": "foxyproxy.proxies.username", + "name": "username", + "description": "Username.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false, + "annotation": { + "description": "if a password is set.", + "type": "jinja" + } + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "UNIX user" + }, + "password": { + "path": "foxyproxy.proxies.password", + "name": "password", + "description": "Password.", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "secret" + }, + "url": { + "path": "foxyproxy.proxies.url", + "name": "url", + "description": "URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type is not in:\n- PAC URL\n- WPAD.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is \"Auto\".", + "type": "variable", + "ori_path": "firefox.auto", + "optional": false, + "propertyerror": false + } + }, + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } + } + } + } + } + } +} \ No newline at end of file diff --git a/tests/result_tutorial/230/doc.sh b/tests/result_tutorial/230/doc.sh new file mode 100644 index 000000000..1462f00b4 --- /dev/null +++ b/tests/result_tutorial/230/doc.sh @@ -0,0 +1,331 @@ +Firefox + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family is a namespace. +โ–Œ Path: firefox +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.proxy_mode โ”‚ Configure Proxy Access to the โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ 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 + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual +โ–Œ  basic   disabled  +โ–Œ Disabled: when the variable "Configure Proxy Access to the Internet" +โ–Œ (firefox.proxy_mode) hasn't the value "Manual proxy configuration". + + HTTP Proxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual.http_proxy +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.http_proxy.address โ”‚ HTTP proxy address. โ”‚ +โ”‚  domainname   basic   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.http_proxy.port โ”‚ HTTP proxy port. โ”‚ +โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: 8080 โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.use_for_https โ”‚ Also use this proxy for HTTPS. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: true โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + + HTTPS Proxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual.https_proxy +โ–Œ  standard   hidden  +โ–Œ Hidden: when the variable "Also use this proxy for HTTPS" +โ–Œ (firefox.manual.use_for_https) has the value "true". + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.https_proxy.address โ”‚ HTTPS proxy address. โ”‚ +โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: the value of the variable โ”‚ +โ”‚ โ”‚ "HTTP proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.https_proxy.port โ”‚ HTTPS proxy port. โ”‚ +โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: the value of the variable โ”‚ +โ”‚ โ”‚ "HTTP proxy port" โ”‚ +โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + + SOCKS Proxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.manual.socks_proxy +โ–Œ  standard  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ +โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.auto โ”‚ Automatic proxy configuration URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) โ”‚ +โ”‚ โ”‚ hasn't the value "Automatic proxy โ”‚ +โ”‚ โ”‚ configuration URL". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.no_proxy โ”‚ Address for which proxy will be โ”‚ +โ”‚  domainname   multiple   standard    โ”‚ desactivated. โ”‚ +โ”‚ disabled   unique  โ”‚ Connections to localhost, โ”‚ +โ”‚ โ”‚ 127.0.0.1/8 and ::1 are never โ”‚ +โ”‚ โ”‚ proxied. โ”‚ +โ”‚ โ”‚ Validators: โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can starts by a โ”‚ +โ”‚ โ”‚ dot โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be network in โ”‚ +โ”‚ โ”‚ CIDR format โ”‚ +โ”‚ โ”‚ Examples: โ”‚ +โ”‚ โ”‚ โ€ข .mozilla.org โ”‚ +โ”‚ โ”‚ โ€ข .net.nz โ”‚ +โ”‚ โ”‚ โ€ข 192.168.1.0/24 โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.prompt_authentication โ”‚ Prompt for authentication if โ”‚ +โ”‚  boolean   standard   mandatory    โ”‚ password is saved. โ”‚ +โ”‚ disabled  โ”‚ Default: true โ”‚ +โ”‚ โ”‚ Disabled: when the variable โ”‚ +โ”‚ โ”‚ "Configure Proxy Access to the โ”‚ +โ”‚ โ”‚ Internet" (firefox.proxy_mode) has โ”‚ +โ”‚ โ”‚ the value "No proxy". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ +โ”‚ โ”‚ to the Internet" โ”‚ +โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ +โ”‚ โ”‚ proxy configuration" โ”‚ +โ”‚ โ”‚ or "SOCKS host version used by โ”‚ +โ”‚ โ”‚ proxy" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ +โ”‚ โ”‚ is "v4". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + + DNS over HTTPS + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ Path: firefox.dns_over_https +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ +โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.provider โ”‚ Use Provider. โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข Cloudflare โ† (default) โ”‚ +โ”‚ โ”‚ โ€ข NextDNS โ”‚ +โ”‚ โ”‚ โ€ข Custom โ”‚ +โ”‚ โ”‚ Disabled: when the variable "Enable โ”‚ +โ”‚ โ”‚ DNS over HTTPS" โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.enable_dns_โ€ฆ โ”‚ +โ”‚ โ”‚ has the value "false". โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ firefox.dns_over_https.custom_dns_url โ”‚ Custom DNS URL. โ”‚ +โ”‚  web address   basic   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข must starts with 'https://' only โ”‚ +โ”‚ โ”‚ Disabled: if "Use Provider" โ”‚ +โ”‚ โ”‚ (firefox.dns_over_https.provider) is โ”‚ +โ”‚ โ”‚ not "Custom". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +Foxyproxy + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family is a namespace. +โ–Œ Path: foxyproxy +โ–Œ  basic  + + Proxy configuration + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family contains lists of variable blocks. +โ–Œ Path: foxyproxy.proxies +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ foxyproxy.proxies.title โ”‚ Title or Description. โ”‚ +โ”‚  string   multiple   standard    โ”‚ โ”‚ +โ”‚ unique  โ”‚ โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ +โ”‚ โ”‚ โ€ข HTTP โ”‚ +โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ +โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ +โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ +โ”‚ โ”‚ โ€ข PAC URL โ”‚ +โ”‚ โ”‚ โ€ข WPAD โ”‚ +โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ +โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ +โ”‚  regexp   basic   mandatory   auto  โ”‚ Validator: text based with regular โ”‚ +โ”‚ modified  โ”‚ expressions โ”‚ +โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ +โ”‚ โ”‚ Default: random color value. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ +โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ +โ”‚ โ”‚ not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ +โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: if a password is set. โ”‚ +โ”‚ disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ +โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ +โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is "Auto". โ”‚ +โ”‚ โ”‚ Disabled: if type is not in: โ”‚ +โ”‚ โ”‚ - PAC URL โ”‚ +โ”‚ โ”‚ - WPAD. โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/230/doc_changelog.sh b/tests/result_tutorial/230/doc_changelog.sh new file mode 100644 index 000000000..84bac03f6 --- /dev/null +++ b/tests/result_tutorial/230/doc_changelog.sh @@ -0,0 +1,21 @@ +New variables + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ +โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: if a password is set. โ”‚ +โ”‚ disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ +โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/result_tutorial/211/doc.json b/tests/result_tutorial/231/doc.json similarity index 96% rename from tests/result_tutorial/211/doc.json rename to tests/result_tutorial/231/doc.json index 6b557d234..b3ac55a7e 100644 --- a/tests/result_tutorial/211/doc.json +++ b/tests/result_tutorial/231/doc.json @@ -258,27 +258,9 @@ "path": "firefox.manual.socks_proxy.address", "name": "address", "description": "SOCKS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], + "properties": [], "mode": "standard", "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, "variable_type": "domainname", "validators": { "name": "Validators", @@ -298,20 +280,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "firefox.manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } + "values": "1080" }, "variable_type": "port", "validators": { @@ -333,6 +321,19 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "message": "when the variable {0} has the value \"null\".", + "path": { + "path": "firefox.manual.socks_proxy.address" + }, + "description": "SOCKS proxy address" + } } ], "mode": "standard", diff --git a/tests/result_tutorial/211/doc.sh b/tests/result_tutorial/231/doc.sh similarity index 96% rename from tests/result_tutorial/211/doc.sh rename to tests/result_tutorial/231/doc.sh index 190354a77..e5561ab65 100644 --- a/tests/result_tutorial/211/doc.sh +++ b/tests/result_tutorial/231/doc.sh @@ -106,29 +106,32 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ firefox.manual.socks_proxy.address โ”‚ SOCKS proxy address. โ”‚ -โ”‚  domainname   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚  domainname   standard  โ”‚ Validators: โ”‚ โ”‚ โ”‚ โ€ข type domainname โ”‚ โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy address" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.address). โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.port โ”‚ SOCKS proxy port. โ”‚ -โ”‚  port   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ โ”‚ โ”‚ allowed โ”‚ โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ โ”‚ โ”‚ are allowed โ”‚ โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: the value of the variable โ”‚ -โ”‚ โ”‚ "HTTP proxy port" โ”‚ -โ”‚ โ”‚ (firefox.manual.http_proxy.port). โ”‚ +โ”‚ โ”‚ Default: 1080 โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.manual.socks_proxy.version โ”‚ SOCKS host version used by proxy. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข v4 โ”‚ +โ”‚  choice   standard   mandatory    โ”‚ Choices: โ”‚ +โ”‚ disabled  โ”‚ โ€ข v4 โ”‚ โ”‚ โ”‚ โ€ข v5 โ† (default) โ”‚ +โ”‚ โ”‚ Disabled: when the variable "SOCKS โ”‚ +โ”‚ โ”‚ proxy address" โ”‚ +โ”‚ โ”‚ (firefox.manual.socks_proxy.address) โ”‚ +โ”‚ โ”‚ has the value "null". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ diff --git a/tests/result_tutorial/211/doc_changelog.sh b/tests/result_tutorial/231/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/211/doc_changelog.sh rename to tests/result_tutorial/231/doc_changelog.sh