summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohit Mehta <mohit.mehta@vyatta.com>2008-04-09 17:54:44 +0000
committerMohit Mehta <mohit.mehta@vyatta.com>2008-04-09 17:54:44 +0000
commit78f26204cc17a89636c7b7b71826e8cb51fa8868 (patch)
tree9b12eb27b39c5e6b64ec903afa7c2e160ba578d1
parentf352a460fdf15ac927d1deb4672c42b334eb8e67 (diff)
downloadvyatta-cfg-78f26204cc17a89636c7b7b71826e8cb51fa8868.tar.gz
vyatta-cfg-78f26204cc17a89636c7b7b71826e8cb51fa8868.zip
Fix Bug 3069 Help strings should be standardized
- help strings standardized in vyatta-cfg
-rw-r--r--templates/interfaces/ethernet/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/address/node.def6
-rw-r--r--templates/interfaces/ethernet/node.tag/description/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/disable/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/hw-id/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/mac/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/mtu/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def6
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def2
-rw-r--r--templates/interfaces/loopback/node.def2
-rw-r--r--templates/interfaces/loopback/node.tag/address/node.def4
-rw-r--r--templates/interfaces/loopback/node.tag/description/node.def2
-rw-r--r--templates/interfaces/node.def2
15 files changed, 20 insertions, 20 deletions
diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index eee64cd..444affe 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Ethernet interface name
+help: Set ethernet interface name
syntax:expression: exec " \
if [ -z \"`ip link | egrep -v 'eth[0-9]+[.]' | grep $VAR(@)`\" ]; then \
echo Invalid ethernet interface [$VAR(@)]; \
diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def
index 23b1262..0ff02c8 100644
--- a/templates/interfaces/ethernet/node.tag/address/node.def
+++ b/templates/interfaces/ethernet/node.tag/address/node.def
@@ -1,11 +1,11 @@
multi:
type: txt
-help: Configure an IP address for this interface
+help: Set an IP address for this interface
syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
update:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)"; "Error setting address $VAR(@) on interface $VAR(../@)"
delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)"; "Error deleting address $VAR(@) on interface $VAR(../@)"
allowed: echo "dhcp <>"
comp_help:Possible completions:
- <IP address>/<prefix length>\tSet the IP address and prefix length
- dhcp\t\t\t\tSet the IP address and prefix length via DHCP
+ <x.x.x.x/x> Set the IP address and prefix length
+ dhcp Set the IP address and prefix length via DHCP
diff --git a/templates/interfaces/ethernet/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/description/node.def
index 835ad40..aeb40f0 100644
--- a/templates/interfaces/ethernet/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/description/node.def
@@ -1,2 +1,2 @@
type: txt
-help: Description for this interface
+help: Set description for this interface
diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def
index 9c795c6..54090cc 100644
--- a/templates/interfaces/ethernet/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable/node.def
@@ -1,3 +1,3 @@
-help: Disable interface
+help: Set interface disabled
update:expression: "sudo ip link set $VAR(../@) down"; "Error disabling dev $VAR(../@)"
delete:expression: "sudo ip link set $VAR(../@) up"; "Error enabling dev $VAR(../@)"
diff --git a/templates/interfaces/ethernet/node.tag/hw-id/node.def b/templates/interfaces/ethernet/node.tag/hw-id/node.def
index f25692d..6c559f8 100644
--- a/templates/interfaces/ethernet/node.tag/hw-id/node.def
+++ b/templates/interfaces/ethernet/node.tag/hw-id/node.def
@@ -1,2 +1,2 @@
type: macaddr
-help: Specify the MAC address of this interface
+help: Set the Media Access Control (MAC) address of this interface
diff --git a/templates/interfaces/ethernet/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/mac/node.def
index d25b378..abafa7a 100644
--- a/templates/interfaces/ethernet/node.tag/mac/node.def
+++ b/templates/interfaces/ethernet/node.tag/mac/node.def
@@ -1,5 +1,5 @@
type: macaddr
-help: Set the MAC address of this interface
+help: Set the Media Access Control (MAC) address of this interface
syntax:expression: exec "\
/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)"
update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def
index c3b05a7..07c102a 100644
--- a/templates/interfaces/ethernet/node.tag/mtu/node.def
+++ b/templates/interfaces/ethernet/node.tag/mtu/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Set the MTU for this interface
+help: Set the Maximum Transmission Unit (MTU) for this interface
syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
update:expression: "sudo ip link set $VAR(../@) mtu $VAR(@)"; "Error setting MTU on dev $VAR(../@)"
delete:expression: "sudo ip link set $VAR(../@) mtu 1500"; "Error deleting MTU on dev $VAR(../@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index 73958be..5374761 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -1,6 +1,6 @@
tag:
type: u32
-help: VLAN ID
+help: Set Virtual Local Area Network (VLAN) ID
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
create:expression: "sudo modprobe 8021q"; "Error loading 802.1q driver"
create:expression: "sudo vconfig add $VAR(../@) $VAR(@)"; "Error adding VLAN id $VAR(@) to dev $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 a33818f..cb9cedc 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
@@ -1,10 +1,10 @@
multi:
type: txt
-help: Configure an IP address for this interface
+help: Set an IP address for this interface
syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../../@).$VAR(../@) "; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../../@).$VAR(../@)"
create:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../../@).$VAR(../@) "; "Error setting address $VAR(@) on dev $VAR(../../@).$VAR(../@) "
delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../../@).$VAR(../@) "; "Error deleting address $VAR(@) on dev $VAR(../../@).$VAR(../@) "
allowed: echo "dhcp <>"
comp_help:Possible completions:
- <IP address>/<prefix length> Set the IP address and prefix length
- dhcp Set the IP address and prefix length via DHCP
+ <x.x.x.x/x> Set the IP address and prefix length
+ dhcp Set the IP address and prefix length via DHCP
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
index 835ad40..aeb40f0 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
@@ -1,2 +1,2 @@
type: txt
-help: Description for this interface
+help: Set description for this interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
index 3b2ae45..9599de3 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
@@ -1,3 +1,3 @@
-help: Disable interface
+help: Set interface disabled
update:expression: "sudo ip link set $VAR(../../@).$VAR(../@) down"; "Error disabling dev $VAR(../../@).$VAR(../@)"
delete:expression: "sudo ip link set $VAR(../../@).$VAR(../@) up"; "Error enabling dev $VAR(../../@).$VAR(../@)"
diff --git a/templates/interfaces/loopback/node.def b/templates/interfaces/loopback/node.def
index 72888fc..cc59c27 100644
--- a/templates/interfaces/loopback/node.def
+++ b/templates/interfaces/loopback/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Loopback interface name
+help: Set loopback interface name
syntax:expression: exec " \
if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
echo loopback interface $VAR(@) doesn\\'t exist on this system ; \
diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def
index 793c52c..03ead09 100644
--- a/templates/interfaces/loopback/node.tag/address/node.def
+++ b/templates/interfaces/loopback/node.tag/address/node.def
@@ -1,6 +1,6 @@
multi:
type: txt
-help: Configure an IP address for this interface
+help: Set an IP address for this interface
syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; \
"Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
@@ -11,4 +11,4 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete
"Error deleting address $VAR(@) on interface $VAR(../@)"
comp_help:Possible completions:
- <IP address>/<prefix length>\tSet the IP address and prefix length
+ <x.x.x.x/x> Set the IP address and prefix length
diff --git a/templates/interfaces/loopback/node.tag/description/node.def b/templates/interfaces/loopback/node.tag/description/node.def
index 835ad40..aeb40f0 100644
--- a/templates/interfaces/loopback/node.tag/description/node.def
+++ b/templates/interfaces/loopback/node.tag/description/node.def
@@ -1,2 +1,2 @@
type: txt
-help: Description for this interface
+help: Set description for this interface
diff --git a/templates/interfaces/node.def b/templates/interfaces/node.def
index 7ab9990..5865af5 100644
--- a/templates/interfaces/node.def
+++ b/templates/interfaces/node.def
@@ -1 +1 @@
-help: Network interface configuration
+help: Configure network interfaces