Bugfix 5462: Improve help strings.

6 files changed, 14 insertions, 8 deletions

diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def
new file mode 100644
index 00000000..b77625b7
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def
@@ -0,0 +1 @@
+help: Generic parameters for IPv6 unicast routes
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/export/node.def
index 5fb887f7..c6e3bc7c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/export/node.def
@@ -3,7 +3,7 @@ type: txt
 help: Set an access-list to filter outgoing route updates to this neighbor
 
 comp_help: possible completions:
- <txt>		access-list name
+ <txt>		access-list6 name
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../../@) --neighbor $VAR(../../../@)"
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/import/node.def
index e4c8d77a..c4a8983c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/distribute-list/import/node.def
@@ -3,7 +3,7 @@ type: txt
 help: Set an access-list to filter outgoing route updates to this neighbor
 
 comp_help: possible completions:
- <txt>		access-list name
+ <txt>		access-list6 name
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../../@) --neighbor $VAR(../../../@)"
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/export/node.def
index f0320bcb..ae99bc0e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/export/node.def
@@ -3,12 +3,11 @@ type: txt
 help: Set a prefix-list to filter outgoing route updates to this neighbor
 
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* 
-                 /opt/vyatta/config/active/policy/prefix-list6/*)
+        params=(/opt/vyatta/config/active/policy/prefix-list6/*)
         echo -n ${params[@]##*/}
 
 comp_help: possible completions:
-  <txt>     prefix-list name
+  <txt>     prefix-list6 name
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../../@) --neighbor $VAR(../../../@)"
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/import/node.def
index c375630f..1ac73095 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.tag/prefix-list/import/node.def
@@ -3,12 +3,11 @@ type: txt
 help: Set a prefix-list to filter outgoing route updates to this neighbor
 
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* 
-                 /opt/vyatta/config/active/policy/prefix-list6/*)
+        params=(/opt/vyatta/config/active/policy/prefix-list6/*)
         echo -n ${params[@]##*/}
 
 comp_help: possible completions:
-  <txt>     prefix-list name
+  <txt>     prefix-list6 name
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../../@) --neighbor $VAR(../../../@)"
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
index 26f54db7..9d2cc549 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
@@ -1,12 +1,19 @@
 type: txt
+
 help: Set to add this neighbor to a peer-group
+
 comp_help: \1  <txt>\tpeer-group name
+
 syntax:expression: exec "if [ -n \"`echo $VAR(../@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}//'`\" ]; then \
                 exit 1; \
               fi; "; "peer-group token may not be specified for a peer-group"
+
 commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --peergroup=$VAR(@) --as $VAR(../../@) --neighbor $VAR(../@)"
+
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) neighbor $VAR(@)\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) peer-group: peer-group $VAR(@) doesn't exist"
+
 update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
           -c "neighbor $VAR(../@) peer-group $VAR(@)"
+
 delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
           -c "no neighbor $VAR(../@) peer-group $VAR(@)"