diff --git a/xml/Makefile.am b/xml/Makefile.am
index f5ed1321cc..dcbd9db054 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -1,287 +1,287 @@
 #
 # Copyright 2004-2024 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/common.mk
 
 noarch_pkgconfig_DATA	= $(builddir)/pacemaker-schemas.pc
 
 # Pacemaker has 3 schemas: the CIB schema, the API schema (for command-line
 # tool XML output), and a legacy schema for crm_mon --as-xml.
 #
 # See README.md for details on updating CIB schema files (API is similar)
 
 # The CIB and crm_mon schemas are installed directly in PCMK_SCHEMA_DIR
 # for historical reasons, while the API schema is installed in a subdirectory.
 APIdir	= $(PCMK_SCHEMA_DIR)/api
 CIBdir	= $(PCMK_SCHEMA_DIR)
 MONdir	= $(PCMK_SCHEMA_DIR)
 
 basexsltdir		= $(PCMK_SCHEMA_DIR)/base
 dist_basexslt_DATA	= $(srcdir)/base/access-render-2.xsl
 
 # Extract a sorted list of available numeric schema versions
 # from filenames like NAME-MAJOR[.MINOR][.MINOR-MINOR].rng
 numeric_versions = $(shell ls -1 $(1) \
 			  | sed -n -e 's/^.*-\([0-9][0-9.]*\).rng$$/\1/p' \
 			  | sort -u -t. -k 1,1n -k 2,2n -k 3,3n)
 
 version_pairs = $(join \
 			    $(1),$(addprefix \
 			      -,$(wordlist \
 			        2,$(words $(1)),$(1) \
 			      ) \
 			    ) \
 			  )
 
 version_pairs_last = $(wordlist \
 			    $(words \
 			      $(wordlist \
 			        2,$(1),$(2) \
 			      ) \
 			    ),$(1),$(2) \
 			  )
 
 # NOTE: All files in API_request_base, CIB_cfg_base, API_base, and CIB_base
 # need to start with a unique prefix.  These variables all get iterated over
 # and globbed, and two files starting with the same prefix will cause
 # problems.
 
 # Names of API schemas that form the choices for pacemaker-result content
 API_request_base	= command-output	\
 			  crm_attribute 	\
 			  crm_error 		\
 			  crm_mon 		\
 			  crm_node 		\
 			  crm_resource		\
 			  crm_rule 		\
 			  crm_shadow		\
 			  crm_simulate		\
 			  crm_ticket 		\
 			  crmadmin		\
 			  digests		\
 			  iso8601		\
 			  pacemakerd 		\
 			  stonith_admin		\
 			  version
 
 # Names of CIB schemas that form the choices for cib/configuration content
 CIB_cfg_base		= options 	\
 			  nodes 	\
 			  resources 	\
 			  constraints 	\
 			  fencing 	\
 			  acls 		\
 			  tags 		\
 			  alerts
 
 # Names of all schemas (including top level and those included by others)
 API_base		= $(API_request_base)	\
 			  any-element		\
 			  failure		\
 			  fence-event 		\
 			  generic-list		\
 			  instruction		\
 			  item			\
 			  node-attrs		\
 			  node-history		\
 			  nodes			\
 			  ocf-ra		\
 			  options		\
 			  patchset		\
 			  resources		\
 			  status		\
 			  subprocess-output 	\
 			  ticket
 
 CIB_base		= cib 			\
 			  $(CIB_cfg_base) 	\
 			  status 		\
 			  score 		\
 			  rule 			\
 			  nvset
 
 # Static schema files and transforms (only CIB has transforms)
 # 
 # This is more complicated than it should be due to the need to support
 # VPATH builds and "make distcheck". We need the absolute paths for reliable
 # substitution back and forth, and relative paths for distributed files.
 API_abs_files		= $(foreach base,$(API_base),$(wildcard $(abs_srcdir)/api/$(base)-*.rng))
 CIB_abs_files		= $(foreach base,$(CIB_base),$(wildcard $(abs_srcdir)/$(base).rng $(abs_srcdir)/$(base)-*.rng))
 CIB_abs_xsl		= $(abs_srcdir)/upgrade-1.3-0.xsl		\
 			  $(wildcard $(abs_srcdir)/upgrade-2.10-[0-2].xsl)	\
 			  $(wildcard $(abs_srcdir)/upgrade-3.10-*.xsl)
 MON_abs_files 		= $(abs_srcdir)/crm_mon.rng
 API_files		= $(foreach base,$(API_base),$(wildcard $(srcdir)/api/$(base)-*.rng))
 CIB_files		= $(foreach base,$(CIB_base),$(wildcard $(srcdir)/$(base).rng $(srcdir)/$(base)-*.rng))
 CIB_xsl			= $(srcdir)/upgrade-1.3-0.xsl			\
 			  $(wildcard $(srcdir)/upgrade-2.10-[0-2].xsl)	\
 			  $(wildcard $(srcdir)/upgrade-3.10-*.xsl)
 MON_files 		= $(srcdir)/crm_mon.rng
 
 # Sorted lists of all schema versions
 API_versions	= $(call numeric_versions,${API_files})
 CIB_versions	= $(call numeric_versions,${CIB_files})
 MON_versions 	= $(call numeric_versions,$(wildcard $(srcdir)/api/crm_mon*.rng))
 
 # The highest numeric schema version
 API_max			?= $(lastword $(API_versions))
 CIB_max			?= $(lastword $(CIB_versions))
 MON_max 		?= $(lastword $(MON_versions))
 
 # Build tree locations of static schema files and transforms (for VPATH builds)
 API_build_copies	= $(foreach f,$(API_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f)))
 CIB_build_copies	= $(foreach f,$(CIB_abs_files) $(CIB_abs_xsl),$(subst $(abs_srcdir),$(abs_builddir),$(f)))
 MON_build_copies 	= $(foreach f,$(MON_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f)))
 
 # Dynamically generated schema files
 API_generated		= api/api-result.rng $(foreach base,$(API_versions),api/api-result-$(base).rng)
 CIB_generated		= pacemaker.rng 					\
 			  $(foreach base,$(CIB_versions),pacemaker-$(base).rng) \
 			  versions.rng
 MON_generated 		= crm_mon.rng
 
 CIB_version_pairs	= $(call version_pairs,${CIB_versions})
 CIB_version_pairs_cnt	= $(words ${CIB_version_pairs})
 CIB_version_pairs_last  = $(call version_pairs_last,${CIB_version_pairs_cnt},${CIB_version_pairs})
 
 dist_API_DATA		= $(API_files)
 dist_CIB_DATA		= $(CIB_files) \
 			  $(CIB_xsl)
 
 nodist_API_DATA		= $(API_generated)
 nodist_CIB_DATA		= $(CIB_generated)
 nodist_MON_DATA		= $(MON_generated)
 
 EXTRA_DIST		= README.md			\
 			  cibtr-2.rng			\
 			  context-of.xsl		\
 			  rng-helper			\
 			  ocf-meta2man.xsl		\
 			  upgrade-detail.xsl		\
 			  xslt_cibtr-2.rng
 
 .PHONY: cib-versions
 cib-versions:
 	@echo "Max: $(CIB_max)"
 	@echo "Available: $(CIB_versions)"
 
 .PHONY: api-versions
 api-versions:
 	@echo "Max: $(API_max)"
 	@echo "Available: $(API_versions)"
 
 # Dynamically generated top-level API schema
 api/api-result.rng: api/api-result-$(API_max).rng
 	$(AM_V_at)$(MKDIR_P) api # might not exist in VPATH build
 	$(AM_V_SCHEMA)cp $(top_builddir)/xml/$< $@
 
 api/api-result-%.rng: $(API_build_copies) rng-helper Makefile.am
 	$(AM_V_SCHEMA)$(builddir)/rng-helper build_api_rng "$@" "$*" \
 		$(API_request_base)
 
 crm_mon.rng: api/crm_mon-$(MON_max).rng
 	$(AM_V_at)echo '<?xml version="1.0" encoding="UTF-8"?>' > $@
 	$(AM_V_at)echo '<grammar xmlns="http://relaxng.org/ns/structure/1.0"' >> $@
 	$(AM_V_at)echo '         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">' >> $@
 	$(AM_V_at)echo '    <start>' >> $@
 	$(AM_V_at)echo '        <ref name="element-crm_mon-old"/>' >> $@
 	$(AM_V_at)echo '    </start>' >> $@
 	$(AM_V_at)echo '    <define name="element-crm_mon-old">' >> $@
 	$(AM_V_at)echo '        <element name="crm_mon">' >> $@
 	$(AM_V_at)echo '            <attribute name="version"> <text/> </attribute>' >> $@
 	$(AM_V_at)echo '            <externalRef href="$(<)" />' >> $@
 	$(AM_V_at)echo '        </element>' >> $@
 	$(AM_V_at)echo '    </define>' >> $@
 	$(AM_V_SCHEMA)echo '</grammar>' >> $@
 
 # Dynamically generated top-level CIB schema
 pacemaker.rng: pacemaker-$(CIB_max).rng
 	$(AM_V_SCHEMA)cp $(top_builddir)/xml/$< $@
 
 pacemaker-%.rng: $(CIB_build_copies) rng-helper Makefile.am
 	$(AM_V_SCHEMA)$(builddir)/rng-helper build_cib_rng "$@" "$*" \
 		$(CIB_cfg_base)
 
 # Dynamically generated CIB schema listing all pacemaker versions
 #
 # @COMPAT "none" is deprecated since 2.1.8
 versions.rng: pacemaker-$(CIB_max).rng Makefile.am
 	$(AM_V_at)echo '<?xml version="1.0" encoding="UTF-8"?>' > $@
 	$(AM_V_at)echo '<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">' >> $@
 	$(AM_V_at)echo '  <start>' >> $@
-	$(AM_V_at)echo '   <interleave>' >> $@
-	$(AM_V_at)echo '    <attribute name="validate-with">' >> $@
-	$(AM_V_at)echo '      <choice>' >> $@
-	$(AM_V_at)echo '        <value>none</value>' >> $@
-	$(AM_V_at)for rng in $(CIB_versions); do echo "        <value>pacemaker-$$rng</value>" >> $@; done
-	$(AM_V_at)echo '      </choice>' >> $@
-	$(AM_V_at)echo '    </attribute>' >> $@
-	$(AM_V_at)echo '    <attribute name="admin_epoch"><data type="nonNegativeInteger"/></attribute>' >> $@
-	$(AM_V_at)echo '    <attribute name="epoch"><data type="nonNegativeInteger"/></attribute>' >> $@
-	$(AM_V_at)echo '    <attribute name="num_updates"><data type="nonNegativeInteger"/></attribute>' >> $@
-	$(AM_V_at)echo '   </interleave>' >> $@
+	$(AM_V_at)echo '    <group>' >> $@
+	$(AM_V_at)echo '      <attribute name="validate-with">' >> $@
+	$(AM_V_at)echo '        <choice>' >> $@
+	$(AM_V_at)echo '          <value>none</value>' >> $@
+	$(AM_V_at)for rng in $(CIB_versions); do echo "          <value>pacemaker-$$rng</value>" >> $@; done
+	$(AM_V_at)echo '        </choice>' >> $@
+	$(AM_V_at)echo '      </attribute>' >> $@
+	$(AM_V_at)echo '      <attribute name="admin_epoch"><data type="nonNegativeInteger"/></attribute>' >> $@
+	$(AM_V_at)echo '      <attribute name="epoch"><data type="nonNegativeInteger"/></attribute>' >> $@
+	$(AM_V_at)echo '      <attribute name="num_updates"><data type="nonNegativeInteger"/></attribute>' >> $@
+	$(AM_V_at)echo '    </group>' >> $@
 	$(AM_V_at)echo '  </start>' >> $@
 	$(AM_V_SCHEMA)echo '</grammar>' >> $@
 
 schemas:
 	@if [ -z "$$SCHEMAS" ]; then \
 		ls *.rng; \
 		ls *.rng | sort -V | awk 'gsub("-[0-9.]+.rng", ""){if (last != $$0) {print; last=$$0} }'; \
 		printf "\nusage: make schemas SCHEMAS=\"<schema1 schema2 ...>\" [NEW_VERSION=\"<new-version>\"]\n \
 			\nNot specifying NEW_VERSION will increase the last field of the newest version of the schema(s).\n"; \
 	else \
 		if [ -z "$$NEW_VERSION" ]; then \
 			OLD_VERSION=$$(ls *[0-9].rng | awk -F'-' 'gsub(".rng$$", "") {print $$NF}' | sort -Vu | tail -1); \
 			lf=$$(echo "$$OLD_VERSION" | awk -F"." '{print $$NF}'); \
 			! echo "$$lf" | grep -q "^[[:digit:]]\+$$" && echo "Unable to detect version. Use NEW_VERSION= to specify version." && exit 1; \
 			lf=$$((lf+1)); \
 			NEW_VERSION=$$(echo "$$OLD_VERSION" | sed "s/[0-9]\+$$/$$lf/"); \
 		fi; \
 		for schema in $$SCHEMAS; do \
 			old_schema=$$(ls $$schema-[0-9]*.rng | sort -V | tail -1); \
 			new_schema=$$schema-$$NEW_VERSION.rng; \
 			echo "Copying $$old_schema to $$new_schema"; \
 			cp -n "$$old_schema" "$$new_schema"; \
 		done \
 	fi
 
 
 .PHONY: diff
 diff: rng-helper
 	@echo "#  Comparing changes in + since $(CIB_max)"
 	@$(builddir)/rng-helper diff ${CIB_version_pairs_last}
 
 .PHONY: fulldiff
 fulldiff: rng-helper
 	@echo "#  Comparing all changes across all the subsequent increments"
 	@$(builddir)/rng-helper diff ${CIB_version_pairs}
 
 CLEANFILES = $(API_generated) \
 	     $(CIB_generated) \
 	     $(MON_generated)
 
 # Remove pacemaker schema files generated by *any* source version. This allows
 # "make -C xml clean" to have the desired effect when checking out an earlier
 # revision in a source tree.
 .PHONY: clean-local
 clean-local:
 	if [ "x$(srcdir)" != "x$(builddir)" ]; then					\
 		rm -f $(API_build_copies) $(CIB_build_copies) $(MON_build_copies);	\
 	fi
 	rm -f $(builddir)/pacemaker-[0-9]*.[0-9]*.rng
 
 # Enable ability to use $@ in prerequisite
 .SECONDEXPANSION:
 
 # For VPATH builds, copy the static schema files into the build tree
 $(API_build_copies) $(CIB_build_copies) $(MON_build_copies): $$(subst $(abs_builddir),$(srcdir),$$(@))
 	$(AM_V_GEN)if [ "x$(srcdir)" != "x$(builddir)" ]; then	\
 		$(MKDIR_P) "$(dir $(@))";			\
 		cp "$(<)" "$(@)";				\
 	fi
diff --git a/xml/nvset-4.0.rng b/xml/nvset-4.0.rng
index fb76e6d71c..017e3e311f 100644
--- a/xml/nvset-4.0.rng
+++ b/xml/nvset-4.0.rng
@@ -1,108 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- just as nvset-2.9.rng, but allows for instantiated @name restrictions -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="element-nvset"/>
   </start>
 
   <!-- nvpair/@name:
        * generic string by default, parent grammar may want to prohibit
          enumerated names -->
   <define name="element-nvset.name">
     <attribute name="name">
       <text/>
     </attribute>
   </define>
 
   <define name="element-nvset.value">
     <attribute name="value">
       <text/>
     </attribute>
   </define>
 
   <!-- nvpair/@name:
        * defer element-nvset.name grammar item
        nvpair/@value:
        generic string by default, parent grammar may want to restrict
        enumerated pairs (i.e. related to @name) at once -->
   <define name="element-nvset.name-value">
     <ref name="element-nvset.name"/>
     <ref name="element-nvset.value"/>
   </define>
 
   <!-- Allow easy redefinition in parent grammars -->
   <define name="element-nvset.rule">
     <externalRef href="rule-4.0.rng"/>
   </define>
 
   <!--
    Disallow resource meta-attribute name-value pairs for which support was
    recently dropped. The idea is to prevent a user from adding the option under
    the belief that it will still affect behavior. Sometime in the future,
    re-allow these as custom meta-attributes or values.
    -->
   <define name="rsc_meta_attributes.nvpair.unsupported">
     <group>
       <attribute name="name">
         <data type="string">
           <except>
             <value>restart-type</value>
           </except>
         </data>
       </attribute>
       <ref name="element-nvset.value"/>
     </group>
   </define>
 
   <!--
    Disallow operation meta-attribute name-value pairs for which support was
    recently dropped. The idea is to prevent a user from adding the option under
    the belief that it will still affect behavior. Sometime in the future,
    re-allow these as custom meta-attributes or values.
    -->
   <define name="op_meta_attributes.nvpair.unsupported">
     <group>
       <attribute name="name">
         <data type="string">
           <except>
             <choice>
               <value>can_fail</value>
               <value>role_after_failure</value>
             </choice>
           </except>
         </data>
       </attribute>
       <ref name="element-nvset.value"/>
     </group>
   </define>
 
   <define name="element-nvset">
-   <choice>
-   <attribute name="id-ref"><data type="IDREF"/></attribute>
-   <group>
-    <attribute name="id"><data type="ID"/></attribute>
-    <interleave>
-      <optional>
-        <ref name="element-nvset.rule"/>
-      </optional>
-      <zeroOrMore>
-        <element name="nvpair">
-          <choice>
-            <attribute name="id-ref"><data type="IDREF"/></attribute>
-            <group>
-              <attribute name="id"><data type="ID"/></attribute>
-              <ref name="element-nvset.name-value"/>
-            </group>
-          </choice>
-        </element>
-      </zeroOrMore>
-      <optional>
-        <externalRef href="score.rng"/>
-      </optional>
-    </interleave>
-   </group>
-   </choice>
+    <choice>
+      <attribute name="id-ref"><data type="IDREF"/></attribute>
+      <group>
+        <attribute name="id"><data type="ID"/></attribute>
+        <optional>
+          <externalRef href="score.rng"/>
+        </optional>
+        <interleave>
+          <optional>
+            <ref name="element-nvset.rule"/>
+          </optional>
+          <zeroOrMore>
+            <element name="nvpair">
+              <choice>
+                <attribute name="id-ref"><data type="IDREF"/></attribute>
+                <group>
+                  <attribute name="id"><data type="ID"/></attribute>
+                  <ref name="element-nvset.name-value"/>
+                </group>
+              </choice>
+            </element>
+          </zeroOrMore>
+        </interleave>
+      </group>
+    </choice>
   </define>
 
 </grammar>
diff --git a/xml/resources-4.0.rng b/xml/resources-4.0.rng
index 05d769da48..a2fe77483e 100644
--- a/xml/resources-4.0.rng
+++ b/xml/resources-4.0.rng
@@ -1,368 +1,368 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="element-resources"/>
   </start>
 
   <!--
    Include rule definitions so that we can override element-nvset.rule based on
    context
    -->
   <include href="rule-4.0.rng">
     <start combine="choice">
       <notAllowed/>
     </start>
   </include>
 
   <define name="element-resources">
     <element name="resources">
       <zeroOrMore>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-template"/>
           <ref name="element-group"/>
           <ref name="element-clone"/>
           <ref name="element-bundle"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="element-primitive">
     <element name="primitive">
+      <attribute name="id"><data type="ID"/></attribute>
+      <choice>
+        <group>
+          <ref name="element-resource-class"/>
+          <attribute name="type"><text/></attribute>
+        </group>
+        <attribute name="template"><data type="IDREF"/></attribute>
+      </choice>
+      <optional>
+        <attribute name="description"><text/></attribute>
+      </optional>
       <interleave>
-        <attribute name="id"><data type="ID"/></attribute>
-        <choice>
-          <group>
-            <ref name="element-resource-class"/>
-            <attribute name="type"><text/></attribute>
-          </group>
-          <attribute name="template"><data type="IDREF"/></attribute>
-        </choice>
-        <optional>
-          <attribute name="description"><text/></attribute>
-        </optional>
         <ref name="element-resource-extra.primitive-template"/>
         <ref name="element-operations"/>
       </interleave>
     </element>
   </define>
 
   <define name="element-template">
     <element name="template">
+      <attribute name="id"><data type="ID"/></attribute>
+      <ref name="element-resource-class"/>
+      <attribute name="type"><text/></attribute>
+      <optional>
+        <attribute name="description"><text/></attribute>
+      </optional>
       <interleave>
-        <attribute name="id"><data type="ID"/></attribute>
-        <ref name="element-resource-class"/>
-        <attribute name="type"><text/></attribute>
-        <optional>
-          <attribute name="description"><text/></attribute>
-        </optional>
         <ref name="element-resource-extra.primitive-template"/>
         <ref name="element-operations"/>
       </interleave>
     </element>
   </define>
 
   <define name="element-bundle">
     <element name="bundle">
+      <attribute name="id"><data type="ID"/></attribute>
+      <optional>
+        <attribute name="description"><text/></attribute>
+      </optional>
       <interleave>
-        <attribute name="id"><data type="ID"/></attribute>
-        <optional>
-          <attribute name="description"><text/></attribute>
-        </optional>
         <ref name="element-resource-extra"/>
         <choice>
           <element name="docker">
             <attribute name="image"><text/></attribute>
             <optional>
               <attribute name="replicas"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="replicas-per-host"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="promoted-max"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="run-command"> <text/></attribute>
             </optional>
             <optional>
               <attribute name="network"><text/></attribute>
             </optional>
             <optional>
               <attribute name="options"><text/></attribute>
             </optional>
           </element>
           <element name="podman">
             <attribute name="image"><text/></attribute>
             <optional>
               <attribute name="replicas"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="replicas-per-host"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="promoted-max"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="run-command"> <text/></attribute>
             </optional>
             <optional>
               <attribute name="network"><text/></attribute>
             </optional>
             <optional>
               <attribute name="options"><text/></attribute>
             </optional>
           </element>
         </choice>
         <optional>
           <element name="network">
             <optional>
               <attribute name="ip-range-start"><text/></attribute>
             </optional>
             <optional>
               <attribute name="control-port"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="host-interface"><text/></attribute>
             </optional>
             <optional>
               <attribute name="host-netmask"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="add-host"><data type="boolean"/></attribute>
             </optional>
             <zeroOrMore>
               <element name="port-mapping">
                 <attribute name="id"><data type="ID"/></attribute>
                 <choice>
                   <group>
                     <attribute name="port"><data type="integer"/></attribute>
                     <optional>
                       <attribute name="internal-port"><data type="integer"/></attribute>
                     </optional>
                   </group>
                   <attribute name="range">
                     <data type="string">
                       <param name="pattern">([0-9\-]+)</param>
                     </data>
                   </attribute>
                 </choice>
               </element>
             </zeroOrMore>
           </element>
         </optional>
         <optional>
           <element name="storage">
             <zeroOrMore>
               <element name="storage-mapping">
                 <attribute name="id"><data type="ID"/></attribute>
                 <choice>
                   <attribute name="source-dir"><text/></attribute>
                   <attribute name="source-dir-root"><text/></attribute>
                 </choice>
                 <attribute name="target-dir"><text/></attribute>
                 <optional>
                   <attribute name="options"><text/></attribute>
                 </optional>
               </element>
             </zeroOrMore>
           </element>
         </optional>
         <optional>
           <ref name="element-primitive"/>
         </optional>
       </interleave>
     </element>
   </define>
 
   <define name="element-group">
     <element name="group">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <oneOrMore>
           <ref name="element-primitive"/>
         </oneOrMore>
       </interleave>
     </element>
   </define>
 
   <define name="element-clone">
     <element name="clone">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-group"/>
         </choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-resource-extra">
     <zeroOrMore>
       <choice>
         <ref name="element-instance_attributes"/>
         <ref name="element-meta_attributes.rsc"/>
       </choice>
     </zeroOrMore>
   </define>
 
   <define name="element-resource-extra.primitive-template">
     <zeroOrMore>
       <choice>
         <ref name="element-instance_attributes"/>
         <ref name="element-meta_attributes.rsc"/>
         <element name="utilization">
           <externalRef href="nvset-4.0.rng"/>
         </element>
       </choice>
     </zeroOrMore>
   </define>
 
   <define name="element-resource-extra.op">
     <zeroOrMore>
       <choice>
         <ref name="element-instance_attributes"/>
         <ref name="element-meta_attributes.op"/>
       </choice>
     </zeroOrMore>
   </define>
 
   <define name="element-operations">
     <optional>
       <element name="operations">
         <optional>
           <attribute name="id"><data type="ID"/></attribute>
         </optional>
         <optional>
           <attribute name="id-ref"><data type="IDREF"/></attribute>
         </optional>
         <zeroOrMore>
           <element name="op">
             <attribute name="id"><data type="ID"/></attribute>
             <attribute name="name"><text/></attribute>
             <attribute name="interval"><text/></attribute>
             <optional>
               <attribute name="description"><text/></attribute>
             </optional>
             <optional>
               <choice>
                 <attribute name="start-delay"><text/></attribute>
                 <attribute name="interval-origin"><text/></attribute>
               </choice>
             </optional>
             <optional>
               <attribute name="timeout"><text/></attribute>
             </optional>
             <optional>
               <attribute name="enabled"><data type="boolean"/></attribute>
             </optional>
             <optional>
               <attribute name="record-pending"><data type="boolean"/></attribute>
             </optional>
             <optional>
               <attribute name="role">
                 <choice>
                   <value>Stopped</value>
                   <value>Started</value>
                   <value>Promoted</value>
                   <value>Unpromoted</value>
                   <value>Slave</value>
                   <value>Master</value>
                 </choice>
               </attribute>
             </optional>
             <optional>
               <attribute name="on-fail">
                 <choice>
                   <value>ignore</value>
                   <value>block</value>
                   <value>demote</value>
                   <value>stop</value>
                   <value>restart</value>
                   <value>standby</value>
                   <value>fence</value>
                   <value>restart-container</value>
                 </choice>
               </attribute>
             </optional>
             <ref name="element-resource-extra.op"/>
           </element>
         </zeroOrMore>
       </element>
     </optional>
   </define>
 
   <define name="element-resource-class">
     <choice>
       <group>
         <attribute name="class"><value>ocf</value></attribute>
         <attribute name="provider"><text/></attribute>
       </group>
       <attribute name="class">
         <choice>
           <value>lsb</value>
           <value>heartbeat</value>
           <value>stonith</value>
           <value>service</value>
           <value>systemd</value>
         </choice>
       </attribute>
     </choice>
   </define>
 
   <define name="element-instance_attributes">
      <element name="instance_attributes">
        <grammar>
          <include href="nvset-4.0.rng">
            <define name="element-nvset.rule">
              <parentRef name="element-rule-node-allowed"/>
            </define>
          </include>
        </grammar>
      </element>
   </define>
 
   <define name="element-meta_attributes.rsc">
     <element name="meta_attributes">
       <grammar>
         <include href="nvset-4.0.rng">
           <define name="element-nvset.name-value">
             <ref name="rsc_meta_attributes.nvpair.unsupported"/>
           </define>
         </include>
       </grammar>
     </element>
   </define>
 
   <define name="element-meta_attributes.op">
     <element name="meta_attributes">
       <grammar>
         <include href="nvset-4.0.rng">
           <define name="element-nvset.name-value">
             <ref name="op_meta_attributes.nvpair.unsupported"/>
           </define>
 
           <!--
            @COMPAT: Support for node attribute expressions is deprecated here.
            We can just delete this define when we drop support.
            -->
           <define name="element-nvset.rule">
             <parentRef name="element-rule-node-allowed"/>
           </define>
         </include>
       </grammar>
     </element>
   </define>
 
 </grammar>