summaryrefslogtreecommitdiff
path: root/templates/system
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-16 18:11:39 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-16 18:11:39 -0700
commitb292119dd94c8e93032147e3135b4bff17564ff4 (patch)
treeb06b283f4e5f60db06df14f5e7aab263ff48ea9f /templates/system
parent1a86e15787cdda44b8702895bb97acf107ef3a07 (diff)
downloadvyatta-cfg-system-b292119dd94c8e93032147e3135b4bff17564ff4.tar.gz
vyatta-cfg-system-b292119dd94c8e93032147e3135b4bff17564ff4.zip
Remove verbs from all help messages
Per current policy remove verb from all help messages in th is package
Diffstat (limited to 'templates/system')
-rw-r--r--templates/system/domain-name/node.def2
-rw-r--r--templates/system/domain-search/domain/node.def2
-rw-r--r--templates/system/domain-search/node.def2
-rw-r--r--templates/system/host-name/node.def2
-rw-r--r--templates/system/ip/arp/node.def2
-rw-r--r--templates/system/ip/arp/table-size/node.def2
-rw-r--r--templates/system/ip/node.def2
-rw-r--r--templates/system/ipv6/neighbor/node.def2
-rw-r--r--templates/system/ipv6/neighbor/table-size/node.def2
-rw-r--r--templates/system/ipv6/node.def2
-rw-r--r--templates/system/login/banner/node.def2
-rw-r--r--templates/system/login/banner/post-login/node.def2
-rw-r--r--templates/system/login/banner/pre-login/node.def2
-rw-r--r--templates/system/login/node.def2
-rw-r--r--templates/system/login/radius-server/node.def2
-rw-r--r--templates/system/login/radius-server/node.tag/port/node.def2
-rw-r--r--templates/system/login/radius-server/node.tag/secret/node.def2
-rw-r--r--templates/system/login/radius-server/node.tag/timeout/node.def2
-rw-r--r--templates/system/login/user/node.def2
-rw-r--r--templates/system/login/user/node.tag/authentication/encrypted-password/node.def2
-rw-r--r--templates/system/login/user/node.tag/authentication/node.def2
-rw-r--r--templates/system/login/user/node.tag/authentication/plaintext-password/node.def2
-rw-r--r--templates/system/login/user/node.tag/authentication/public-keys/node.def2
-rw-r--r--templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def2
-rw-r--r--templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def2
-rw-r--r--templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def2
-rw-r--r--templates/system/login/user/node.tag/full-name/node.def2
-rw-r--r--templates/system/login/user/node.tag/group/node.def2
-rw-r--r--templates/system/login/user/node.tag/home-directory/node.def2
-rw-r--r--templates/system/login/user/node.tag/level/node.def2
-rw-r--r--templates/system/name-server/node.def2
-rw-r--r--templates/system/node.def2
-rw-r--r--templates/system/ntp-server/node.def2
-rw-r--r--templates/system/options/node.def2
-rw-r--r--templates/system/options/reboot-on-panic/node.def2
-rw-r--r--templates/system/package/auto-sync/node.def2
-rw-r--r--templates/system/package/node.def2
-rw-r--r--templates/system/package/repository/node.def2
-rw-r--r--templates/system/package/repository/node.tag/components/node.def2
-rw-r--r--templates/system/package/repository/node.tag/description/node.def2
-rw-r--r--templates/system/package/repository/node.tag/distribution/node.def2
-rw-r--r--templates/system/static-host-mapping/host-name/node.def2
-rw-r--r--templates/system/static-host-mapping/host-name/node.tag/alias/node.def2
-rw-r--r--templates/system/static-host-mapping/host-name/node.tag/inet/node.def2
-rw-r--r--templates/system/static-host-mapping/node.def2
-rw-r--r--templates/system/syslog/console/facility/node.def2
-rw-r--r--templates/system/syslog/console/facility/node.tag/level/node.def2
-rw-r--r--templates/system/syslog/console/node.def2
-rw-r--r--templates/system/syslog/file/node.def2
-rw-r--r--templates/system/syslog/file/node.tag/archive/files/node.def2
-rw-r--r--templates/system/syslog/file/node.tag/archive/node.def2
-rw-r--r--templates/system/syslog/file/node.tag/archive/size/node.def2
-rw-r--r--templates/system/syslog/file/node.tag/facility/node.def2
-rw-r--r--templates/system/syslog/file/node.tag/facility/node.tag/level/node.def2
-rw-r--r--templates/system/syslog/global/archive/files/node.def2
-rw-r--r--templates/system/syslog/global/archive/node.def2
-rw-r--r--templates/system/syslog/global/archive/size/node.def2
-rw-r--r--templates/system/syslog/global/facility/node.def2
-rw-r--r--templates/system/syslog/global/facility/node.tag/level/node.def2
-rw-r--r--templates/system/syslog/global/node.def2
-rw-r--r--templates/system/syslog/host/node.def2
-rw-r--r--templates/system/syslog/host/node.tag/facility/node.def2
-rw-r--r--templates/system/syslog/host/node.tag/facility/node.tag/level/node.def2
-rw-r--r--templates/system/syslog/node.def2
-rw-r--r--templates/system/syslog/user/node.def2
-rw-r--r--templates/system/syslog/user/node.tag/facility/node.def2
-rw-r--r--templates/system/syslog/user/node.tag/facility/node.tag/level/node.def2
-rw-r--r--templates/system/time-zone/node.def2
68 files changed, 68 insertions, 68 deletions
diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def
index fa8527d9..ff3c2ebf 100644
--- a/templates/system/domain-name/node.def
+++ b/templates/system/domain-name/node.def
@@ -1,6 +1,6 @@
priority: 400
type: txt
-help: Set system domain name
+help: System domain name
syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]{0,63}$" ; "invalid domain name $VAR(@)"
# also add localhost line into /etc/hosts (see host-name template)?
diff --git a/templates/system/domain-search/domain/node.def b/templates/system/domain-search/domain/node.def
index 46248127..d455745b 100644
--- a/templates/system/domain-search/domain/node.def
+++ b/templates/system/domain-search/domain/node.def
@@ -1,6 +1,6 @@
multi:
type: txt
-help: Set DNS domain completion order
+help: DNS domain completion order
syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "invalid domain name $VAR(@)"
create:expression: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl"
delete:expression: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl"
diff --git a/templates/system/domain-search/node.def b/templates/system/domain-search/node.def
index 49c7d171..4bc32c52 100644
--- a/templates/system/domain-search/node.def
+++ b/templates/system/domain-search/node.def
@@ -1,2 +1,2 @@
priority: 400
-help: Set Domain Name Server (DNS) domain completion order
+help: Domain Name Server (DNS) domain completion order
diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def
index a119c362..df266fad 100644
--- a/templates/system/host-name/node.def
+++ b/templates/system/host-name/node.def
@@ -1,6 +1,6 @@
priority: 100
type: txt
-help: Set system host name (default: vyatta)
+help: System host name (default: vyatta)
default: "vyatta"
syntax:expression: pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$"
; "invalid host name $VAR(@)"
diff --git a/templates/system/ip/arp/node.def b/templates/system/ip/arp/node.def
index 056a284f..2d3aa69a 100644
--- a/templates/system/ip/arp/node.def
+++ b/templates/system/ip/arp/node.def
@@ -1 +1 @@
-help: Set parameters for ARP cache
+help: Parameters for ARP cache
diff --git a/templates/system/ip/arp/table-size/node.def b/templates/system/ip/arp/table-size/node.def
index 8c548f5b..bdeea371 100644
--- a/templates/system/ip/arp/table-size/node.def
+++ b/templates/system/ip/arp/table-size/node.def
@@ -1,4 +1,4 @@
-help: Set maximum number of entries to keep in the ARP cache
+help: Maximum number of entries to keep in the ARP cache
type: u32
diff --git a/templates/system/ip/node.def b/templates/system/ip/node.def
index 3b495f3d..c1359b50 100644
--- a/templates/system/ip/node.def
+++ b/templates/system/ip/node.def
@@ -1,2 +1,2 @@
priority: 400
-help: Set IPv4 settings
+help: IPv4 settings
diff --git a/templates/system/ipv6/neighbor/node.def b/templates/system/ipv6/neighbor/node.def
index 4e51677e..ed434588 100644
--- a/templates/system/ipv6/neighbor/node.def
+++ b/templates/system/ipv6/neighbor/node.def
@@ -1 +1 @@
-help: Set parameters for Neighbor cache
+help: Parameters for Neighbor cache
diff --git a/templates/system/ipv6/neighbor/table-size/node.def b/templates/system/ipv6/neighbor/table-size/node.def
index e8a55ac8..cf4d066d 100644
--- a/templates/system/ipv6/neighbor/table-size/node.def
+++ b/templates/system/ipv6/neighbor/table-size/node.def
@@ -1,4 +1,4 @@
-help: Set maximum number of entries to keep in the Neighbor cache
+help: Maximum number of entries to keep in the Neighbor cache
type: u32
diff --git a/templates/system/ipv6/node.def b/templates/system/ipv6/node.def
index 587c3b2b..4801c82d 100644
--- a/templates/system/ipv6/node.def
+++ b/templates/system/ipv6/node.def
@@ -1,2 +1,2 @@
priority: 400
-help: Set IPv6 settings
+help: IPv6 settings
diff --git a/templates/system/login/banner/node.def b/templates/system/login/banner/node.def
index 2aef97a4..f6857109 100644
--- a/templates/system/login/banner/node.def
+++ b/templates/system/login/banner/node.def
@@ -1 +1 @@
-help: Set system login banners
+help: System login banners
diff --git a/templates/system/login/banner/post-login/node.def b/templates/system/login/banner/post-login/node.def
index 98c139b8..d6cf6cff 100644
--- a/templates/system/login/banner/post-login/node.def
+++ b/templates/system/login/banner/post-login/node.def
@@ -1,4 +1,4 @@
-help: Set system loging banner post-login
+help: System loging banner post-login
type: txt
update: sudo /opt/vyatta/sbin/vyatta-banner.pl \
diff --git a/templates/system/login/banner/pre-login/node.def b/templates/system/login/banner/pre-login/node.def
index 7cb80380..54aa3473 100644
--- a/templates/system/login/banner/pre-login/node.def
+++ b/templates/system/login/banner/pre-login/node.def
@@ -1,4 +1,4 @@
-help: Set system loging banner pre-login
+help: System loging banner pre-login
type: txt
update: sudo /opt/vyatta/sbin/vyatta-banner.pl \
diff --git a/templates/system/login/node.def b/templates/system/login/node.def
index c1330b0b..09255a76 100644
--- a/templates/system/login/node.def
+++ b/templates/system/login/node.def
@@ -1,4 +1,4 @@
priority: 400
-help: Set user access
+help: User login
delete: echo 'All login methods can not be deleted' 1>&2; exit 1
end: sudo /opt/vyatta/sbin/vyatta_update_login.pl
diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius-server/node.def
index 137a92a0..efc917ef 100644
--- a/templates/system/login/radius-server/node.def
+++ b/templates/system/login/radius-server/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4
-help: Set radius server authentication
+help: Radius server authentication
commit:expression: $VAR(port) != "" && $VAR(secret) != ""
&& $VAR(timeout) != ""
; "Port, secret, and timeout must be specified for Radius"
diff --git a/templates/system/login/radius-server/node.tag/port/node.def b/templates/system/login/radius-server/node.tag/port/node.def
index 026b73a0..f5eae942 100644
--- a/templates/system/login/radius-server/node.tag/port/node.def
+++ b/templates/system/login/radius-server/node.tag/port/node.def
@@ -1,4 +1,4 @@
type: u32
-help: Set radius port [REQUIRED]
+help: Radius port [REQUIRED]
syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
default: 1812
diff --git a/templates/system/login/radius-server/node.tag/secret/node.def b/templates/system/login/radius-server/node.tag/secret/node.def
index 9d4e042a..90420518 100644
--- a/templates/system/login/radius-server/node.tag/secret/node.def
+++ b/templates/system/login/radius-server/node.tag/secret/node.def
@@ -1,2 +1,2 @@
type: txt
-help: Set secret for radius access [REQUIRED]
+help: Secret for radius access [REQUIRED]
diff --git a/templates/system/login/radius-server/node.tag/timeout/node.def b/templates/system/login/radius-server/node.tag/timeout/node.def
index ab506233..34fcbdb0 100644
--- a/templates/system/login/radius-server/node.tag/timeout/node.def
+++ b/templates/system/login/radius-server/node.tag/timeout/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Set timeout for radius session [REQUIRED]
+help: Timeout for radius session [REQUIRED]
default: 2
syntax:expression: $VAR(@) > 0 && $VAR(@) <= 30 \
; "Timeout must be between 1 and 30 seconds"
diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def
index 3b9b570a..caa53f1b 100644
--- a/templates/system/login/user/node.def
+++ b/templates/system/login/user/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set user account information
+help: User account information
syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_username.pl $VAR(@)"
diff --git a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def
index 49b7fd04..823fc45f 100644
--- a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def
+++ b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set encrypted password
+help: Encrypted password
# Allow * or ! to disable account
# DES format password (13 characters)
# MD5 format ($1) and SHA format passwords
diff --git a/templates/system/login/user/node.tag/authentication/node.def b/templates/system/login/user/node.tag/authentication/node.def
index 488acd8c..4306d008 100644
--- a/templates/system/login/user/node.tag/authentication/node.def
+++ b/templates/system/login/user/node.tag/authentication/node.def
@@ -1 +1 @@
-help: Set authentication password
+help: Authentication password
diff --git a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def
index d712db20..12a74a36 100644
--- a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def
+++ b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set plaintext password for encryption
+help: Plaintext password for encryption
# if plaintext is empty, assume this is left-over from blanking the plaintext
# and do nothing. to set password to empty, user needs to set the
# "encrypted-password" to an empty string (which actually allows login without
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def
index 6c1ffbc2..a9089d6f 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set remote access public keys
+help: Remote access public keys
comp_help: The key identifier is a usually user@host as generated by ssh-keygen
commit:expression: $VAR(./type/) != "" ; \
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def
index 70af5961..a5744bfe 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set public key value (base64)
+help: Public key value (base64)
syntax:expression: pattern $VAR(@) "^[0-9A-Za-z+/=]*$" ; \
"Invalid public key character not base-64"
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def
index e24d9fca..2677594b 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set additional public key options
+help: Additional public key options
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
index 30138fe6..5ad1c58b 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
@@ -1,4 +1,4 @@
type: txt
-help: Set public key type
+help: Public key type
allowed: echo "ssh-dss ssh-rsa"
syntax:expression: $VAR(@) in "ssh-rsa", "ssh-dss" ; "Unknown key type"
diff --git a/templates/system/login/user/node.tag/full-name/node.def b/templates/system/login/user/node.tag/full-name/node.def
index c3cba58b..42d9dfac 100644
--- a/templates/system/login/user/node.tag/full-name/node.def
+++ b/templates/system/login/user/node.tag/full-name/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set full name of the user (use quotes for names with spaces)
+help: Full name of the user (use quotes for names with spaces)
syntax:expression: pattern $VAR(@) "^[^:]*$"; "Cannot use ':' in full name"
diff --git a/templates/system/login/user/node.tag/group/node.def b/templates/system/login/user/node.tag/group/node.def
index 77af8199..2dc0abc9 100644
--- a/templates/system/login/user/node.tag/group/node.def
+++ b/templates/system/login/user/node.tag/group/node.def
@@ -1,6 +1,6 @@
multi:
type: txt
-help: Set additional group membership
+help: Additional group membership
syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$"
; "Invalid group name $VAR(@)"
syntax:expression: ! $VAR(@) in \
diff --git a/templates/system/login/user/node.tag/home-directory/node.def b/templates/system/login/user/node.tag/home-directory/node.def
index 3dbd8a19..90b62195 100644
--- a/templates/system/login/user/node.tag/home-directory/node.def
+++ b/templates/system/login/user/node.tag/home-directory/node.def
@@ -1,2 +1,2 @@
type: txt
-help: Set home directory
+help: Home directory
diff --git a/templates/system/login/user/node.tag/level/node.def b/templates/system/login/user/node.tag/level/node.def
index d64a6441..2596bd7a 100644
--- a/templates/system/login/user/node.tag/level/node.def
+++ b/templates/system/login/user/node.tag/level/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set user privilege level
+help: User privilege level
default: "admin"
syntax:expression: $VAR(@) in "admin", "operator"; "Allowed levels are \"admin\" and \"operator\""
comp_help:Possible completions:
diff --git a/templates/system/name-server/node.def b/templates/system/name-server/node.def
index 88fb618c..b036e56a 100644
--- a/templates/system/name-server/node.def
+++ b/templates/system/name-server/node.def
@@ -1,6 +1,6 @@
multi:
priority: 400
type: ipv4
-help: Set Domain Name Server (DNS)
+help: Domain Name Server (DNS)
create: sudo /opt/vyatta/sbin/vyatta-system-nameservers update $VAR(@)
delete: sudo /opt/vyatta/sbin/vyatta-system-nameservers delete $VAR(@)
diff --git a/templates/system/node.def b/templates/system/node.def
index 2317e7dd..156b6317 100644
--- a/templates/system/node.def
+++ b/templates/system/node.def
@@ -1,2 +1,2 @@
priority: 405
-help: Configure system parameters
+help: System parameters
diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def
index c4532526..e1596161 100644
--- a/templates/system/ntp-server/node.def
+++ b/templates/system/ntp-server/node.def
@@ -1,7 +1,7 @@
multi:
priority: 400
type: txt
-help: Set name or IP address of Network Time Protocol (NTP) server
+help: Network Time Protocol (NTP) server
create: if ! grep -q '^server $VAR(@) ' /etc/ntp.conf
then sudo sh -c \
"echo \"server $VAR(@) iburst\" >> /etc/ntp.conf; \
diff --git a/templates/system/options/node.def b/templates/system/options/node.def
index ace7abbe..a878887c 100644
--- a/templates/system/options/node.def
+++ b/templates/system/options/node.def
@@ -1,2 +1,2 @@
priority: 400
-help: Set system options
+help: System options
diff --git a/templates/system/options/reboot-on-panic/node.def b/templates/system/options/reboot-on-panic/node.def
index f75f4c68..f768d5ae 100644
--- a/templates/system/options/reboot-on-panic/node.def
+++ b/templates/system/options/reboot-on-panic/node.def
@@ -1,5 +1,5 @@
type: bool
-help: Set if kernel panic causes reboot
+help: Reboot system on kernel panic
default: true
update:expression: "sudo sh -c \"if [ x$VAR(@) == xfalse ]; \
then \
diff --git a/templates/system/package/auto-sync/node.def b/templates/system/package/auto-sync/node.def
index 299b43bf..9eec0faa 100644
--- a/templates/system/package/auto-sync/node.def
+++ b/templates/system/package/auto-sync/node.def
@@ -6,7 +6,7 @@ type: u32
default: 1
-help: Set to update the the repository cache every n days (0 disables auto-update)
+help: Update the the repository cache every n days (0 disables auto-update)
syntax:expression: $VAR(@) >= 0 && $VAR(@) < 32 ; "auto-sync must be between 0 and 32 days"
diff --git a/templates/system/package/node.def b/templates/system/package/node.def
index 3ed94f80..c19c92de 100644
--- a/templates/system/package/node.def
+++ b/templates/system/package/node.def
@@ -1,2 +1,2 @@
priority: 400
-help: Set package update repository parameters
+help: Package update repository parameters
diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def
index 40504bf1..c84060e2 100644
--- a/templates/system/package/repository/node.def
+++ b/templates/system/package/repository/node.def
@@ -2,7 +2,7 @@ tag:
type: txt
-help: Set the name of a debian archive
+help: Debian archive name
commit:expression: $VAR(./url/) != ""; "Must configure the repository URL"
commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution"
diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def
index 313ab614..606f7bb6 100644
--- a/templates/system/package/repository/node.tag/components/node.def
+++ b/templates/system/package/repository/node.tag/components/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set repository component names
+help: Repository component names
# need to prohibit '!' in repo name (sed delimiter)
syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in component name"
diff --git a/templates/system/package/repository/node.tag/description/node.def b/templates/system/package/repository/node.tag/description/node.def
index 613b0d28..8b686f06 100644
--- a/templates/system/package/repository/node.tag/description/node.def
+++ b/templates/system/package/repository/node.tag/description/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set repository description
+help: Repository description
diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def
index 353f59b6..ae88cb42 100644
--- a/templates/system/package/repository/node.tag/distribution/node.def
+++ b/templates/system/package/repository/node.tag/distribution/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set distribution name
+help: Distribution name
# need to prohibit '!' in repo name (sed delimiter)
syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in distribution name"
diff --git a/templates/system/static-host-mapping/host-name/node.def b/templates/system/static-host-mapping/host-name/node.def
index edd286c8..04abf871 100644
--- a/templates/system/static-host-mapping/host-name/node.def
+++ b/templates/system/static-host-mapping/host-name/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set to map host name to address
+help: Map host name to address
syntax:expression: pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$"
; "invalid host name $VAR(@)"
diff --git a/templates/system/static-host-mapping/host-name/node.tag/alias/node.def b/templates/system/static-host-mapping/host-name/node.tag/alias/node.def
index 7b07ff1a..2f340fc7 100644
--- a/templates/system/static-host-mapping/host-name/node.tag/alias/node.def
+++ b/templates/system/static-host-mapping/host-name/node.tag/alias/node.def
@@ -1,3 +1,3 @@
multi:
type: txt
-help: Set alias for this address
+help: Alias for this address
diff --git a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def
index 63e611a8..db66bfd1 100644
--- a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def
+++ b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set address [REQUIRED]
+help: Address [REQUIRED]
syntax:expression: exec "/opt/vyatta/sbin/check-ipv4-ipv6.pl $VAR(@)"
comp_help: Possible completions:
diff --git a/templates/system/static-host-mapping/node.def b/templates/system/static-host-mapping/node.def
index 33f33a4c..f1fe94a7 100644
--- a/templates/system/static-host-mapping/node.def
+++ b/templates/system/static-host-mapping/node.def
@@ -1,2 +1,2 @@
priority: 400
-help: Set to map host names to addresses
+help: Map host names to addresses
diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def
index 98b207d5..0b12ac8e 100644
--- a/templates/system/syslog/console/facility/node.def
+++ b/templates/system/syslog/console/facility/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set facility for console logging
+help: Facility for console logging
syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
comp_help:Available logging facilities:
all All facilities excluding "mark"
diff --git a/templates/system/syslog/console/facility/node.tag/level/node.def b/templates/system/syslog/console/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/console/facility/node.tag/level/node.def
+++ b/templates/system/syslog/console/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set the logging level
+help: Logging level
syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
default: "err"
comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/console/node.def b/templates/system/syslog/console/node.def
index 3f76dcfc..a4aa259f 100644
--- a/templates/system/syslog/console/node.def
+++ b/templates/system/syslog/console/node.def
@@ -1,2 +1,2 @@
-help: Set console logging
+help: Console logging
commit:expression: $VAR(./facility/@@) != ""; "At least one facility must be configured to log messages to $VAR(.)"
diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def
index f8a57f66..97e60a75 100644
--- a/templates/system/syslog/file/node.def
+++ b/templates/system/syslog/file/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set the name of syslog file to save log messages to
+help: Logging to a file
syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)"
commit:expression: $VAR(./@/facility/@@) != ""; \
"At least one facility must be configured to log messages to file $VAR(./@)"
diff --git a/templates/system/syslog/file/node.tag/archive/files/node.def b/templates/system/syslog/file/node.tag/archive/files/node.def
index bb897995..09eea916 100644
--- a/templates/system/syslog/file/node.tag/archive/files/node.def
+++ b/templates/system/syslog/file/node.tag/archive/files/node.def
@@ -1,6 +1,6 @@
type: u32
-help: Set number of saved files
+help: Number of saved files
default: 5
diff --git a/templates/system/syslog/file/node.tag/archive/node.def b/templates/system/syslog/file/node.tag/archive/node.def
index 45ac48b0..873cd0a6 100644
--- a/templates/system/syslog/file/node.tag/archive/node.def
+++ b/templates/system/syslog/file/node.tag/archive/node.def
@@ -1,4 +1,4 @@
-help: Set log file size and rotation characteristics
+help: Log file size and rotation characteristics
delete:
sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
diff --git a/templates/system/syslog/file/node.tag/archive/size/node.def b/templates/system/syslog/file/node.tag/archive/size/node.def
index 7a73a4cf..f3e7e52f 100644
--- a/templates/system/syslog/file/node.tag/archive/size/node.def
+++ b/templates/system/syslog/file/node.tag/archive/size/node.def
@@ -1,6 +1,6 @@
type: u32
-help: Set size of log files (kbytes)
+help: Size of log files (kbytes)
default: 0
diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def
index 37188925..eaa00304 100644
--- a/templates/system/syslog/file/node.tag/facility/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set facility for file logging
+help: Facility for file logging
syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
comp_help:Available logging facilities:
all All facilities excluding "mark"
diff --git a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
index a8eaa0e6..e8ba6fe5 100644
--- a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set the logging level
+help: Logging level
syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
default: "err"
comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/global/archive/files/node.def b/templates/system/syslog/global/archive/files/node.def
index 8755bbe6..d4e8af82 100644
--- a/templates/system/syslog/global/archive/files/node.def
+++ b/templates/system/syslog/global/archive/files/node.def
@@ -1,6 +1,6 @@
type: u32
-help: Set number of saved files
+help: Number of saved files
default: 5
diff --git a/templates/system/syslog/global/archive/node.def b/templates/system/syslog/global/archive/node.def
index 8c6110d3..82bc9e86 100644
--- a/templates/system/syslog/global/archive/node.def
+++ b/templates/system/syslog/global/archive/node.def
@@ -1,4 +1,4 @@
-help: Set log file size and rotation characteristics
+help: Log file size and rotation characteristics
delete:
sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
diff --git a/templates/system/syslog/global/archive/size/node.def b/templates/system/syslog/global/archive/size/node.def
index 30f6427f..341f4a5b 100644
--- a/templates/system/syslog/global/archive/size/node.def
+++ b/templates/system/syslog/global/archive/size/node.def
@@ -1,6 +1,6 @@
type: u32
-help: Set size of log files (kbytes)
+help: Size of log files (kbytes)
default: 250
diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def
index bc8c094a..fa44538a 100644
--- a/templates/system/syslog/global/facility/node.def
+++ b/templates/system/syslog/global/facility/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set facility for system logging
+help: Facility for system logging
syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; "\"$VAR(@)\" is not a valid logging facility"
comp_help:Available logging facilities:
all All facilities excluding "mark"
diff --git a/templates/system/syslog/global/facility/node.tag/level/node.def b/templates/system/syslog/global/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/global/facility/node.tag/level/node.def
+++ b/templates/system/syslog/global/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set the logging level
+help: Logging level
syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
default: "err"
comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/global/node.def b/templates/system/syslog/global/node.def
index e5c441a8..5d917e1d 100644
--- a/templates/system/syslog/global/node.def
+++ b/templates/system/syslog/global/node.def
@@ -1,2 +1,2 @@
-help: Set system logging
+help: System logging
commit:expression: $VAR(./facility/) != "" || $VAR(./archive/) != ""; "Must specify either facility or archive for syslog file"
diff --git a/templates/system/syslog/host/node.def b/templates/system/syslog/host/node.def
index a22c6528..24033520 100644
--- a/templates/system/syslog/host/node.def
+++ b/templates/system/syslog/host/node.def
@@ -1,4 +1,4 @@
tag:
type: txt
-help: Set IP address or hostname of remote syslog server
+help: IP address or hostname of remote syslog server
commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to host $VAR(./@)"
diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def
index d5f6ef9b..1c485f1f 100644
--- a/templates/system/syslog/host/node.tag/facility/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set facility for host logging
+help: Facility for host logging
syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
comp_help:Available logging facilities:
all All facilities excluding "mark"
diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set the logging level
+help: Logging level
syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
default: "err"
comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/node.def b/templates/system/syslog/node.def
index 90000f8c..91c1295b 100644
--- a/templates/system/syslog/node.def
+++ b/templates/system/syslog/node.def
@@ -1,5 +1,5 @@
priority: 400
-help: Configure syslog daemon
+help: System logging daemon
end: if /opt/vyatta/sbin/vyatta_update_syslog.pl; then
sudo /usr/sbin/invoke-rc.d sysklogd reload
fi
diff --git a/templates/system/syslog/user/node.def b/templates/system/syslog/user/node.def
index 805abd6a..1161149a 100644
--- a/templates/system/syslog/user/node.def
+++ b/templates/system/syslog/user/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set logging to specific user's terminal
+help: Logging to specific user's terminal
syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*$"
; "invalid user name $VAR(@)"
commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to user $VAR(./@)"
diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def
index 91a3f2a6..8367b3ca 100644
--- a/templates/system/syslog/user/node.tag/facility/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Set facility for user logging
+help: Facility for user logging
syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
comp_help:Available logging facilities:
all All facilities excluding "mark"
diff --git a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set the logging level
+help: Logging level
syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
default: "err"
comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/time-zone/node.def b/templates/system/time-zone/node.def
index 15de6043..fcbad601 100644
--- a/templates/system/time-zone/node.def
+++ b/templates/system/time-zone/node.def
@@ -1,6 +1,6 @@
priority: 100
type: txt
-help: Set local timezone
+help: Local time zone
default: "GMT"
update: LTF="/usr/share/zoneinfo"
case "$VAR(@)" in