From 18b303734d84c0c5677ea4d872ec068ffcab4cad Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 10 Jun 2022 18:06:31 +0000 Subject: xml: drop not always applicable REQUIRED suffix from completion help string If a parameter is required is determined from the Python string on commit. This "indicator" is not used consistently and sometimes missing, or added where it is not required anymore due to Python script improvement/rewrite. --- interface-definitions/dhcp-server.xml.in | 2 +- interface-definitions/dhcpv6-server.xml.in | 4 ++-- interface-definitions/dns-domain-name.xml.in | 2 +- interface-definitions/dns-dynamic.xml.in | 22 +++++++++++----------- interface-definitions/dns-forwarding.xml.in | 22 +++++++++++----------- interface-definitions/igmp-proxy.xml.in | 2 +- .../include/bgp/protocol-common-config.xml.i | 10 +++++----- interface-definitions/include/bgp/remote-as.xml.i | 2 +- .../include/firewall/action.xml.i | 2 +- interface-definitions/include/monitoring/url.xml.i | 2 +- .../include/ospf/protocol-common-config.xml.i | 6 +++--- interface-definitions/include/policy/action.xml.i | 2 +- .../include/policy/route-rule-action.xml.i | 2 +- interface-definitions/protocols-nhrp.xml.in | 6 +++--- .../service_monitoring_telegraf.xml.in | 8 ++++---- interface-definitions/service_router-advert.xml.in | 2 +- interface-definitions/service_webproxy.xml.in | 4 ++-- interface-definitions/system-lcd.xml.in | 2 +- interface-definitions/tftp-server.xml.in | 2 +- interface-definitions/vpn_ipsec.xml.in | 12 ++++++------ 20 files changed, 58 insertions(+), 58 deletions(-) (limited to 'interface-definitions') diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in index 60e738e01..6dabc5e1c 100644 --- a/interface-definitions/dhcp-server.xml.in +++ b/interface-definitions/dhcp-server.xml.in @@ -338,7 +338,7 @@ - Classless static route destination subnet [REQUIRED] + Classless static route destination subnet ipv4net IPv4 address and prefix length diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in index 10335b07e..9dff68a24 100644 --- a/interface-definitions/dhcpv6-server.xml.in +++ b/interface-definitions/dhcpv6-server.xml.in @@ -32,7 +32,7 @@ - DHCPv6 shared network name [REQUIRED] + DHCPv6 shared network name [-_a-zA-Z0-9.]+ @@ -64,7 +64,7 @@ - IPv6 DHCP subnet for this shared network [REQUIRED] + IPv6 DHCP subnet for this shared network ipv6net IPv6 address and prefix length diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index 0d6418272..70b2fb271 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -91,7 +91,7 @@ - IP Address [REQUIRED] + IP Address ipv4 IPv4 address diff --git a/interface-definitions/dns-dynamic.xml.in b/interface-definitions/dns-dynamic.xml.in index 6bc467b76..e41ba7f60 100644 --- a/interface-definitions/dns-dynamic.xml.in +++ b/interface-definitions/dns-dynamic.xml.in @@ -14,7 +14,7 @@ - Interface to send DDNS updates for [REQUIRED] + Interface to send DDNS updates for @@ -27,7 +27,7 @@ - File containing the secret key shared with remote DNS server [REQUIRED] + File containing the secret key shared with remote DNS server filename File in /config/auth directory @@ -36,13 +36,13 @@ - Record to be updated [REQUIRED] + Record to be updated - Server to be updated [REQUIRED] + Server to be updated @@ -60,14 +60,14 @@ - Zone to be updated [REQUIRED] + Zone to be updated - Service being used for Dynamic DNS [REQUIRED] + Service being used for Dynamic DNS afraid changeip cloudflare dnspark dslreports dyndns easydns namecheap noip sitelutions zoneedit @@ -127,23 +127,23 @@ - Hostname registered with DDNS service [REQUIRED] + Hostname registered with DDNS service - Login for DDNS service [REQUIRED] + Login for DDNS service - Password for DDNS service [REQUIRED] + Password for DDNS service - ddclient protocol used for DDNS service [REQUIRED FOR CUSTOM] + ddclient protocol used for DDNS service changeip cloudflare dnsmadeeasy dnspark dondominio dslreports1 dtdns duckdns dyndns2 easydns freedns freemyip googledomains hammernode1 namecheap nfsn noip sitelutions woima yandex zoneedit1 @@ -239,7 +239,7 @@ - Server to send DDNS update to [REQUIRED FOR CUSTOM] + Server to send DDNS update to IPv4 IP address of DDNS server diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in index 6ead3e199..12dc11de5 100644 --- a/interface-definitions/dns-forwarding.xml.in +++ b/interface-definitions/dns-forwarding.xml.in @@ -140,7 +140,7 @@ - IPv4 address [REQUIRED] + IPv4 address ipv4 IPv4 address @@ -173,7 +173,7 @@ - IPv6 address [REQUIRED] + IPv6 address ipv6 IPv6 address @@ -206,7 +206,7 @@ - Target DNS name [REQUIRED] + Target DNS name name.example.com An absolute DNS name @@ -238,7 +238,7 @@ - Mail server [REQUIRED] + Mail server name.example.com An absolute DNS name @@ -285,7 +285,7 @@ - Target DNS name [REQUIRED] + Target DNS name name.example.com An absolute DNS name @@ -317,7 +317,7 @@ - Record contents [REQUIRED] + Record contents text Record contents @@ -347,7 +347,7 @@ - Record contents [REQUIRED] + Record contents text Record contents @@ -376,7 +376,7 @@ - Service entry [REQUIRED] + Service entry u32:0-65535 Entry number @@ -388,7 +388,7 @@ - Server hostname [REQUIRED] + Server hostname name.example.com An absolute DNS name @@ -400,7 +400,7 @@ - Port number [REQUIRED] + Port number u32:0-65535 TCP/UDP port number @@ -460,7 +460,7 @@ - NAPTR rule [REQUIRED] + NAPTR rule u32:0-65535 Rule number diff --git a/interface-definitions/igmp-proxy.xml.in b/interface-definitions/igmp-proxy.xml.in index 8e738fa7f..50cb33a93 100644 --- a/interface-definitions/igmp-proxy.xml.in +++ b/interface-definitions/igmp-proxy.xml.in @@ -18,7 +18,7 @@ - Interface for IGMP proxy [REQUIRED] + Interface for IGMP proxy diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i index abaff5232..c1b465e43 100644 --- a/interface-definitions/include/bgp/protocol-common-config.xml.i +++ b/interface-definitions/include/bgp/protocol-common-config.xml.i @@ -1156,7 +1156,7 @@ - Confederation AS identifier [REQUIRED] + Confederation AS identifier u32:1-4294967294 Confederation AS id @@ -1208,7 +1208,7 @@ - Half-life time for dampening [REQUIRED] + Half-life time for dampening u32:1-45 Half-life penalty in minutes @@ -1220,7 +1220,7 @@ - Maximum duration to suppress a stable route [REQUIRED] + Maximum duration to suppress a stable route u32:1-255 Maximum suppress duration in minutes @@ -1232,7 +1232,7 @@ - Threshold to start reusing a route [REQUIRED] + Threshold to start reusing a route u32:1-20000 Re-use penalty points @@ -1244,7 +1244,7 @@ - When to start suppressing a route [REQUIRED] + When to start suppressing a route u32:1-20000 Start-suppress penalty points diff --git a/interface-definitions/include/bgp/remote-as.xml.i b/interface-definitions/include/bgp/remote-as.xml.i index 58595b3b9..79d3b95a9 100644 --- a/interface-definitions/include/bgp/remote-as.xml.i +++ b/interface-definitions/include/bgp/remote-as.xml.i @@ -1,7 +1,7 @@ - Neighbor BGP AS number [REQUIRED] + Neighbor BGP AS number external internal diff --git a/interface-definitions/include/firewall/action.xml.i b/interface-definitions/include/firewall/action.xml.i index 0f60e3c38..512cc23bd 100644 --- a/interface-definitions/include/firewall/action.xml.i +++ b/interface-definitions/include/firewall/action.xml.i @@ -1,7 +1,7 @@ - Rule action [REQUIRED] + Rule action accept reject drop diff --git a/interface-definitions/include/monitoring/url.xml.i b/interface-definitions/include/monitoring/url.xml.i index 32c81122d..fd61c38ea 100644 --- a/interface-definitions/include/monitoring/url.xml.i +++ b/interface-definitions/include/monitoring/url.xml.i @@ -1,7 +1,7 @@ - Remote URL [REQUIRED] + Remote URL url Remote URL diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i index c156d5b1c..791bbc0f8 100644 --- a/interface-definitions/include/ospf/protocol-common-config.xml.i +++ b/interface-definitions/include/ospf/protocol-common-config.xml.i @@ -16,7 +16,7 @@ - Filter for outgoing routing update [REQUIRED] + Filter for outgoing routing update bgp connected kernel rip static @@ -178,10 +178,10 @@ - OSPF network [REQUIRED] + OSPF network ipv4net - OSPF network [REQUIRED] + OSPF network diff --git a/interface-definitions/include/policy/action.xml.i b/interface-definitions/include/policy/action.xml.i index 0a3dc158a..5aa865523 100644 --- a/interface-definitions/include/policy/action.xml.i +++ b/interface-definitions/include/policy/action.xml.i @@ -1,7 +1,7 @@ - Action to take on entries matching this rule [REQUIRED] + Action to take on entries matching this rule permit deny diff --git a/interface-definitions/include/policy/route-rule-action.xml.i b/interface-definitions/include/policy/route-rule-action.xml.i index 1217055f2..456a21400 100644 --- a/interface-definitions/include/policy/route-rule-action.xml.i +++ b/interface-definitions/include/policy/route-rule-action.xml.i @@ -1,7 +1,7 @@ - Rule action [REQUIRED] + Rule action drop diff --git a/interface-definitions/protocols-nhrp.xml.in b/interface-definitions/protocols-nhrp.xml.in index 66ed26cd2..d7663c095 100644 --- a/interface-definitions/protocols-nhrp.xml.in +++ b/interface-definitions/protocols-nhrp.xml.in @@ -10,7 +10,7 @@ - Tunnel for NHRP [REQUIRED] + Tunnel for NHRP tun[0-9]+ @@ -44,7 +44,7 @@ - Set HUB fqdn (nbma-address - fqdn) [REQUIRED] + Set HUB fqdn (nbma-address - fqdn) <fqdn> Set the external HUB fqdn @@ -71,7 +71,7 @@ - Set HUB address (nbma-address - external hub address or fqdn) [REQUIRED] + Set HUB address (nbma-address - external hub address or fqdn) diff --git a/interface-definitions/service_monitoring_telegraf.xml.in b/interface-definitions/service_monitoring_telegraf.xml.in index bd528ea33..d0d9202c1 100644 --- a/interface-definitions/service_monitoring_telegraf.xml.in +++ b/interface-definitions/service_monitoring_telegraf.xml.in @@ -20,7 +20,7 @@ - Authentication organization for InfluxDB v2 [REQUIRED] + Authentication organization for InfluxDB v2 [a-zA-Z][1-9a-zA-Z@_\-.]{2,50} @@ -29,7 +29,7 @@ - Authentication token for InfluxDB v2 [REQUIRED] + Authentication token for InfluxDB v2 txt Authentication token @@ -83,7 +83,7 @@ - Remote database name [REQUIRED] + Remote database name txt Remote database name @@ -281,7 +281,7 @@ - Remote URL [REQUIRED] + Remote URL url Remote URL to Splunk collector diff --git a/interface-definitions/service_router-advert.xml.in b/interface-definitions/service_router-advert.xml.in index bb11e9cd0..40dac23ca 100644 --- a/interface-definitions/service_router-advert.xml.in +++ b/interface-definitions/service_router-advert.xml.in @@ -10,7 +10,7 @@ - Interface to send RA on [REQUIRED] + Interface to send RA on diff --git a/interface-definitions/service_webproxy.xml.in b/interface-definitions/service_webproxy.xml.in index 9a75bc27d..42f5bba9f 100644 --- a/interface-definitions/service_webproxy.xml.in +++ b/interface-definitions/service_webproxy.xml.in @@ -288,7 +288,7 @@ - IPv4 listen-address for WebProxy [REQUIRED] + IPv4 listen-address for WebProxy @@ -452,7 +452,7 @@ - Source-group for this rule [REQUIRED] + Source-group for this rule group Source group identifier for this rule diff --git a/interface-definitions/system-lcd.xml.in b/interface-definitions/system-lcd.xml.in index 9b1a15317..0cf4de308 100644 --- a/interface-definitions/system-lcd.xml.in +++ b/interface-definitions/system-lcd.xml.in @@ -10,7 +10,7 @@ - Model of the display attached to this system [REQUIRED] + Model of the display attached to this system cfa-533 cfa-631 cfa-633 cfa-635 hd44780 sdec diff --git a/interface-definitions/tftp-server.xml.in b/interface-definitions/tftp-server.xml.in index 4963eab3c..8ca4da883 100644 --- a/interface-definitions/tftp-server.xml.in +++ b/interface-definitions/tftp-server.xml.in @@ -11,7 +11,7 @@ - Folder containing files served by TFTP [REQUIRED] + Folder containing files served by TFTP diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in index 555ba689f..d884d6ce6 100644 --- a/interface-definitions/vpn_ipsec.xml.in +++ b/interface-definitions/vpn_ipsec.xml.in @@ -209,7 +209,7 @@ - ESP group proposal [REQUIRED] + ESP group proposal u32:1-65535 ESP group proposal number @@ -669,7 +669,7 @@ #include - Authentication [REQUIRED] + Authentication @@ -951,7 +951,7 @@ #include - Peer authentication [REQUIRED] + Peer authentication #include @@ -1077,10 +1077,10 @@ #include - Peer tunnel [REQUIRED] + Peer tunnel u32 - Peer tunnel [REQUIRED] + Peer tunnel @@ -1144,7 +1144,7 @@ - Virtual tunnel interface [REQUIRED] + Virtual tunnel interface -- cgit v1.2.3