Use val_help: features to format better

Previous change did not format val-help tag correctly

11 files changed, 28 insertions, 24 deletions

diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def
index f2bff386..8cdd27db 100644
--- a/templates/interfaces/ethernet/node.tag/address/node.def
+++ b/templates/interfaces/ethernet/node.tag/address/node.def
@@ -48,7 +48,7 @@ delete:
 
 allowed: echo "dhcp dhcpv6 <>"
 
-val_help:<x.x.x.x/x>; IP address and prefix length
-val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length
-val_help:dhcp; Dynamic Host Configuration Protocol
-val_help:dhcpv6; Dynamic Host Configuration Protocol for IPv6
+val_help: ipv4; IP address and prefix length
+val_help: ipv6; IPv6 address and prefix length
+val_help: dhcp; Dynamic Host Configuration Protocol
+val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
index 2b1e6243..22bac5a2 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Bridge port cost
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help:<1-65535>; Path cost value for Spanning Tree Protocol
+val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
index 35bd1a3f..41cf303f 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Bridge port priority
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
-val_help:<1-255>; Bridge port priority
+val_help: u32:1-255; Bridge port priority
diff --git a/templates/interfaces/ethernet/node.tag/duplex/node.def b/templates/interfaces/ethernet/node.tag/duplex/node.def
index a032266d..8fbe1594 100644
--- a/templates/interfaces/ethernet/node.tag/duplex/node.def
+++ b/templates/interfaces/ethernet/node.tag/duplex/node.def
@@ -2,12 +2,13 @@ type: txt
 help: Duplex mode
 default: "auto"
 syntax:expression: $VAR(@) in "auto", "half", "full"; "duplex must be auto, half or full"
-val_help:auto:Auto negotiation (default)
-val_help:half:Half duplex
-val_help:full:Full duplex
 
 commit:expression: ( $VAR(@) == "auto" && $VAR(../speed/@) == "auto" ) || \
 		   ( $VAR(@) != "auto" && $VAR(../speed/@) != "auto" ) ; \
 	"if duplex is hardcoded, speed must also be hardcoded"
 update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
 	--speed-duplex $VAR(../speed/@) $VAR(@)
+
+val_help: auto; Auto negotiation (default)
+val_help: half; Half duplex
+val_help: full; Full duplex
diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def
index bb8d3ea4..dcd73b7c 100644
--- a/templates/interfaces/ethernet/node.tag/mtu/node.def
+++ b/templates/interfaces/ethernet/node.tag/mtu/node.def
@@ -1,7 +1,8 @@
 type: u32
 help: Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
-val_help:<68-9000>:Maximum Transmission Unit (MTU)
+val_help: u32:68-9000; Maximum Transmission Unit (MTU)
+
 update: if ! ip link set $VAR(../@) mtu $VAR(@)
         then echo "Error setting MTU on dev $VAR(../@)"; exit 1
         fi
diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
index b1c33b6b..a6498f88 100644
--- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
+++ b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
@@ -15,8 +15,8 @@ type: txt
 
 help: CPU interrupt affinity mask
 
-val_help:<hex number>:Bitmask representing CPUs that this NIC will interrupt
-val_help:auto:affinity automatically (default)
+val_help: <hex>; Bitmask representing CPUs that this NIC will interrupt
+val_help: auto; Automatic CPU affinity (default)
 
 default: "auto"
 
diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def
index 5d68f524..d9be6f6d 100644
--- a/templates/interfaces/ethernet/node.tag/speed/node.def
+++ b/templates/interfaces/ethernet/node.tag/speed/node.def
@@ -2,15 +2,17 @@ type: txt
 help: Link speed
 default: "auto"
 syntax:expression: $VAR(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000"
-val_help:auto:Auto negotiation (default)
-val_help:10:10 Mbit/sec
-val_help:100:100 Mbit/sec
-val_help:1000:1 Gbit/sec
-val_help:2500:2.5 Gbit/sec
-val_help:10000:10 Gbit/sec
 
 commit:expression: ( $VAR(@) == "auto" && $VAR(../duplex/@) == "auto" ) || \
 		   ( $VAR(@) != "auto" && $VAR(../duplex/@) != "auto" ) ; \
               "if speed is hardcoded, duplex must also be hardcoded"
 update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
 	--speed-duplex $VAR(@) $VAR(../duplex/@)
+
+val_help: auto; Auto negotiation (default)
+val_help: 10; 10 Mbit/sec
+val_help: 100; 100 Mbit/sec
+val_help: 1000; 1 Gbit/sec
+val_help: 2500; 2.5 Gbit/sec
+val_help: 10000; 10 Gbit/sec
+
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index 0076668e..388ad332 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -3,7 +3,7 @@ priority: 319
 type: u32
 help: Virtual Local Area Network (VLAN) ID
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
-val_help:<0-4094>:VLAN ID
+val_help: u32:0-4094; VLAN ID
 
 create: if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
 	then echo "Error creating VLAN device $VAR(../@).$VAR(@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
index b3f360b6..7e1833c3 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
@@ -21,6 +21,6 @@ delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --de
 
 allowed: echo "dhcp <>"
 
-val_help:<x.x.x.x/x>; IP address and prefix length
-val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length
-val_help:dhcp; Dynamic Host Configuration Protocol
+val_help: ipv4; IP address and prefix length
+val_help: ipv6; IPv6 address and prefix length
+val_help: dhcp; Dynamic Host Configuration Protocol
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
index f25a36ac..243747b9 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Path cost for this port
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help:<1-65535>; Path cost value for Spanning Tree Protocol
+val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
index 38c11131..abda5971 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Port priority for this port
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
-val_help:<1-255>; Bridge port priority
+val_help: u32:1-255; Bridge port priority