diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-07-23 12:12:17 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-07-23 12:12:17 -0400 |
| commit | dfcec18ba8e4a99889143a75411c34f2387a969c (patch) | |
| tree | f83b044cc606134b1891afb8d8b9d92905a862a6 | |
| parent | 6af7b74e2b80b014a80c0c8531b7e219194a9d92 (diff) | |
| parent | 36f8a1e4e5966c43c5330ff223fa2ef07d346b6e (diff) | |
| download | vyos-1x-dfcec18ba8e4a99889143a75411c34f2387a969c.tar.gz vyos-1x-dfcec18ba8e4a99889143a75411c34f2387a969c.zip | |
Merge branch 'current' into equuleus
| -rw-r--r-- | interface-definitions/pppoe-server.xml | 2 | ||||
| -rw-r--r-- | interface-definitions/wireguard.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml index aab830f1e..c2feef65b 100644 --- a/interface-definitions/pppoe-server.xml +++ b/interface-definitions/pppoe-server.xml @@ -27,7 +27,7 @@ <constraint> <regex>^[a-zA-Z0-9]{1,100}</regex> </constraint> - <constraintErrorMessage>access-concentrator name limited to aplhanumerical characters only (max. 100)</constraintErrorMessage> + <constraintErrorMessage>access-concentrator name limited to alphanumerical characters only (max. 100)</constraintErrorMessage> </properties> </leafNode> <node name="authentication"> diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml index e752a2f1d..9cfcd32ee 100644 --- a/interface-definitions/wireguard.xml +++ b/interface-definitions/wireguard.xml @@ -23,7 +23,7 @@ <validator name="cidr"/> </constraint> <valueHelp> - <format>ipv4-address</format> + <format>ipv4net</format> <description>IPv4 address and prefix length</description> </valueHelp> <valueHelp> |