6 files changed, 30 insertions, 40 deletions
diff --git a/interface-definitions/include/accel-auth-local-users.xml.i b/interface-definitions/include/accel-auth-local-users.xml.i
index 0d66b8135..35c7a2a06 100644
--- a/interface-definitions/include/accel-auth-local-users.xml.i
+++ b/interface-definitions/include/accel-auth-local-users.xml.i
@@ -9,12 +9,7 @@
         <help>User name for authentication</help>
       </properties>
       <children>
-        <leafNode name="disable">
-          <properties>
-            <help>Option to disable a PPPoE Server user</help>
-            <valueless/>
-          </properties>
-        </leafNode>
+        #include <include/generic-disable-node.xml.i>
         <leafNode name="password">
           <properties>
             <help>Password for authentication</help>
diff --git a/interface-definitions/include/generic-disable-node.xml.in b/interface-definitions/include/generic-disable-node.xml.i
index 3e41070bc..520383afb 100644
--- a/interface-definitions/include/generic-disable-node.xml.in
+++ b/interface-definitions/include/generic-disable-node.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from generic-disable-node.xml.i -->
-<leafNode name="disable">
-  <properties>
-    <help>Temporary disable</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- included end -->
+<!-- included start from generic-disable-node.xml.i -->
+<leafNode name="disable">
+  <properties>
+    <help>Temporary disable</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-eapol.xml.i b/interface-definitions/include/interface-eapol.xml.i
index 94476f0f1..8b33b4acf 100644
--- a/interface-definitions/include/interface-eapol.xml.i
+++ b/interface-definitions/include/interface-eapol.xml.i
@@ -1,12 +1,12 @@
-<!-- included start from interface-eapol.xml.i -->
-<node name="eapol">
-  <properties>
-     <help>Extensible Authentication Protocol over Local Area Network</help>
-  </properties>
-  <children>
-    #include <include/certificate.xml.i>
-    #include <include/certificate-ca.xml.i>
-    #include <include/certificate-key.xml.i>
-  </children>
-</node>
-<!-- included end -->
+<!-- included start from interface-eapol.xml.i -->
+<node name="eapol">
+  <properties>
+     <help>Extensible Authentication Protocol over Local Area Network</help>
+  </properties>
+  <children>
+    #include <include/certificate.xml.i>
+    #include <include/certificate-ca.xml.i>
+    #include <include/certificate-key.xml.i>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index e034ef4dd..7ef90f07e 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -26,12 +26,7 @@
         #include <include/nat-port.xml.i>
       </children>
     </node>
-    <leafNode name="disable">
-      <properties>
-        <help>Disable NAT rule</help>
-        <valueless/>
-      </properties>
-    </leafNode>
+    #include <include/generic-disable-node.xml.i>
     <leafNode name="exclude">
       <properties>
         <help>Exclude packets matching this rule from NAT</help>
diff --git a/interface-definitions/include/radius-server-ipv4.xml.i b/interface-definitions/include/radius-server-ipv4.xml.i
index 7c5e4eb7d..9c73c4c49 100644
--- a/interface-definitions/include/radius-server-ipv4.xml.i
+++ b/interface-definitions/include/radius-server-ipv4.xml.i
@@ -17,7 +17,7 @@
         </constraint>
       </properties>
       <children>
-        #include <include/generic-disable-node.xml.in>
+        #include <include/generic-disable-node.xml.i>
         #include <include/radius-server-key.xml.in>
         #include <include/radius-server-port.xml.in>
       </children>
diff --git a/interface-definitions/include/radius-server-key.xml.in b/interface-definitions/include/radius-server-key.xml.in
index 1f487d3d0..32a01b402 100644
--- a/interface-definitions/include/radius-server-key.xml.in
+++ b/interface-definitions/include/radius-server-key.xml.in
@@ -1,7 +1,7 @@
-<!-- included start from radius-server-key.xml.i -->
-<leafNode name="key">
-  <properties>
-    <help>Shared secret key</help>
-  </properties>
-</leafNode>
-<!-- included end -->
+<!-- included start from radius-server-key.xml.i -->
+<leafNode name="key">
+  <properties>
+    <help>Shared secret key</help>
+  </properties>
+</leafNode>
+<!-- included end -->