diff options
| -rw-r--r-- | Makefile | 32 | ||||
| -rw-r--r-- | interface-definitions/arp.xml.in (renamed from interface-definitions/arp.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/bcast-relay.xml.in (renamed from interface-definitions/bcast-relay.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/beep-on-boot.xml.in (renamed from interface-definitions/beep-on-boot.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/cron.xml.in (renamed from interface-definitions/cron.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/dhcp-relay.xml.in (renamed from interface-definitions/dhcp-relay.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/dhcp-server.xml.in (renamed from interface-definitions/dhcp-server.xml) | 2 | ||||
| -rw-r--r-- | interface-definitions/dhcpv6-relay.xml.in (renamed from interface-definitions/dhcpv6-relay.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/dhcpv6-server.xml.in (renamed from interface-definitions/dhcpv6-server.xml) | 2 | ||||
| -rw-r--r-- | interface-definitions/dns-domain-name.xml.in (renamed from interface-definitions/dns-domain-name.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/dns-dynamic.xml.in (renamed from interface-definitions/dns-dynamic.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/dns-forwarding.xml.in (renamed from interface-definitions/dns-forwarding.xml) | 2 | ||||
| -rw-r--r-- | interface-definitions/firewall-options.xml.in (renamed from interface-definitions/firewall-options.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/https.xml.in (renamed from interface-definitions/https.xml) | 1 | ||||
| -rw-r--r-- | interface-definitions/igmp-proxy.xml.in (renamed from interface-definitions/igmp-proxy.xml) | 2 | ||||
| -rw-r--r-- | interface-definitions/intel_qat.xml.in (renamed from interface-definitions/intel_qat.xml) | 1 | ||||
| -rw-r--r-- | interface-definitions/interfaces-bonding.xml.in (renamed from interface-definitions/interfaces-bonding.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in (renamed from interface-definitions/interfaces-bridge.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/interfaces-dummy.xml.in (renamed from interface-definitions/interfaces-dummy.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/interfaces-ethernet.xml.in (renamed from interface-definitions/interfaces-ethernet.xml) | 8 | ||||
| -rw-r--r-- | interface-definitions/interfaces-geneve.xml.in (renamed from interface-definitions/interfaces-geneve.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/interfaces-loopback.xml.in (renamed from interface-definitions/interfaces-loopback.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/interfaces-openvpn.xml.in (renamed from interface-definitions/interfaces-openvpn.xml) | 4 | ||||
| -rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in (renamed from interface-definitions/interfaces-vxlan.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireguard.xml.in (renamed from interface-definitions/interfaces-wireguard.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireless.xml.in (renamed from interface-definitions/interfaces-wireless.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/ipoe-server.xml.in (renamed from interface-definitions/ipoe-server.xml) | 2 | ||||
| -rw-r--r-- | interface-definitions/ipsec-settings.xml.in (renamed from interface-definitions/ipsec-settings.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/l2tp-server.xml.in (renamed from interface-definitions/l2tp-server.xml) | 4 | ||||
| -rw-r--r-- | interface-definitions/mdns-repeater.xml.in (renamed from interface-definitions/mdns-repeater.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/ntp.xml.in (renamed from interface-definitions/ntp.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/pppoe-server.xml.in (renamed from interface-definitions/pppoe-server.xml) | 20 | ||||
| -rw-r--r-- | interface-definitions/pptp-server.xml.in (renamed from interface-definitions/pptp-server.xml) | 6 | ||||
| -rw-r--r-- | interface-definitions/protocols-bfd.xml.in (renamed from interface-definitions/protocols-bfd.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/snmp.xml.in (renamed from interface-definitions/snmp.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/ssh.xml.in (renamed from interface-definitions/ssh.xml) | 4 | ||||
| -rw-r--r-- | interface-definitions/sstp.xml.in (renamed from interface-definitions/sstp.xml) | 2 | ||||
| -rw-r--r-- | interface-definitions/system-proxy.xml.in (renamed from interface-definitions/system-proxy.xml) | 2 | ||||
| -rw-r--r-- | interface-definitions/system-syslog.xml.in (renamed from interface-definitions/system-syslog.xml) | 6 | ||||
| -rw-r--r-- | interface-definitions/tftp-server.xml.in (renamed from interface-definitions/tftp-server.xml) | 0 | ||||
| -rw-r--r-- | interface-definitions/vrrp.xml.in (renamed from interface-definitions/vrrp.xml) | 0 |
41 files changed, 61 insertions, 39 deletions
@@ -1,12 +1,35 @@ TMPL_DIR := templates-cfg OP_TMPL_DIR := templates-op +BUILD_DIR := build +CFLAGS := + +src = $(wildcard interface-definitions/*.xml.in) +obj = $(src:.xml.in=.xml) + +%.xml: %.xml.in + @echo Generating $(BUILD_DIR)/$@ from $< + # -ansi This turns off certain features of GCC that are incompatible + # with ISO C90. Without this regexes containing '/' as in an URL + # won't work + # -x c By default GCC guesses the input language from its file extension, + # thus XML is unknown. Force it to C language + # -E Stop after the preprocessing stage + # -undef Do not predefine any system-specific or GCC-specific macros. + # -nostdinc Do not search the standard system directories for header files + # -P Inhibit generation of linemarkers in the output from the + # preprocessor + @gcc -ansi -x c -E -undef -nostdinc -P -o $(BUILD_DIR)/$@ -c $< + +$(BUILD_DIR): + install -d -m 0755 $(BUILD_DIR)/interface-definitions + install -d -m 0755 $(BUILD_DIR)/op-mode-definitions .PHONY: interface_definitions .ONESHELL: -interface_definitions: +interface_definitions: $(BUILD_DIR) $(obj) mkdir -p $(TMPL_DIR) - find $(CURDIR)/interface-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1 + find $(BUILD_DIR)/interface-definitions -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1 # XXX: delete top level node.def's that now live in other packages rm -f $(TMPL_DIR)/firewall/node.def @@ -56,8 +79,9 @@ all: clean interface_definitions op_mode_definitions .PHONY: clean clean: - rm -rf $(TMPL_DIR)/* - rm -rf $(OP_TMPL_DIR)/* + rm -rf $(BUILD_DIR) + rm -rf $(TMPL_DIR) + rm -rf $(OP_TMPL_DIR) .PHONY: test test: diff --git a/interface-definitions/arp.xml b/interface-definitions/arp.xml.in index b72f025a8..b72f025a8 100644 --- a/interface-definitions/arp.xml +++ b/interface-definitions/arp.xml.in diff --git a/interface-definitions/bcast-relay.xml b/interface-definitions/bcast-relay.xml.in index 96ce16639..96ce16639 100644 --- a/interface-definitions/bcast-relay.xml +++ b/interface-definitions/bcast-relay.xml.in diff --git a/interface-definitions/beep-on-boot.xml b/interface-definitions/beep-on-boot.xml.in index 0da7d0de4..0da7d0de4 100644 --- a/interface-definitions/beep-on-boot.xml +++ b/interface-definitions/beep-on-boot.xml.in diff --git a/interface-definitions/cron.xml b/interface-definitions/cron.xml.in index 2d4921bf0..2d4921bf0 100644 --- a/interface-definitions/cron.xml +++ b/interface-definitions/cron.xml.in diff --git a/interface-definitions/dhcp-relay.xml b/interface-definitions/dhcp-relay.xml.in index b83402aa1..b83402aa1 100644 --- a/interface-definitions/dhcp-relay.xml +++ b/interface-definitions/dhcp-relay.xml.in diff --git a/interface-definitions/dhcp-server.xml b/interface-definitions/dhcp-server.xml.in index 7d42294e8..e8bdff3df 100644 --- a/interface-definitions/dhcp-server.xml +++ b/interface-definitions/dhcp-server.xml.in @@ -414,7 +414,7 @@ </leafNode> <leafNode name="time-offset"> <properties> - <help>Offset of the client's subnet in seconds from Coordinated Universal Time (UTC)</help> + <help>Client subnet offset in seconds from Coordinated Universal Time (UTC)</help> <valueHelp> <format>[-]N</format> <description>Time offset (number, may be negative)</description> diff --git a/interface-definitions/dhcpv6-relay.xml b/interface-definitions/dhcpv6-relay.xml.in index 0beb09d05..0beb09d05 100644 --- a/interface-definitions/dhcpv6-relay.xml +++ b/interface-definitions/dhcpv6-relay.xml.in diff --git a/interface-definitions/dhcpv6-server.xml b/interface-definitions/dhcpv6-server.xml.in index 28b56a64d..7d4c0de23 100644 --- a/interface-definitions/dhcpv6-server.xml +++ b/interface-definitions/dhcpv6-server.xml.in @@ -300,7 +300,7 @@ <constraint> <regex>([0-9A-Fa-f]{1,2}[:])*([0-9A-Fa-f]{1,2})</regex> </constraint> - <constraintErrorMessage>Invalid DUID. Must be in the format h[[:h]...] where each \"h\" is 1 to 2 hex characters.</constraintErrorMessage> + <constraintErrorMessage>Invalid DUID, must be in the format h[[:h]...]</constraintErrorMessage> </properties> </leafNode> <leafNode name="ipv6-address"> diff --git a/interface-definitions/dns-domain-name.xml b/interface-definitions/dns-domain-name.xml.in index c16f0b02a..c16f0b02a 100644 --- a/interface-definitions/dns-domain-name.xml +++ b/interface-definitions/dns-domain-name.xml.in diff --git a/interface-definitions/dns-dynamic.xml b/interface-definitions/dns-dynamic.xml.in index 8e7e77475..8e7e77475 100644 --- a/interface-definitions/dns-dynamic.xml +++ b/interface-definitions/dns-dynamic.xml.in diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml.in index a88c174e3..8b89bf758 100644 --- a/interface-definitions/dns-forwarding.xml +++ b/interface-definitions/dns-forwarding.xml.in @@ -47,7 +47,7 @@ </valueHelp> <valueHelp> <format>process-no-validate</format> - <description>Respond with DNSSEC records to clients that ask for it. Don't do any validation.</description> + <description>Respond with DNSSEC records to clients that ask for it. No validation done at all!</description> </valueHelp> <valueHelp> <format>process</format> diff --git a/interface-definitions/firewall-options.xml b/interface-definitions/firewall-options.xml.in index 2936cc703..2936cc703 100644 --- a/interface-definitions/firewall-options.xml +++ b/interface-definitions/firewall-options.xml.in diff --git a/interface-definitions/https.xml b/interface-definitions/https.xml.in index d9874a1f9..923aac811 100644 --- a/interface-definitions/https.xml +++ b/interface-definitions/https.xml.in @@ -132,4 +132,3 @@ </children> </node> </interfaceDefinition> - diff --git a/interface-definitions/igmp-proxy.xml b/interface-definitions/igmp-proxy.xml.in index ab56019b4..74fec6b48 100644 --- a/interface-definitions/igmp-proxy.xml +++ b/interface-definitions/igmp-proxy.xml.in @@ -31,7 +31,7 @@ <children> <leafNode name="alt-subnet"> <properties> - <help>Allowed unicast sources for multicast traffic to be proxy'ed</help> + <help>Unicast source networks allowed for multicast traffic to be proxyed</help> <valueHelp> <format>ipv4net</format> <description>IPv4 network</description> diff --git a/interface-definitions/intel_qat.xml b/interface-definitions/intel_qat.xml.in index 5e4d5b190..812484184 100644 --- a/interface-definitions/intel_qat.xml +++ b/interface-definitions/intel_qat.xml.in @@ -19,4 +19,3 @@ </children> </node> </interfaceDefinition> - diff --git a/interface-definitions/interfaces-bonding.xml b/interface-definitions/interfaces-bonding.xml.in index 821dd15fa..821dd15fa 100644 --- a/interface-definitions/interfaces-bonding.xml +++ b/interface-definitions/interfaces-bonding.xml.in diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml.in index 40505d7de..40505d7de 100644 --- a/interface-definitions/interfaces-bridge.xml +++ b/interface-definitions/interfaces-bridge.xml.in diff --git a/interface-definitions/interfaces-dummy.xml b/interface-definitions/interfaces-dummy.xml.in index 3bc4330e4..3bc4330e4 100644 --- a/interface-definitions/interfaces-dummy.xml +++ b/interface-definitions/interfaces-dummy.xml.in diff --git a/interface-definitions/interfaces-ethernet.xml b/interface-definitions/interfaces-ethernet.xml.in index f51bb3d87..2c89c3604 100644 --- a/interface-definitions/interfaces-ethernet.xml +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -821,24 +821,24 @@ <properties> <help>VLAN egress QoS</help> <completionHelp> - <script>echo Format for qos mapping \"0:1 1:6 7:6\"</script> + <script>echo Format for qos mapping, e.g.: '0:1 1:6 7:6'</script> </completionHelp> <constraint> <regex>[:0-7 ]+$</regex> </constraint> - <constraintErrorMessage>QoS mapping should be in the format of \"0:7 2:3\" with numbers 0-9</constraintErrorMessage> + <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage> </properties> </leafNode> <leafNode name="ingress-qos"> <properties> <help>VLAN ingress QoS</help> <completionHelp> - <script>echo Format for qos mapping \"0:1 1:6 7:6\"</script> + <script>echo Format for qos mapping '0:1 1:6 7:6'</script> </completionHelp> <constraint> <regex>[:0-7 ]+$</regex> </constraint> - <constraintErrorMessage>QoS mapping should be in the format of \"0:7 2:3\" with numbers 0-9</constraintErrorMessage> + <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage> </properties> </leafNode> <node name="ip"> diff --git a/interface-definitions/interfaces-geneve.xml b/interface-definitions/interfaces-geneve.xml.in index e65ce6826..e65ce6826 100644 --- a/interface-definitions/interfaces-geneve.xml +++ b/interface-definitions/interfaces-geneve.xml.in diff --git a/interface-definitions/interfaces-loopback.xml b/interface-definitions/interfaces-loopback.xml.in index 0f003bc64..0f003bc64 100644 --- a/interface-definitions/interfaces-loopback.xml +++ b/interface-definitions/interfaces-loopback.xml.in diff --git a/interface-definitions/interfaces-openvpn.xml b/interface-definitions/interfaces-openvpn.xml.in index 2c2556f45..ca97ad4ec 100644 --- a/interface-definitions/interfaces-openvpn.xml +++ b/interface-definitions/interfaces-openvpn.xml.in @@ -610,7 +610,7 @@ </leafNode> <leafNode name="key-file"> <properties> - <help>File containing this host's private key</help> + <help>Private key for this host</help> <valueHelp> <format>file</format> <description>File in /config/auth directory</description> @@ -645,7 +645,7 @@ </leafNode> <leafNode name="role"> <properties> - <help>File containing this host's private key</help> + <help>Private key for this host</help> <completionHelp> <list>active passive</list> </completionHelp> diff --git a/interface-definitions/interfaces-vxlan.xml b/interface-definitions/interfaces-vxlan.xml.in index f93711741..f93711741 100644 --- a/interface-definitions/interfaces-vxlan.xml +++ b/interface-definitions/interfaces-vxlan.xml.in diff --git a/interface-definitions/interfaces-wireguard.xml b/interface-definitions/interfaces-wireguard.xml.in index 0c32a3bc1..0c32a3bc1 100644 --- a/interface-definitions/interfaces-wireguard.xml +++ b/interface-definitions/interfaces-wireguard.xml.in diff --git a/interface-definitions/interfaces-wireless.xml b/interface-definitions/interfaces-wireless.xml.in index 6bc49dddb..6bc49dddb 100644 --- a/interface-definitions/interfaces-wireless.xml +++ b/interface-definitions/interfaces-wireless.xml.in diff --git a/interface-definitions/ipoe-server.xml b/interface-definitions/ipoe-server.xml.in index 48f3e0fd9..5fee02614 100644 --- a/interface-definitions/ipoe-server.xml +++ b/interface-definitions/ipoe-server.xml.in @@ -289,7 +289,7 @@ </leafNode> <leafNode name="fail-time"> <properties> - <help>If server doesn't responds mark it as unavailable for this amount of time in seconds</help> + <help>If server does not respond, mark it unavailable for this time (seconds)</help> </properties> </leafNode> </children> diff --git a/interface-definitions/ipsec-settings.xml b/interface-definitions/ipsec-settings.xml.in index bc54baa27..bc54baa27 100644 --- a/interface-definitions/ipsec-settings.xml +++ b/interface-definitions/ipsec-settings.xml.in diff --git a/interface-definitions/l2tp-server.xml b/interface-definitions/l2tp-server.xml.in index e76b92b23..4e3a49b24 100644 --- a/interface-definitions/l2tp-server.xml +++ b/interface-definitions/l2tp-server.xml.in @@ -359,7 +359,7 @@ </valueHelp> <valueHelp> <format>prefer</format> - <description>ask client for mppe, if it rejects don't fail</description> + <description>Ask client for mppe, if it rejects do not fail</description> </valueHelp> <valueHelp> <format>require</format> @@ -471,7 +471,7 @@ </leafNode> <leafNode name="fail-time"> <properties> - <help>If server doesn't responds mark it as unavailable for this amount of time in seconds</help> + <help>If server doesn not responds mark it unavailable for this time (seconds)</help> </properties> </leafNode> </children> diff --git a/interface-definitions/mdns-repeater.xml b/interface-definitions/mdns-repeater.xml.in index a59321294..a59321294 100644 --- a/interface-definitions/mdns-repeater.xml +++ b/interface-definitions/mdns-repeater.xml.in diff --git a/interface-definitions/ntp.xml b/interface-definitions/ntp.xml.in index 945345898..945345898 100644 --- a/interface-definitions/ntp.xml +++ b/interface-definitions/ntp.xml.in diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml.in index c2feef65b..6e99c2fd7 100644 --- a/interface-definitions/pppoe-server.xml +++ b/interface-definitions/pppoe-server.xml.in @@ -28,7 +28,7 @@ <regex>^[a-zA-Z0-9]{1,100}</regex> </constraint> <constraintErrorMessage>access-concentrator name limited to alphanumerical characters only (max. 100)</constraintErrorMessage> - </properties> + </properties> </leafNode> <node name="authentication"> <properties> @@ -127,7 +127,7 @@ </leafNode> <leafNode name="fail-time"> <properties> - <help>If server doesn't responds mark it as unavailable for this amount of time in seconds</help> + <help>If server does not responds mark it as unavailable for this amount of time in seconds</help> </properties> </leafNode> </children> @@ -293,7 +293,7 @@ </properties> </leafNode> </children> - </node> + </node> <node name="dnsv6-servers"> <properties> <help>IPv6 Domain Name Service (DNS) server</help> @@ -481,7 +481,7 @@ </leafNode> <leafNode name="prefer"> <properties> - <help>Ask client for MPPE, if it rejects don't fail</help> + <help>Ask client for MPPE, if it rejects do not fail</help> <valueless /> </properties> </leafNode> @@ -526,7 +526,7 @@ <constraintErrorMessage>invalid value</constraintErrorMessage> <valueHelp> <format>deny</format> - <description>Don't negotiate IPv4</description> + <description>Do not negotiate IPv4</description> </valueHelp> <valueHelp> <format>allow</format> @@ -534,7 +534,7 @@ </valueHelp> <valueHelp> <format>prefer</format> - <description>Ask client for IPv4 negotiation, don't fail if it rejects</description> + <description>Ask client for IPv4 negotiation, do not fail if it rejects</description> </valueHelp> <valueHelp> <format>require</format> @@ -551,7 +551,7 @@ <constraintErrorMessage>invalid value</constraintErrorMessage> <valueHelp> <format>deny</format> - <description>Don't negotiate IPv6</description> + <description>Do not negotiate IPv6</description> </valueHelp> <valueHelp> <format>allow</format> @@ -559,7 +559,7 @@ </valueHelp> <valueHelp> <format>prefer</format> - <description>Ask client for IPv6 negotiation, don't fail if it rejects</description> + <description>Ask client for IPv6 negotiation, do not fail if it rejects</description> </valueHelp> <valueHelp> <format>require</format> @@ -603,8 +603,8 @@ </leafNode> <leafNode name="ipv6-accept-peer-intf-id"> <properties> - <help>Accept peer's interface identifier</help> - <valueless /> + <help>Accept peer interface identifier</help> + <valueless /> </properties> </leafNode> </children> diff --git a/interface-definitions/pptp-server.xml b/interface-definitions/pptp-server.xml.in index 5d16f8b9f..3b4ea4f17 100644 --- a/interface-definitions/pptp-server.xml +++ b/interface-definitions/pptp-server.xml.in @@ -58,7 +58,7 @@ </properties> </leafNode> </children> - </node> + </node> <node name="wins-servers"> <properties> <help>Windows Internet Name Service (WINS) server settings</help> @@ -148,7 +148,7 @@ </valueHelp> <valueHelp> <format>prefer</format> - <description>ask client for mppe, if it rejects don't fail</description> + <description>ask client for mppe, if it rejects do not fail</description> </valueHelp> <valueHelp> <format>require</format> @@ -236,7 +236,7 @@ </leafNode> <leafNode name="fail-time"> <properties> - <help>If server doesn't responds mark it as unavailable for this amount of time in seconds</help> + <help>If server does not responds mark it as unavailable for this time (seconds)</help> </properties> </leafNode> </children> diff --git a/interface-definitions/protocols-bfd.xml b/interface-definitions/protocols-bfd.xml.in index 62e2c87b9..62e2c87b9 100644 --- a/interface-definitions/protocols-bfd.xml +++ b/interface-definitions/protocols-bfd.xml.in diff --git a/interface-definitions/snmp.xml b/interface-definitions/snmp.xml.in index bdfbd4ab6..bdfbd4ab6 100644 --- a/interface-definitions/snmp.xml +++ b/interface-definitions/snmp.xml.in diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml.in index c0ce976d6..8dea94d05 100644 --- a/interface-definitions/ssh.xml +++ b/interface-definitions/ssh.xml.in @@ -83,7 +83,7 @@ </leafNode> <leafNode name="disable-host-validation"> <properties> - <help>Don't validate the remote host name with DNS</help> + <help>Disable IP Address to Hostname lookup</help> <valueless/> </properties> </leafNode> @@ -171,7 +171,7 @@ <properties> <help>how often send keep alives in seconds</help> <constraint> - <validator name="numeric" argument="--range 1-65535"/> + <validator name="numeric" argument="--range 1-65535"/> </constraint> </properties> </leafNode> diff --git a/interface-definitions/sstp.xml b/interface-definitions/sstp.xml.in index d944baaad..290b45a98 100644 --- a/interface-definitions/sstp.xml +++ b/interface-definitions/sstp.xml.in @@ -134,7 +134,7 @@ </leafNode> <leafNode name="fail-time"> <properties> - <help>If server doesn't responds mark it as unavailable for this amount of time in seconds</help> + <help>If server does not responds mark it as unavailable for this time (seconds)</help> </properties> </leafNode> </children> diff --git a/interface-definitions/system-proxy.xml b/interface-definitions/system-proxy.xml.in index f43702fc8..4b21139a6 100644 --- a/interface-definitions/system-proxy.xml +++ b/interface-definitions/system-proxy.xml.in @@ -11,7 +11,7 @@ <properties> <help>Proxy URL</help> <constraint> - <regex>^http://[a-z0-9\.]+$</regex> + <regex>http://[a-z0-9\.]+$</regex> </constraint> </properties> </leafNode> diff --git a/interface-definitions/system-syslog.xml b/interface-definitions/system-syslog.xml.in index 8f4b105c8..cce79a4c2 100644 --- a/interface-definitions/system-syslog.xml +++ b/interface-definitions/system-syslog.xml.in @@ -10,7 +10,7 @@ <children> <tagNode name="user"> <properties> - <help>Logging to specific user's terminal</help> + <help>Logging to specific terminal of given user</help> <constraint> <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex> </constraint> @@ -213,7 +213,7 @@ <constraint> <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex> </constraint> - <constraintErrorMessage>Invalid facility type</constraintErrorMessage> + <constraintErrorMessage>Invalid facility type</constraintErrorMessage> <valueHelp> <format>all</format> <description>All facilities excluding "mark"</description> @@ -574,7 +574,7 @@ <help>time interval how often a mark message is being sent in seconds (default: 1200)</help> <constraint> <validator name="numeric" argument="--positive"/> - </constraint> + </constraint> </properties> </leafNode> </children> diff --git a/interface-definitions/tftp-server.xml b/interface-definitions/tftp-server.xml.in index 2874b034c..2874b034c 100644 --- a/interface-definitions/tftp-server.xml +++ b/interface-definitions/tftp-server.xml.in diff --git a/interface-definitions/vrrp.xml b/interface-definitions/vrrp.xml.in index 2884ef613..2884ef613 100644 --- a/interface-definitions/vrrp.xml +++ b/interface-definitions/vrrp.xml.in |