Fixing validation errors

Author: fsundermeyer

xml/ay_control_file.xml

@@ -4,31 +4,19 @@
   %entities;
 ]>
 
-<<<<<<< HEAD
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" role="General" xml:id="cha-autoyast-control-file">
- <title>The &ay; control file</title>
- <info xmlns:d="http://docbook.org/ns/docbook">
-=======
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:its="http://www.w3.org/2005/11/its" version="5.0" role="General" xml:id="cha-autoyast-control-file">
  <title>The &ay; control file</title>
  <info>
   <meta name="description" its:translate="yes">Learn how to create and edit XML control files that define system configuration with resources, properties and nested structures</meta>
->>>>>>> maintenance/SLE15SP4
   <dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
    <dm:bugtracker/>
    <dm:translation>yes</dm:translation>
   </dm:docmanager>
  <revhistory xml:id="rh-cha-autoyast-control-file">
    <revision>
-<<<<<<< HEAD
-     <date>2024-06-13</date>
-     <revdescription>
-       <para>Initial version 2024-06-13</para>
-=======
      <date>2026-04-07</date>
      <revdescription>
        <para/>
->>>>>>> maintenance/SLE15SP4
      </revdescription>
    </revision>
  </revhistory>

xml/book_deployment_slemicro.xml

@@ -22,6 +22,20 @@
 images and ISO installation files</meta>
 <meta name="social-descr" its:translate="yes">Deployment of &productnameshort;</meta>
   <revhistory xml:id="rh-book-deployment-slemicro">
+    <revision>
+      <date>2026-04-07</date>
+      <revdescription>
+        <para/>
+      </revdescription>
+    </revision>
+       <revision>
+        <date>2024-05-30</date>
+        <revdescription>
+          <para>
+            Restructured pre-built images deployment.
+          </para>
+        </revdescription>
+       </revision>
        <revision>
          <date>2023-04-03</date>
         <revdescription>
@@ -30,20 +44,12 @@ images and ISO installation files</meta>
            </para>
         </revdescription>
        </revision>
-       <revision>
-        <date>2024-05-30</date>
-        <revdescription>
-          <para>
-            Restructured pre-built images deployment.
-          </para>
-        </revdescription>
-      </revision>
      </revhistory>
      <meta name="task" its:translate="yes">
        <phrase>Deployment</phrase>
       </meta>
     <meta name="series" its:translate="no">Products &amp; Solutions</meta>
-    
+
   <xi:include href="common_copyright_gfdl.xml"/>
   <abstract>
    <para>
@@ -56,14 +62,6 @@ images and ISO installation files</meta>
    </dm:bugtracker>
    <dm:translation>yes</dm:translation>
   </dm:docmanager>
- <revhistory xml:id="rh-book-deployment-slemicro">
-   <revision>
-     <date>2026-04-07</date>
-     <revdescription>
-       <para/>
-     </revdescription>
-   </revision>
- </revhistory>
 </info>
  <xi:include href="deployment_intro.xml"/>
  <part xml:id="part-prep">

xml/book_security_slemicro.xml

@@ -22,6 +22,12 @@
     attestation using &keylime;</meta>
     <meta name="social-descr" its:translate="yes">Using &selnx;, FIPS and &keylime; on &productnameshort;</meta>
     <revhistory  xml:id="rh-book-security-slemicro">
+      <revision>
+        <date>2026-04-07</date>
+        <revdescription>
+          <para/>
+        </revdescription>
+      </revision>
       <revision>
         <date>2023-04-03</date>
         <revdescription>
@@ -32,7 +38,7 @@
       </revision>
     </revhistory>
     <meta name="task" its:translate="yes">
-      <phrase>Security</phrase>          
+      <phrase>Security</phrase>
     </meta>
     <meta name="series" its:translate="no">Products &amp; Solutions</meta>
   <xi:include href="common_copyright_gfdl.xml"/>
@@ -48,17 +54,9 @@
    </dm:bugtracker>
    <dm:translation>yes</dm:translation>
   </dm:docmanager>
- <revhistory xml:id="rh-book-security-slemicro">
-   <revision>
-     <date>2026-04-07</date>
-     <revdescription>
-       <para/>
-     </revdescription>
-   </revision>
- </revhistory>
 </info>
 <xi:include href="security_intro.xml"/>
- 
+
  <xi:include href="slemicro_security_selinux.xml"/>
  <xi:include href="slemicro_security_attestation.xml"/>
  <xi:include href="security_pam.xml"/>

xml/book_upgrade_slemicro.xml

@@ -21,8 +21,14 @@
     releases using the &tr-up; command</meta>
     <meta name="social-descr" its:translate="yes">Upgrade of &productnameshort; from previous
      releases</meta>
-    
+
     <revhistory xml:id="rh-book-upgrade-slemicro">
+      <revision>
+        <date>2026-04-07</date>
+        <revdescription>
+          <para/>
+        </revdescription>
+      </revision>
       <revision>
         <date>2023-04-03</date>
         <revdescription>
@@ -48,20 +54,12 @@
    </dm:bugtracker>
    <dm:translation>yes</dm:translation>
   </dm:docmanager>
- <revhistory xml:id="rh-book-upgrade-slemicro">
-   <revision>
-     <date>2026-04-07</date>
-     <revdescription>
-       <para/>
-     </revdescription>
-   </revision>
- </revhistory>
 </info>
  <xi:include href="upgrade_intro.xml"/>
  <xi:include href="slemicro_introduction.xml"/>
  <xi:include href="slemicro_update_preparation.xml"/>
  <xi:include href="slemicro_update_procedure.xml"/>
- 
+
  <!--<xi:include href="slemicro_appendix_terminology.xml"/>-->
  <xi:include href="common_legal.xml"/>
 </book>