From fe6326c96e6e481fc4498c10c493dfd393c3956c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 4 Oct 2020 11:38:48 +0200
Subject: xml: include: add comment about source filename to every include
 snippet

---
 interface-definitions/include/accel-radius-additions.xml.i              | 2 ++
 interface-definitions/include/accel-wins-server.xml.i                   | 2 ++
 interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i              | 2 ++
 interface-definitions/include/address-ipv4-ipv6.xml.i                   | 2 ++
 interface-definitions/include/bgp-afi-aggregate-address.xml.i           | 2 ++
 .../include/bgp-afi-redistribute-metric-route-map.xml.i                 | 2 ++
 interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i       | 2 ++
 interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i       | 2 ++
 interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i     | 2 ++
 interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i     | 2 ++
 interface-definitions/include/dhcp-options.xml.i                        | 2 ++
 interface-definitions/include/dhcpv6-options.xml.i                      | 2 ++
 interface-definitions/include/interface-arp-cache-timeout.xml.i         | 2 ++
 interface-definitions/include/interface-description.xml.i               | 2 ++
 interface-definitions/include/interface-dial-on-demand.xml.i            | 2 ++
 interface-definitions/include/interface-disable-arp-filter.xml.i        | 2 ++
 interface-definitions/include/interface-disable-link-detect.xml.i       | 2 ++
 interface-definitions/include/interface-disable.xml.i                   | 2 ++
 interface-definitions/include/interface-enable-arp-accept.xml.i         | 2 ++
 interface-definitions/include/interface-enable-arp-announce.xml.i       | 2 ++
 interface-definitions/include/interface-enable-arp-ignore.xml.i         | 2 ++
 interface-definitions/include/interface-enable-proxy-arp.xml.i          | 2 ++
 interface-definitions/include/interface-hw-id.xml.i                     | 2 ++
 interface-definitions/include/interface-ipv4.xml.i                      | 2 ++
 interface-definitions/include/interface-ipv6.xml.i                      | 2 ++
 interface-definitions/include/interface-mac.xml.i                       | 2 ++
 interface-definitions/include/interface-mtu-1200-9000.xml.i             | 2 ++
 interface-definitions/include/interface-mtu-1450-9000.xml.i             | 2 ++
 interface-definitions/include/interface-mtu-64-8024.xml.i               | 2 ++
 interface-definitions/include/interface-mtu-68-1500.xml.i               | 2 ++
 interface-definitions/include/interface-mtu-68-9000.xml.i               | 2 ++
 interface-definitions/include/interface-proxy-arp-pvlan.xml.i           | 2 ++
 interface-definitions/include/interface-vrf.xml.i                       | 2 ++
 interface-definitions/include/ipv6-address.xml.i                        | 2 ++
 interface-definitions/include/ipv6-disable-forwarding.xml.i             | 2 ++
 interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i      | 2 ++
 interface-definitions/include/isis-redistribute-ipv4.xml.i              | 2 ++
 interface-definitions/include/nat-address.xml.i                         | 2 ++
 interface-definitions/include/nat-interface.xml.i                       | 2 ++
 interface-definitions/include/nat-port.xml.i                            | 2 ++
 interface-definitions/include/nat-rule.xml.i                            | 2 ++
 interface-definitions/include/nat-translation-port.xml.i                | 2 ++
 interface-definitions/include/port-number.xml.i                         | 2 ++
 interface-definitions/include/radius-server.xml.i                       | 2 ++
 interface-definitions/include/rip-redistribute.xml.i                    | 2 ++
 interface-definitions/include/source-address-ipv4-ipv6.xml.i            | 2 ++
 interface-definitions/include/source-interface-ethernet.xml.i           | 2 ++
 interface-definitions/include/source-interface.xml.i                    | 2 ++
 interface-definitions/include/vif-s.xml.i                               | 2 ++
 interface-definitions/include/vif.xml.i                                 | 2 ++
 50 files changed, 100 insertions(+)

diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i
index 43810625a..598fb73f8 100644
--- a/interface-definitions/include/accel-radius-additions.xml.i
+++ b/interface-definitions/include/accel-radius-additions.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from accel-radius-additions.xml.i -->
 <node name="radius">
   <children>
     <leafNode name="acct-interim-jitter">
@@ -148,3 +149,4 @@
     </node>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/accel-wins-server.xml.i b/interface-definitions/include/accel-wins-server.xml.i
index 461a65ddf..6de032981 100644
--- a/interface-definitions/include/accel-wins-server.xml.i
+++ b/interface-definitions/include/accel-wins-server.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from accel-wins-server.xml.i -->
 <leafNode name="wins-server">
   <properties>
     <help>Windows Internet Name Service (WINS) servers propagated to client</help>
@@ -11,3 +12,4 @@
     <multi/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
index cca824d89..7805110bc 100644
--- a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from address-ipv4-ipv6-dhcp.xml.i -->
 <leafNode name="address">
   <properties>
     <help>IP address</help>
@@ -27,3 +28,4 @@
     <multi/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i
index a891085bd..b11610104 100644
--- a/interface-definitions/include/address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from address-ipv4-ipv6.xml.i -->
 <leafNode name="address">
   <properties>
     <help>IP address</help>
@@ -15,3 +16,4 @@
     <multi/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp-afi-aggregate-address.xml.i
index 050ee0074..c33d1097c 100644
--- a/interface-definitions/include/bgp-afi-aggregate-address.xml.i
+++ b/interface-definitions/include/bgp-afi-aggregate-address.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from bgp-afi-aggregate-address.xml.i -->
 <leafNode name="as-set">
   <properties>
     <help>Generate AS-set path information for this aggregate address</help>
@@ -10,3 +11,4 @@
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i b/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
index 9b3f7a008..f35f13e8d 100644
--- a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
+++ b/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from bgp-afi-redistribute-metric-route-map.xml.i -->
 <leafNode name="metric">
   <properties>
     <help>Metric for redistributed routes</help>
@@ -15,3 +16,4 @@
     </completionHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
index 74afb8851..f1a61d669 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from bgp-neighbor-afi-ipv4-unicast.xml.i -->
 <node name="ipv4-unicast">
   <properties>
     <help>IPv4 BGP neighbor parameters</help>
@@ -283,3 +284,4 @@
     </leafNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
index e95cb6dd8..dcdc0eb66 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from bgp-neighbor-afi-ipv6-unicast.xml.i -->
 <node name="ipv6-unicast">
   <properties>
     <help>IPv6 BGP neighbor parameters</help>
@@ -320,3 +321,4 @@
     </leafNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
index df051ace5..c6ba2630f 100644
--- a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from bgp-peer-group-afi-ipv4-unicast.xml.i -->
 <node name="ipv4-unicast">
   <properties>
     <help>IPv4 BGP peer group parameters</help>
@@ -299,3 +300,4 @@
     </leafNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
index a381e02f0..933065dde 100644
--- a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from bgp-peer-group-afi-ipv6-unicast.xml.i -->
 <node name="ipv6-unicast">
   <properties>
     <help>IPv6 BGP neighbor parameters</help>
@@ -315,3 +316,4 @@
     </leafNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i
index 9989291fc..e33022361 100644
--- a/interface-definitions/include/dhcp-options.xml.i
+++ b/interface-definitions/include/dhcp-options.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from dhcp-options.xml.i -->
 <node name="dhcp-options">
   <properties>
     <help>DHCP client settings/options</help>
@@ -20,3 +21,4 @@
     </leafNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index b0a806806..9a1016956 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from dhcpv6-options.xml.i -->
 <node name="dhcpv6-options">
   <properties>
     <help>DHCPv6 client settings/options</help>
@@ -84,3 +85,4 @@
     </leafNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i
index e65321158..6dfebfee4 100644
--- a/interface-definitions/include/interface-arp-cache-timeout.xml.i
+++ b/interface-definitions/include/interface-arp-cache-timeout.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-arp-cache-timeout.xml.i -->
 <leafNode name="arp-cache-timeout">
   <properties>
     <help>ARP cache entry timeout in seconds</help>
@@ -12,3 +13,4 @@
   </properties>
   <defaultValue>30</defaultValue>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i
index 961533e26..daf09d8bc 100644
--- a/interface-definitions/include/interface-description.xml.i
+++ b/interface-definitions/include/interface-description.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-description.xml.i -->
 <leafNode name="description">
   <properties>
     <help>Interface specific description</help>
@@ -7,3 +8,4 @@
     <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface-dial-on-demand.xml.i
index c14ddf6f5..8fba8099d 100644
--- a/interface-definitions/include/interface-dial-on-demand.xml.i
+++ b/interface-definitions/include/interface-dial-on-demand.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-dial-on-demand.xml.i -->
 <leafNode name="connect-on-demand">
   <properties>
     <help>Establishment connection automatically when traffic is sent</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface-disable-arp-filter.xml.i
index ec3f51b2d..4de3ca893 100644
--- a/interface-definitions/include/interface-disable-arp-filter.xml.i
+++ b/interface-definitions/include/interface-disable-arp-filter.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-disable-arp-filter.xml.i -->
 <leafNode name="disable-arp-filter">
   <properties>
     <help>Disable ARP filter on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-disable-link-detect.xml.i b/interface-definitions/include/interface-disable-link-detect.xml.i
index 619cd03b0..4298b4b5d 100644
--- a/interface-definitions/include/interface-disable-link-detect.xml.i
+++ b/interface-definitions/include/interface-disable-link-detect.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-disable-link-detect.xml.i -->
 <leafNode name="disable-link-detect">
   <properties>
     <help>Ignore link state changes</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i
index 7bd3df5da..5d73d54ba 100644
--- a/interface-definitions/include/interface-disable.xml.i
+++ b/interface-definitions/include/interface-disable.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-disable.xml.i -->
 <leafNode name="disable">
   <properties>
     <help>Administratively disable interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface-enable-arp-accept.xml.i
index 69f26b322..688b3572e 100644
--- a/interface-definitions/include/interface-enable-arp-accept.xml.i
+++ b/interface-definitions/include/interface-enable-arp-accept.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-enable-arp-accept.xml.i -->
 <leafNode name="enable-arp-accept">
   <properties>
     <help>Enable ARP accept on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface-enable-arp-announce.xml.i
index 8d51874c1..c84bb7ea9 100644
--- a/interface-definitions/include/interface-enable-arp-announce.xml.i
+++ b/interface-definitions/include/interface-enable-arp-announce.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-enable-arp-announce.xml.i -->
 <leafNode name="enable-arp-announce">
   <properties>
     <help>Enable ARP announce on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface-enable-arp-ignore.xml.i
index 9adc0f17e..741771a89 100644
--- a/interface-definitions/include/interface-enable-arp-ignore.xml.i
+++ b/interface-definitions/include/interface-enable-arp-ignore.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-enable-arp-ignore.xml.i -->
 <leafNode name="enable-arp-ignore">
   <properties>
     <help>Enable ARP ignore on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface-enable-proxy-arp.xml.i
index 14ab08875..08351e673 100644
--- a/interface-definitions/include/interface-enable-proxy-arp.xml.i
+++ b/interface-definitions/include/interface-enable-proxy-arp.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-enable-proxy-arp.xml.i -->
 <leafNode name="enable-proxy-arp">
   <properties>
     <help>Enable proxy-arp on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-hw-id.xml.i b/interface-definitions/include/interface-hw-id.xml.i
index 318ddd1c4..af58fae3c 100644
--- a/interface-definitions/include/interface-hw-id.xml.i
+++ b/interface-definitions/include/interface-hw-id.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-hw-id.xml.i -->
 <leafNode name="hw-id">
   <properties>
     <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
@@ -10,3 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-ipv4.xml.i b/interface-definitions/include/interface-ipv4.xml.i
index 15932a9d3..551059247 100644
--- a/interface-definitions/include/interface-ipv4.xml.i
+++ b/interface-definitions/include/interface-ipv4.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-ipv4.xml.i -->
 <node name="ip">
   <properties>
     <help>IPv4 routing parameters</help>
@@ -9,3 +10,4 @@
     #include <include/interface-enable-arp-ignore.xml.i>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-ipv6.xml.i b/interface-definitions/include/interface-ipv6.xml.i
index 23362f75a..c9299890b 100644
--- a/interface-definitions/include/interface-ipv6.xml.i
+++ b/interface-definitions/include/interface-ipv6.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-ipv6.xml.i -->
 <node name="ipv6">
   <properties>
     <help>IPv6 routing parameters</help>
@@ -8,3 +9,4 @@
     #include <include/ipv6-dup-addr-detect-transmits.xml.i>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
index 7b2456236..e277de85c 100644
--- a/interface-definitions/include/interface-mac.xml.i
+++ b/interface-definitions/include/interface-mac.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from mac.xml.i -->
 <leafNode name="mac">
   <properties>
     <help>Media Access Control (MAC) address</help>
@@ -10,3 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-mtu-1200-9000.xml.i b/interface-definitions/include/interface-mtu-1200-9000.xml.i
index de48db65e..387e60fa5 100644
--- a/interface-definitions/include/interface-mtu-1200-9000.xml.i
+++ b/interface-definitions/include/interface-mtu-1200-9000.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-mtu-1200-9000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -12,3 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-mtu-1450-9000.xml.i b/interface-definitions/include/interface-mtu-1450-9000.xml.i
index d15987394..3fc961051 100644
--- a/interface-definitions/include/interface-mtu-1450-9000.xml.i
+++ b/interface-definitions/include/interface-mtu-1450-9000.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-mtu-1450-9000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -12,3 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface-mtu-64-8024.xml.i
index e60867e35..f51e098c1 100644
--- a/interface-definitions/include/interface-mtu-64-8024.xml.i
+++ b/interface-definitions/include/interface-mtu-64-8024.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-mtu-68-8024.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -12,3 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface-mtu-68-1500.xml.i
index d47efd2c9..0563e0023 100644
--- a/interface-definitions/include/interface-mtu-68-1500.xml.i
+++ b/interface-definitions/include/interface-mtu-68-1500.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-mtu-68-1500.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -12,3 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-mtu-68-9000.xml.i b/interface-definitions/include/interface-mtu-68-9000.xml.i
index 8fae2043c..82d0ed82b 100644
--- a/interface-definitions/include/interface-mtu-68-9000.xml.i
+++ b/interface-definitions/include/interface-mtu-68-9000.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-mtu-68-9000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -12,3 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
index 7e72b3800..02b96e353 100644
--- a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
+++ b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from interface-proxy-arp-pvlan.xml.i -->
 <leafNode name="proxy-arp-pvlan">
   <properties>
     <help>Enable private VLAN proxy ARP on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-vrf.xml.i b/interface-definitions/include/interface-vrf.xml.i
index 355e7f0f3..e3d6b53e0 100644
--- a/interface-definitions/include/interface-vrf.xml.i
+++ b/interface-definitions/include/interface-vrf.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from interface-vrf.xml.i -->
 <leafNode name="vrf">
   <properties>
     <help>VRF instance name</help>
@@ -10,3 +11,4 @@
     </completionHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/ipv6-address.xml.i b/interface-definitions/include/ipv6-address.xml.i
index 34f54e4c1..26ac1d374 100644
--- a/interface-definitions/include/ipv6-address.xml.i
+++ b/interface-definitions/include/ipv6-address.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from ipv6-address.xml.i -->
 <node name="address">
   <children>
     <leafNode name="autoconf">
@@ -27,3 +28,4 @@
     </leafNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/ipv6-disable-forwarding.xml.i b/interface-definitions/include/ipv6-disable-forwarding.xml.i
index 3f90c7e34..14d9eada9 100644
--- a/interface-definitions/include/ipv6-disable-forwarding.xml.i
+++ b/interface-definitions/include/ipv6-disable-forwarding.xml.i
@@ -1,6 +1,8 @@
+<!-- included start from ipv6-disable-forwarding.xml.i -->
 <leafNode name="disable-forwarding">
   <properties>
     <help>Disable IPv6 forwarding on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
index 728187560..61e6669c4 100644
--- a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
+++ b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from ipv6-dup-addr-detect-transmits.xml.i -->
 <leafNode name="dup-addr-detect-transmits">
   <properties>
     <help>Number of NS messages to send while performing DAD (default: 1)</help>
@@ -14,3 +15,4 @@
     </constraint>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis-redistribute-ipv4.xml.i
index f90900da1..a40d8dfc2 100644
--- a/interface-definitions/include/isis-redistribute-ipv4.xml.i
+++ b/interface-definitions/include/isis-redistribute-ipv4.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from isis-redistribute-ipv4.xml.i -->
 <node name="level-1">
   <properties>
     <help>Redistribute into level-1</help>
@@ -80,3 +81,4 @@
     </tagNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/nat-address.xml.i b/interface-definitions/include/nat-address.xml.i
index 933dae07b..846ef3dec 100644
--- a/interface-definitions/include/nat-address.xml.i
+++ b/interface-definitions/include/nat-address.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from nat-address.xml.i -->
 <leafNode name="address">
   <properties>
     <help>IP address, subnet, or range</help>
@@ -35,3 +36,4 @@
     </constraint>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/nat-interface.xml.i b/interface-definitions/include/nat-interface.xml.i
index c49483297..e42003530 100644
--- a/interface-definitions/include/nat-interface.xml.i
+++ b/interface-definitions/include/nat-interface.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from nat-interface.xml.i -->
 <leafNode name="outbound-interface">
   <properties>
     <help>Outbound interface of NAT traffic</help>
@@ -7,3 +8,4 @@
     </completionHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/nat-port.xml.i b/interface-definitions/include/nat-port.xml.i
index 24803ae05..e417d13cc 100644
--- a/interface-definitions/include/nat-port.xml.i
+++ b/interface-definitions/include/nat-port.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from nat-port.xml.i -->
 <leafNode name="port">
   <properties>
     <help>Port number</help>
@@ -15,3 +16,4 @@
     </valueHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index a2d058479..f91834ae0 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from nat-rule.xml.i -->
 <tagNode name="rule">
   <properties>
     <help>Rule number for NAT</help>
@@ -301,3 +302,4 @@
     </node>
   </children>
 </tagNode>
+<!-- included end -->
diff --git a/interface-definitions/include/nat-translation-port.xml.i b/interface-definitions/include/nat-translation-port.xml.i
index 93de471e3..db8803dac 100644
--- a/interface-definitions/include/nat-translation-port.xml.i
+++ b/interface-definitions/include/nat-translation-port.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from nat-translation-port.xml.i -->
 <leafNode name="port">
   <properties>
     <help>Port number</help>
@@ -11,3 +12,4 @@
     </valueHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i
index 29d2f55fd..d94523e1e 100644
--- a/interface-definitions/include/port-number.xml.i
+++ b/interface-definitions/include/port-number.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from port-number.xml.i -->
 <leafNode name="port">
   <properties>
     <help>Port number used to establish connection</help>
@@ -10,3 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/radius-server.xml.i b/interface-definitions/include/radius-server.xml.i
index 7c2ddff80..b78ebb306 100644
--- a/interface-definitions/include/radius-server.xml.i
+++ b/interface-definitions/include/radius-server.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from radius-server.xml.i -->
 <node name="radius">
   <properties>
     <help>RADIUS based user authentication</help>
@@ -55,3 +56,4 @@
     </tagNode>
   </children>
 </node>
+<!-- included end -->
diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip-redistribute.xml.i
index d94dfa5a8..d287c1c2b 100644
--- a/interface-definitions/include/rip-redistribute.xml.i
+++ b/interface-definitions/include/rip-redistribute.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from rip-redistribute.xml.i -->
 <leafNode name="metric">
   <properties>
     <help>Metric for redistributed routes</help>
@@ -22,3 +23,4 @@
     </completionHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/source-address-ipv4-ipv6.xml.i b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
index 6d2d77c95..6716e0ae4 100644
--- a/interface-definitions/include/source-address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from source-address-ipv4-ipv6.xml.i -->
 <leafNode name="source-address">
   <properties>
     <help>IPv4/IPv6 source address</help>
@@ -15,3 +16,4 @@
     </constraint>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/source-interface-ethernet.xml.i b/interface-definitions/include/source-interface-ethernet.xml.i
index ad90bc4ac..d641f3cb1 100644
--- a/interface-definitions/include/source-interface-ethernet.xml.i
+++ b/interface-definitions/include/source-interface-ethernet.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from source-interface-ethernet.xml.i -->
 <leafNode name="source-interface">
   <properties>
     <help>Physical interface the traffic will go through</help>
@@ -10,3 +11,4 @@
     </completionHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i
index ae579c2a6..e6f0b69a1 100644
--- a/interface-definitions/include/source-interface.xml.i
+++ b/interface-definitions/include/source-interface.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from source-interface.xml.i -->
 <leafNode name="source-interface">
   <properties>
     <help>Physical interface used for connection</help>
@@ -10,3 +11,4 @@
     </completionHelp>
   </properties>
 </leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index cd0afe742..3a04b10d9 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from vif-s.xml.i -->
 <tagNode name="vif-s">
   <properties>
     <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help>
@@ -66,3 +67,4 @@
     </tagNode>
   </children>
 </tagNode>
+<!-- included end -->
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 919e4d493..15c453fcc 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -1,3 +1,4 @@
+<!-- included start from vif.xml.i -->
 <tagNode name="vif">
   <properties>
     <help>Virtual Local Area Network (VLAN) ID</help>
@@ -64,3 +65,4 @@
     #include <include/interface-mtu-68-9000.xml.i>
   </children>
 </tagNode>
+<!-- included end -->
-- 
cgit v1.2.3