summaryrefslogtreecommitdiff
path: root/templates/system
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-19 13:26:48 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-19 13:26:48 -0700
commitb3aef2e0a16a04f1c97609142784e4681b5e7087 (patch)
tree75c06b15870893a901d8a3d5be376808ff6c0292 /templates/system
parenta04026859c8a16d00a41403a6138eb56cde5d489 (diff)
parent7a090934b301ab9b0168818c61bf41132044dfd5 (diff)
downloadvyatta-cfg-quagga-b3aef2e0a16a04f1c97609142784e4681b5e7087.tar.gz
vyatta-cfg-quagga-b3aef2e0a16a04f1c97609142784e4681b5e7087.zip
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg-system into larkspur
Diffstat (limited to 'templates/system')
-rw-r--r--templates/system/login/user/node.tag/authentication/public-keys/node.def2
-rw-r--r--templates/system/static-host-mapping/host-name/node.tag/inet/node.def2
2 files changed, 3 insertions, 1 deletions
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 d4670e39..245e7197 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,7 +1,7 @@
tag:
type: txt
help: Remote access public keys
-val_help: key identifier used by ssh-keygen (usually of form user@host)
+val_help: Key identifier used by ssh-keygen (usually of form user@host)
commit:expression: $VAR(./type/) != "" ; \
"Must configure public key type for $VAR(@)"
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 d6c0b466..d8bc35bd 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,2 +1,4 @@
type: ipv4, ipv6
+val_help: IPv4 address
+val_help: IPv6 address
help: Address [REQUIRED]