diff --git a/interface-definitions/include/bgp/afi-common-flowspec.xml.i b/interface-definitions/include/bgp/afi-common-flowspec.xml.i index 819e5cbb5..fb3308ee8 100644 --- a/interface-definitions/include/bgp/afi-common-flowspec.xml.i +++ b/interface-definitions/include/bgp/afi-common-flowspec.xml.i @@ -1,7 +1,7 @@ <!-- include start from bgp/afi-common-flowspec.xml.i --> #include <include/bgp/afi-filter-list.xml.i> #include <include/bgp/afi-route-map.xml.i> #include <include/bgp/afi-route-reflector-client.xml.i> #include <include/bgp/afi-route-server-client.xml.i> #include <include/bgp/afi-soft-reconfiguration.xml.i> -<!-- included end --> +<!-- include end --> diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-flowspec.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-flowspec.xml.i index 9c700bd11..2f0ed72bf 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv4-flowspec.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-flowspec.xml.i @@ -1,11 +1,11 @@ -<!-- included start from bgp-neighbor-afi-ipv4-flowspec.xml.i --> +<!-- include start from bgp/neighbor-afi-ipv4-flowspec.xml.i --> <node name="ipv4-flowspec"> <properties> <help>IPv4 Flow Specification BGP neighbor parameters</help> </properties> <children> #include <include/bgp/afi-ipv4-prefix-list.xml.i> #include <include/bgp/afi-common-flowspec.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i index a489666e4..45a440fd8 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i @@ -1,20 +1,20 @@ -<!-- included start from bgp-neighbor-afi-ipv4-labeled-unicast.xml.i --> +<!-- include start from bgp/neighbor-afi-ipv4-labeled-unicast.xml.i --> <node name="ipv4-labeled-unicast"> <properties> <help>IPv4 Labeled Unicast BGP neighbor parameters</help> </properties> <children> <node name="capability"> <properties> <help>Advertise capabilities to this neighbor (IPv4)</help> </properties> <children> #include <include/bgp/afi-capability-orf.xml.i> </children> </node> #include <include/bgp/afi-ipv4-prefix-list.xml.i> #include <include/bgp/afi-common.xml.i> #include <include/bgp/afi-default-originate.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i index 5a6e66dc1..6526169ca 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i @@ -1,20 +1,20 @@ -<!-- included start from bgp-neighbor-afi-ipv4-multicast.xml.i --> +<!-- include start from bgp/neighbor-afi-ipv4-multicast.xml.i --> <node name="ipv4-multicast"> <properties> <help>IPv4 Multicast BGP neighbor parameters</help> </properties> <children> <node name="capability"> <properties> <help>Advertise capabilities to this neighbor (IPv4)</help> </properties> <children> #include <include/bgp/afi-capability-orf.xml.i> </children> </node> #include <include/bgp/afi-ipv4-prefix-list.xml.i> #include <include/bgp/afi-common.xml.i> #include <include/bgp/afi-default-originate.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i index 967d78486..838327bc9 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i @@ -1,11 +1,11 @@ -<!-- included start from bgp/neighbor-afi-ipv4-vpn.xml.i --> +<!-- include start from bgp/neighbor-afi-ipv4-vpn.xml.i --> <node name="ipv4-vpn"> <properties> <help>IPv4 VPN BGP neighbor parameters</help> </properties> <children> #include <include/bgp/afi-ipv4-prefix-list.xml.i> #include <include/bgp/afi-common.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv6-flowspec.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-flowspec.xml.i index 692310b0c..bc61076aa 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv6-flowspec.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-flowspec.xml.i @@ -1,11 +1,11 @@ -<!-- included start from bgp-neighbor-afi-ipv6-flowspec.xml.i --> +<!-- include start from bgp/neighbor-afi-ipv6-flowspec.xml.i --> <node name="ipv6-flowspec"> <properties> <help>IPv6 Flow Specification BGP neighbor parameters</help> </properties> <children> #include <include/bgp/afi-ipv6-prefix-list.xml.i> #include <include/bgp/afi-common-flowspec.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i index eb4f7939c..f680b7357 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i @@ -1,21 +1,21 @@ -<!-- included start from bgp-neighbor-afi-ipv6-labeled-unicast.xml.i --> +<!-- include start from bgp/neighbor-afi-ipv6-labeled-unicast.xml.i --> <node name="ipv6-labeled-unicast"> <properties> <help>IPv6 Labeled Unicast BGP neighbor parameters</help> </properties> <children> <node name="capability"> <properties> <help>Advertise capabilities to this neighbor (IPv6)</help> </properties> <children> #include <include/bgp/afi-capability-orf.xml.i> </children> </node> #include <include/bgp/afi-ipv6-nexthop-local.xml.i> #include <include/bgp/afi-ipv6-prefix-list.xml.i> #include <include/bgp/afi-common.xml.i> #include <include/bgp/afi-default-originate.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i index 1d8e84935..1f8db8361 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i @@ -1,13 +1,13 @@ -<!-- included start from bgp-neighbor-afi-ipv6-multicast.xml.i --> +<!-- include start from bgp/neighbor-afi-ipv6-multicast.xml.i --> <node name="ipv6-multicast"> <properties> <help>IPv6 Multicast BGP neighbor parameters</help> </properties> <children> #include <include/bgp/afi-ipv6-nexthop-local.xml.i> #include <include/bgp/afi-ipv6-prefix-list.xml.i> #include <include/bgp/afi-common.xml.i> #include <include/bgp/afi-default-originate.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/policy/action.xml.i b/interface-definitions/include/policy/action.xml.i index fddbd5a98..3b9b458d4 100644 --- a/interface-definitions/include/policy/action.xml.i +++ b/interface-definitions/include/policy/action.xml.i @@ -1,21 +1,21 @@ -<!-- included start from policy-list-action.xml.i --> +<!-- include start from policy/action.xml.i --> <leafNode name="action"> <properties> <help>Action to take on entries matching this rule [REQUIRED]</help> <completionHelp> <list>permit deny</list> </completionHelp> <valueHelp> <format>permit</format> <description>Permit matching entries</description> </valueHelp> <valueHelp> <format>deny</format> <description>Deny matching entries</description> </valueHelp> <constraint> <regex>^(permit|deny)$</regex> </constraint> </properties> </leafNode> -<!-- included end --> +<!-- include end --> diff --git a/interface-definitions/include/policy/description.xml.i b/interface-definitions/include/policy/description.xml.i index 15a77cd66..e2ff35d02 100644 --- a/interface-definitions/include/policy/description.xml.i +++ b/interface-definitions/include/policy/description.xml.i @@ -1,11 +1,11 @@ -<!-- included start from policy/description.xml.i --> +<!-- include start from policy/description.xml.i --> <leafNode name="description"> <properties> <help>Description</help> <valueHelp> <format>txt</format> <description>Description</description> </valueHelp> </properties> </leafNode> -<!-- included end --> +<!-- include end --> diff --git a/interface-definitions/include/routing-passive-interface-xml.i b/interface-definitions/include/routing-passive-interface-xml.i index 8478620cf..9bd4dac2a 100644 --- a/interface-definitions/include/routing-passive-interface-xml.i +++ b/interface-definitions/include/routing-passive-interface-xml.i @@ -1,24 +1,24 @@ -<!-- included start from routing-passive-interface-xml.i --> +<!-- include start from routing-passive-interface-xml.i --> <leafNode name="passive-interface"> <properties> <help>Suppress routing updates on an interface</help> <completionHelp> <list>default</list> <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> <valueHelp> <format>txt</format> <description>Interface to be passive (i.e. suppress routing updates)</description> </valueHelp> <valueHelp> <format>default</format> <description>Default to suppress routing updates on all interfaces</description> </valueHelp> <constraint> <regex>^(default)$</regex> <validator name="interface-name"/> </constraint> <multi/> </properties> </leafNode> -<!-- included end --> +<!-- include end -->