Bug #170: Improve help strings.

10 files changed, 21 insertions, 21 deletions

diff --git a/templates/interfaces/l2tpv3/node.def b/templates/interfaces/l2tpv3/node.def
index 1cb12166..de12448e 100644
--- a/templates/interfaces/l2tpv3/node.def
+++ b/templates/interfaces/l2tpv3/node.def
@@ -1,8 +1,8 @@
 tag:
 priority: 380
 type: txt
-help: l2tpv3 interface
-val_help: <l2tpethN>; l2tpv3 interface name
+help: L2TPv3 interface
+val_help: <l2tpethN>; L2TPv3 interface name
 syntax:expression: pattern $VAR(@) "^l2tpeth[0-9]+$" \
                    ; "tunnel must be (l2tpeth0-l2tpeth999)"
 
diff --git a/templates/interfaces/l2tpv3/node.tag/destination-port/node.def b/templates/interfaces/l2tpv3/node.tag/destination-port/node.def
index 1dac1418..5f4d9435 100644
--- a/templates/interfaces/l2tpv3/node.tag/destination-port/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/destination-port/node.def
@@ -1,4 +1,4 @@
-help: Source port
+help: UDP destination port
 type: u32
 default: 5000
 syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 65535) ; "must between 1-65535"
diff --git a/templates/interfaces/l2tpv3/node.tag/encapsulation/node.def b/templates/interfaces/l2tpv3/node.tag/encapsulation/node.def
index f5d4eb9d..2bd8e63a 100644
--- a/templates/interfaces/l2tpv3/node.tag/encapsulation/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/encapsulation/node.def
@@ -1,7 +1,7 @@
 help: Encapsulation type
 type: txt
 default: "udp"
-syntax:expression: $VAR(@) in "ip", "udp"; "must be ip, or udp"
+syntax:expression: $VAR(@) in "ip", "udp"; "must be ip or udp"
 
-val_help: udp; udp encapsulation (default)
-val_help: ip; ip encapsulation
+val_help: udp; UDP encapsulation (default)
+val_help: ip; IP encapsulation
diff --git a/templates/interfaces/l2tpv3/node.tag/local-ip/node.def b/templates/interfaces/l2tpv3/node.tag/local-ip/node.def
index 3dfc3816..603f5066 100644
--- a/templates/interfaces/l2tpv3/node.tag/local-ip/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/local-ip/node.def
@@ -1,7 +1,7 @@
 type: ipv4, ipv6
-help: Local IP address for this l2tpv3 [REQUIRED]
-val_help: ipv4; Local IPv4 address for this l2tpv3 [REQUIRED]
-val_help: ipv6; Local IPv6 address for this l2tpv3 [REQUIRED]
+help: Local IP address for this L2TPv3 tunnel [REQUIRED]
+val_help: ipv4; Local IPv4 address for this L2TPv3 [REQUIRED]
+val_help: ipv6; Local IPv6 address for this L2TPv3 [REQUIRED]
 
 syntax:expression: exec \
        "/opt/vyatta/sbin/local_ip $VAR(@) || \
diff --git a/templates/interfaces/l2tpv3/node.tag/peer-session-id/node.def b/templates/interfaces/l2tpv3/node.tag/peer-session-id/node.def
index decdf6ea..ca6d9c2e 100644
--- a/templates/interfaces/l2tpv3/node.tag/peer-session-id/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/peer-session-id/node.def
@@ -1,5 +1,5 @@
-help: l2tpv3 peer-session-id [REQUIRED]
+help: L2TPv3 peer session identifier [REQUIRED]
 type: u32 
 
 syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 429496729) ; "must between 1-429496729"
-val_help: u32:1-429496729; l2tpv3 peer-session-id [REQUIRED]
+val_help: u32:1-429496729; L2TPv3 peer session identifier [REQUIRED]
diff --git a/templates/interfaces/l2tpv3/node.tag/peer-tunnel-id/node.def b/templates/interfaces/l2tpv3/node.tag/peer-tunnel-id/node.def
index fa734902..d2913534 100644
--- a/templates/interfaces/l2tpv3/node.tag/peer-tunnel-id/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/peer-tunnel-id/node.def
@@ -1,5 +1,5 @@
-help: l2tpv3 peer-tunnel-id [REQUIRED]
+help: L2TPv3 peer tunnel identifier [REQUIRED]
 type: u32 
 
 syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 429496729) ; "must between 1-429496729"
-val_help: u32:1-429496729; l2tpv3 peer-tunnel-id [REQUIRED]
+val_help: u32:1-429496729; L2TPv3 peer tunnel identifier [REQUIRED]
diff --git a/templates/interfaces/l2tpv3/node.tag/remote-ip/node.def b/templates/interfaces/l2tpv3/node.tag/remote-ip/node.def
index 806f6a94..63397cd5 100644
--- a/templates/interfaces/l2tpv3/node.tag/remote-ip/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/remote-ip/node.def
@@ -1,4 +1,4 @@
 type: ipv4, ipv6
-help: Remote IP address for this l2tpv3 [REQUIRED]
-val_help: ipv4; Remote IPv4 address for this l2tpv3 [REQUIRED]
-val_help: ipv6; Remote IPv6 address for this l2tpv3 [REQUIRED]
+help: Remote IP address for this L2TPv3 tunnel [REQUIRED]
+val_help: ipv4; Remote IPv4 address for this L2TPv3 [REQUIRED]
+val_help: ipv6; Remote IPv6 address for this L2TPv3 [REQUIRED]
diff --git a/templates/interfaces/l2tpv3/node.tag/session-id/node.def b/templates/interfaces/l2tpv3/node.tag/session-id/node.def
index ad4a22f9..168af02f 100644
--- a/templates/interfaces/l2tpv3/node.tag/session-id/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/session-id/node.def
@@ -1,5 +1,5 @@
-help: l2tpv3 session-id [REQUIRED]
+help: L2TPv3 session identifier [REQUIRED]
 type: u32 
 
 syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 429496729) ; "must between 1-429496729"
-val_help: u32:1-429496729; l2tpv3 session-id [REQUIRED]
+val_help: u32:1-429496729; L2TPv3 session identifier [REQUIRED]
diff --git a/templates/interfaces/l2tpv3/node.tag/source-port/node.def b/templates/interfaces/l2tpv3/node.tag/source-port/node.def
index a9ccfe49..f0fdb66b 100644
--- a/templates/interfaces/l2tpv3/node.tag/source-port/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/source-port/node.def
@@ -1,4 +1,4 @@
-help: Destination port
+help: UDP source port
 type: u32
 default: 5000
 syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 65535) ; "must between 1-65535"
diff --git a/templates/interfaces/l2tpv3/node.tag/tunnel-id/node.def b/templates/interfaces/l2tpv3/node.tag/tunnel-id/node.def
index b4cdc752..367e95fe 100644
--- a/templates/interfaces/l2tpv3/node.tag/tunnel-id/node.def
+++ b/templates/interfaces/l2tpv3/node.tag/tunnel-id/node.def
@@ -1,5 +1,5 @@
-help: l2tpv3 tunnel-id [REQUIRED]
+help: L2TPv3 tunnel identifier [REQUIRED]
 type: u32 
 
 syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 429496729) ; "must between 1-429496729"
-val_help: u32:1-429496729; l2tpv3 tunnel-id
+val_help: u32:1-429496729; L2TPv3 tunnel identifier