summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-09-18 20:13:29 +0200
committerDaniil Baturin <daniil@baturin.org>2018-09-18 23:16:22 +0200
commit1dedc3fdf5127d60d3b66341bb01155a4b73e749 (patch)
tree485470100be11edecf6ea7745418f9691a699aea /templates
parent4e9a68f47bbf507f4d74ee08bc445f8162f40a4c (diff)
downloadvyatta-cfg-quagga-1dedc3fdf5127d60d3b66341bb01155a4b73e749.tar.gz
vyatta-cfg-quagga-1dedc3fdf5127d60d3b66341bb01155a4b73e749.zip
T849: move IPv4-specific BGP options to "address-family ipv4-unicast".
Diffstat (limited to 'templates')
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def (renamed from templates/protocols/bgp/node.tag/aggregate-address/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/as-set/node.def (renamed from templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/summary-only/node.def (renamed from templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def (renamed from templates/protocols/bgp/node.tag/network/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/backdoor/node.def (renamed from templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/route-map/node.def (renamed from templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/metric/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/connected/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/route-map/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/metric/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/kernel/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/route-map/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/metric/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/ospf/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/route-map/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/metric/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/rip/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/route-map/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/metric/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/static/metric/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/static/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/route-map/node.def (renamed from templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/as-override/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/as-override/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/export/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/import/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/export/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/import/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-server-client/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/weight/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/number/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/as-path/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/med/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/next-hop/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/receive/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/send/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/extended/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/extended/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/standard/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/standard/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/export/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/import/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/maximum-prefix/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/nexthop-self/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/remove-private-as/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/remove-private-as/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/export/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/import/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-server-client/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/route-server-client/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/weight/node.def (renamed from templates/protocols/bgp/node.tag/peer-group/node.tag/weight/node.def)0
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def2
103 files changed, 13 insertions, 7 deletions
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def
index e03339ca..e03339ca 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/as-set/node.def
index 3de1c8ec..3de1c8ec 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/as-set/node.def
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/summary-only/node.def
index e68ae9b6..e68ae9b6 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/summary-only/node.def
diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def
index a1b6068c..a1b6068c 100644
--- a/templates/protocols/bgp/node.tag/network/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/backdoor/node.def
index a350af44..a350af44 100644
--- a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/backdoor/node.def
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/route-map/node.def
index 58ac22b7..58ac22b7 100644
--- a/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def
new file mode 100644
index 00000000..ea485a15
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def
@@ -0,0 +1 @@
+help: IPv4 BGP settings
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/metric/node.def
index 43f1ffff..43f1ffff 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/metric/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/node.def
index 0b095c32..0b095c32 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/route-map/node.def
index 3d61955a..3d61955a 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/metric/node.def
index 43f1ffff..43f1ffff 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/metric/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/node.def
index 2becf6c4..2becf6c4 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/route-map/node.def
index 3d61955a..3d61955a 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/node.def
index d8312d74..d8312d74 100644
--- a/templates/protocols/bgp/node.tag/redistribute/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/metric/node.def
index 43f1ffff..43f1ffff 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/metric/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/node.def
index 7c92d26d..7c92d26d 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/route-map/node.def
index 3d61955a..3d61955a 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/metric/node.def
index 43f1ffff..43f1ffff 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/metric/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/node.def
index 5b2e31b8..5b2e31b8 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/route-map/node.def
index 3d61955a..3d61955a 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/metric/node.def
index 43f1ffff..43f1ffff 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/metric/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/node.def
index b7f8b390..b7f8b390 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/node.def
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/route-map/node.def
index 3d61955a..3d61955a 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/node.def
index 327872ac..327872ac 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
index db60c0a3..db60c0a3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/as-override/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/as-override/node.def
index 7f67513e..7f67513e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/as-override/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/as-override/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
index a3a9c592..a3a9c592 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
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/address-family/ipv4-unicast/attribute-unchanged/med/node.def
index b64026bb..b64026bb 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
index 23ec4621..23ec4621 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
index 25055d48..25055d48 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def
new file mode 100644
index 00000000..0a1fc867
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def
@@ -0,0 +1 @@
+help: Advertise capabilities to this neighbor (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/node.def
index b4b10172..b4b10172 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
index 257b2bc1..257b2bc1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
index c79637f0..c79637f0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
index bebf8e36..bebf8e36 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/node.def
index adcb3f5e..adcb3f5e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
index e035518f..e035518f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
index c7414d02..c7414d02 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
index 00c6fa38..00c6fa38 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/node.def
index 4c25b408..4c25b408 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
index 8c0824ec..8c0824ec 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
index 5643a595..5643a595 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/node.def
index f9ab180f..f9ab180f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
index 1848bb25..1848bb25 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
index 175b9772..175b9772 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def
new file mode 100644
index 00000000..bc778aa9
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def
@@ -0,0 +1 @@
+help: IPv4 BGP neighbor parameters
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
index e5b0283b..e5b0283b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
index 111f0f8a..111f0f8a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/node.def
index 7d277fee..7d277fee 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
index 091b13b1..091b13b1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/export/node.def
index aa5aeac7..aa5aeac7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/export/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/import/node.def
index ffb37b56..ffb37b56 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/import/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/node.def
index cfba75c3..cfba75c3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
new file mode 100644
index 00000000..b733612e
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
@@ -0,0 +1,2 @@
+help: Neighbor as a IPv4-route reflector client
+commit:expression: $VAR(../../../../@) == $VAR(../../../remote-as/@); "remote-as must equal local-as"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-server-client/node.def
index ceb76c5f..ceb76c5f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-server-client/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
index f7310f26..f7310f26 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
index d097ab10..d097ab10 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
index a8dc3148..a8dc3148 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/weight/node.def
index ec3595f5..ec3595f5 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/weight/node.def
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def
index ecbe213b..b905cacf 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def
@@ -1 +1 @@
-help: BGP neighbor IPv6 parameters
+help: IPv6 BGP neighbor parameters
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
index 0a1fc867..1a9583b2 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
@@ -1 +1 @@
-help: Advertise capabilities to this neighbor (IPv4)
+help: Advertise capabilities to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
deleted file mode 100644
index b23ae677..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Neighbor as a IPv4-route reflector client
-commit:expression: $VAR(../../@) == $VAR(../remote-as/@); "remote-as must equal local-as"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/node.def
index e0699608..e0699608 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
index 857b7b98..857b7b98 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/number/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
index b2a2a898..b2a2a898 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/as-path/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def
index c70212cb..c70212cb 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/med/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
index a67c9fec..a67c9fec 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/next-hop/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
index d1135a3a..d1135a3a 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def
new file mode 100644
index 00000000..c8f64a26
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def
@@ -0,0 +1 @@
+help: Advertise dynamic capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def
new file mode 100644
index 00000000..715932f2
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def
@@ -0,0 +1 @@
+help: Advertise capabilities to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/node.def
index 7ddab63b..7ddab63b 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
index e57cf555..e57cf555 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
index c79637f0..c79637f0 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/receive/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
index bebf8e36..bebf8e36 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/send/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/node.def
index bb7e2958..bb7e2958 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
index 689451ce..689451ce 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/extended/node.def
index d9c17f81..d9c17f81 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/extended/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/extended/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/node.def
index 2f4c5cbe..2f4c5cbe 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/standard/node.def
index 1f6d927e..1f6d927e 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/standard/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/standard/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
index 452e9eda..452e9eda 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
index f19d1d77..f19d1d77 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/node.def
index ac125a22..ac125a22 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
index 4ed52f34..4ed52f34 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
index caeb3e20..caeb3e20 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/node.def
index d7c3919b..d7c3919b 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
index 6909a6f0..6909a6f0 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/maximum-prefix/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
index 83c9fc96..83c9fc96 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/nexthop-self/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def
new file mode 100644
index 00000000..a8e6ed20
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def
@@ -0,0 +1 @@
+help: IPv4 BGP peer group parameters
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
index 303cf43f..303cf43f 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
index ff96c716..ff96c716 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/node.def
index 65b0a4b8..65b0a4b8 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
index 8d214005..8d214005 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/export/node.def
index c374aa33..c374aa33 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/export/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/import/node.def
index f1cddef5..f1cddef5 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/import/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/node.def
index a9726b21..a9726b21 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
new file mode 100644
index 00000000..eff79b87
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
@@ -0,0 +1,2 @@
+help: Peer-group as a route reflector client
+commit:expression: $VAR(../../../../@) == $VAR(../../../remote-as/@); "remote-as must equal local-as"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-server-client/node.def
index c14e9686..c14e9686 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-server-client/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-server-client/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
index 8a5f1880..8a5f1880 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
index 839477d3..839477d3 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
index 0f1602b2..0f1602b2 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/weight/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/weight/node.def
index 45ebcd48..45ebcd48 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/weight/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/weight/node.def
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def
index 4dd66c6b..baa8ca9d 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def
@@ -1,3 +1,3 @@
-help: BGP peer-group IPv6 parameters
+help: IPv6 BGP peer-group parameters
delete:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
--check-peer-groups-6 --peergroup $VAR(../../@) --as $VAR(../../../@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def
deleted file mode 100644
index 26b94f19..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Peer-group as a route reflector client
-commit:expression: $VAR(../../@) == $VAR(../remote-as/@); "remote-as must equal local-as"