Merge branch 'master' of http://phuket.vyatta.com/vyatta-cfg-quagga

6 files changed, 8 insertions, 8 deletions

diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
index c881ace2..3f5b0261 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
@@ -1,10 +1,10 @@
 type: ipv4
 help: "Filter a network IP address"
-syntax: $(../host/@) != "" || $(../any/@) != ""; "You may only define one filter type. (host|network|any)"
+syntax: $(../host/@) != "" || $(../any/@) != ""; "You may only define one filter type (host|network|any)"
 # TODO: pending 2284
 syntax: ($(../../@) >= 100 && $(../../@) <= 199) || ($(../../@) >= 2000) && $(../../@) <= 2699); " \
 To set destination filter parameters, the access-list rule number must be \n \
   <100-199>    IP extended access list \n \
   <2000-2699>  IP extended access list (expanded range) \n"
-commit: $(../inverse-mask/@) != ""; "You must specify an inverse-mask before comitting"
+commit: $(../inverse-mask/@) != ""; "You must specify an inverse-mask before committing"
 commit: $(../../action/@) != ""; "You must specify an action before committing"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
index 910e5500..e7c4fec7 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
@@ -1,5 +1,5 @@
 type: ipv4
 help: "Filter a network IP address"
-syntax: $(../host/@) == "" && $(../any/@) == ""; "You may only define one filter type. (host|network|any)"
-commit: $(../inverse-mask/@) != ""; "You must specify an inverse-mask before comitting"
+syntax: $(../host/@) == "" && $(../any/@) == ""; "You may only define one filter type (host|network|any)"
+commit: $(../inverse-mask/@) != ""; "You must specify an inverse-mask before committing"
 commit: $(../../action/@) != ""; "You must specify an action before committing"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
index 57ade6c1..9b6fa886 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: "Match BGP AS path list"
 commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $(@)\"; "aspath-list $(@) doesn't exist"
+commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $(@)\"; "AS path list $(@) doesn't exist"
 create: "/usr/bin/vtysh -c \"configure terminal\" \
          -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
          -c \"match as-path $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
index 6ca2dea1..8096b0e6 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
@@ -1,2 +1,2 @@
-help: "Multi-exit descriminator attribute"
+help: "Multi-exit discriminator attribute"
 syntax: ($(../../peer-group/@) != "")  || ($(../../remote-as/@) != ""); "remote-as or peer-group should be defined first"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
index f5a8623a..5158ff0a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Allow EBGP neighbors not on directly connected networks"
 syntax: ($(../peer-group/@) != "")  || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first"
-syntax: $(@) >=1 && $(@) <= 255; "ebgp-multihop must be btween 1 and 255"
+syntax: $(@) >=1 && $(@) <= 255; "ebgp-multihop must be between 1 and 255"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"neighbor $(../@) ebgp-multihop $(@)\" "
 update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/passive/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/passive/node.def
index 3410022d..4ed0d8e4 100644
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/passive/node.def
+++ b/templates/protocols/rip/interface/node.tag/network/node.tag/passive/node.def
@@ -1,4 +1,4 @@
-help: "Set interface as recieve only"
+help: "Set interface as receive only"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
           -c \"passive-interface $(../@)\" "
 delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \