Validation fixes.

Author: lvicoun

xml/art_admin_slemicro_podman.xml

@@ -39,18 +39,7 @@
    complete hardware environment and a hypervisor controls virtual machines,
    containers provide virtualization on the operating system level, where the
    kernel controls the isolated containers.
-  </para>
-  <itemizedlist mark="bullet" spacing="normal">
-   <title>Advantages of using containers</title>
-   <listitem>
-    <para>
-      Containers offer a lightweight virtualization method to run multiple
-      virtual environments (containers) simultaneously on a single host. Unlike
-      technologies such as &xen; or &kvm;, where the processor simulates a
-      complete hardware environment and a hypervisor controls virtual machines,
-      containers provide virtualization on the operating system level, where
-      the kernel controls the isolated containers.
-    </para>
+  </para>  
     <itemizedlist mark="bullet" spacing="normal">
       <title>Advantages of using containers</title>
       <listitem>

xml/ay_configuration_installation_options.xml

@@ -3,17 +3,10 @@
   <!ENTITY % entities SYSTEM "generic-entities.ent">
   %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-configuration-installation-options">
- <title>Configuration and installation options</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-configuration-installation-options">
  <title>Configuration and installation options</title>
  <info>
   <meta name="description" its:translate="yes">Discover configuration details for services, user and group management, partitions, firewalls, and other key system components through practical examples</meta>
->>>>>>> maintenance/SLE15SP5
   <abstract>
    <para>
     This section contains configuration examples for services, registration,

xml/book_deployment_slemicro.xml

@@ -19,21 +19,27 @@
   <date><?dbtimestamp format="B d, Y"?></date>
   <revhistory xml:id="rh-book-deployment-slemicro">
     <revision>
-      <date>2023-10-26</date>
+     <date>2026-04-07</date>
+     <revdescription>
+       <para/>
+     </revdescription>
+   </revision>
+   <revision>
+      <date>2024-05-30</date>
       <revdescription>
         <para>
-          Initial version
+          Restructured pre-built images deployment
         </para>
       </revdescription>
     </revision>
     <revision>
-      <date>2024-05-30</date>
+      <date>2023-10-26</date>
       <revdescription>
         <para>
-          Restructured pre-built images deployment
+          Initial version
         </para>
       </revdescription>
-    </revision>
+    </revision>    
   </revhistory>
   <meta name="title" its:translate="yes">Deployment Guide</meta>
 <meta name="description" its:translate="yes">Deployment of &productnameshort; using pre-built
@@ -55,14 +61,7 @@ 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_upgrade_slemicro.xml

@@ -15,13 +15,17 @@
   <productname role="abbrev">&productnameshort;</productname>
   <date>
 <?dbtimestamp format="B d, Y"?></date>
-<meta name="title" its:translate="yes">&productnameshort; Upgrade Guide</meta>
-    <meta name="description" its:translate="yes">Upgrade of &productnameshort; from previous
-    releases using the &tr-up; command</meta>
+<meta name="title" its:translate="yes">&productnameshort; Upgrade Guide</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-10-26</date>
         <revdescription>
@@ -49,15 +53,7 @@
     <dm:assignee>jsindelarova@suse.com</dm:assignee>
    </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>
+  </dm:docmanager> 
 </info>
  <xi:include href="upgrade_intro.xml"/>
  <xi:include href="slemicro_introduction.xml"/>

xml/deployment_boot_parameters.xml

@@ -1104,18 +1104,6 @@ install=slp:/</screen>
     Please note that you need a separate, unencrypted boot partition in order to
     encrypt the root file system.
    </para>
-<<<<<<< HEAD
-   <important>
-    <title>Technology Preview</title>
-    <para>
-     Please note that in &slea;15 SP4, this feature is a technology preview and,
-     therefore, not fully supported. For more information, refer to
-     <!-- the support statement in the preface of this guide. -->
-     <link xlink:href="https://documentation.suse.com/sles/15-SP4/html/SLES-all/preface-deployment.html"/>.
-    </para>
-   </important>
-=======
->>>>>>> maintenance/SLE15SP5
    <para>
     For more information on configuring device encryption with LUKS, refer to
     <xref linkend="cha-configure-cryptctl"/>.

xml/deployment_selfinstall_procedure.xml

@@ -136,148 +136,5 @@
     details, refer to <xref linkend="sec-adding-extension"/>.
    </para>
   </step>
- </procedure>
-<<<<<<< HEAD
- 
-=======
- <section xml:id="sec-selfinstall-conf-device">
-  <title>Preparing the configuration device</title>
-  <para>
-   The following procedure describes how to prepare the configuration device:
-  </para>
-  <procedure xml:id="pro-selfinstall-configuration-device">
-  &pro-preparing-configuration-device;
-</procedure>
- </section>
- <section xml:id="sec-jeos-firstboot-selfinstall">
-  <title>Minimal initial configuration</title>
-  <para>
-   If you do not attach any configuration medium,
-   <emphasis>jeos-firstboot</emphasis> is started, and you can perform a
-   minimal configuration of your system as follows:
-  </para>
-  <procedure>
-   <title>Configuring the system using <emphasis>jeos-firstboot</emphasis></title>
-   <step>
-    <para>
-     Confirm the configuration.
-    </para>
-    <informalfigure>
-     <mediaobject>
-      <imageobject role="fo">
-       <imagedata fileref="slemicro_jeos_start.png" width="100%"/>
-      </imageobject>
-      <imageobject role="html">
-       <imagedata fileref="slemicro_jeos_start.png" width="100%"/>
-      </imageobject>
-      <textobject role="description"><phrase>jeos first boot</phrase>
-      </textobject>
-     </mediaobject>
-    </informalfigure>
-   </step>
-   <step>
-    <para>
-     Select your keyboard layout and confirm your selection.
-    </para>
-    <informalfigure>
-     <mediaobject>
-      <imageobject role="fo">
-       <imagedata fileref="slemicro_jeos_keyboard.png" width="100%"/>
-      </imageobject>
-      <imageobject role="html">
-       <imagedata fileref="slemicro_jeos_keyboard.png" width="100%"/>
-      </imageobject>
-      <textobject role="description"><phrase>jeos keyboard selection</phrase>
-      </textobject>
-     </mediaobject>
-    </informalfigure>
-   </step>
-   <step>
-    <para>
-     Read the license agreement and accept it.
-    </para>
-    <informalfigure>
-     <mediaobject>
-      <imageobject role="fo">
-       <imagedata fileref="slemicro_jeos_eula.png" width="100%"/>
-      </imageobject>
-      <imageobject role="html">
-       <imagedata fileref="slemicro_jeos_eula.png" width="100%"/>
-      </imageobject>
-      <textobject role="description"><phrase>jeos EULA</phrase>
-      </textobject>
-     </mediaobject>
-    </informalfigure>
-   </step>
-   <step>
-    <para>
-     Select your time zone.
-    </para>
-    <informalfigure>
-     <mediaobject>
-      <imageobject role="fo">
-       <imagedata fileref="slemicro_jeos_timezone.png" width="100%"/>
-      </imageobject>
-      <imageobject role="html">
-       <imagedata fileref="slemicro_jeos_timezone.png" width="100%"/>
-      </imageobject>
-      <textobject role="description"><phrase>jeos time zone selection</phrase>
-      </textobject>
-     </mediaobject>
-    </informalfigure>
-   </step>
-   <step>
-    <para>
-     Enter a password for &rootuser;.
-    </para>
-    <informalfigure>
-     <mediaobject>
-      <imageobject role="fo">
-       <imagedata fileref="slemicro_jeos_password.png" width="100%"/>
-      </imageobject>
-      <imageobject role="html">
-       <imagedata fileref="slemicro_jeos_password.png" width="100%"/>
-      </imageobject>
-      <textobject role="description"><phrase>root password</phrase>
-      </textobject>
-     </mediaobject>
-    </informalfigure>
-   </step>
-   <step>
-    <para>
-     Confirm the &rootuser; password.
-    </para>
-    <informalfigure>
-     <mediaobject>
-      <imageobject role="fo">
-       <imagedata fileref="slemicro_jeos_password_confirm.png" width="100%"/>
-      </imageobject>
-      <imageobject role="html">
-       <imagedata fileref="slemicro_jeos_password_confirm.png" width="100%"/>
-      </imageobject>
-      <textobject role="description"><phrase>root password confirmation</phrase>
-      </textobject>
-     </mediaobject>
-    </informalfigure>
-   </step>
-   <step>
-    <para>
-     Accept the statement about &slema; registration.
-    </para>
-    <informalfigure>
-     <mediaobject>
-      <imageobject role="fo">
-       <imagedata fileref="slemicro_jeos_statement.png" width="100%"/>
-      </imageobject>
-      <imageobject role="html">
-       <imagedata fileref="slemicro_jeos_statement.png" width="100%"/>
-      </imageobject>
-      <textobject role="description"><phrase>root password</phrase>
-      </textobject>
-     </mediaobject>
-    </informalfigure>
-   </step>
-  </procedure>
- </section>
->>>>>>> maintenance/SLE15SP5
-</chapter>
+ </procedure> 
+</chapter>

xml/planning.xml

@@ -211,62 +211,7 @@
 
     <sect2 xml:id="sec-planning-leanos-products">
       <title>&leanos; for &sle;-based products</title>
-<<<<<<< HEAD
-      <para>
-        As of &productname; &productnumber;, this includes the following base
-        products:
-      </para>
-      <informaltable>
-        <tgroup cols="2">
-          <thead>
-            <row>
-              <entry>Product Name</entry>
-              <entry>Supported Platforms</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry>&sls;</entry>
-              <entry>AMD64/Intel 64; &aarch64;; &power;; &zseries;</entry>
-            </row>
-            <row>
-              <entry>&slehpc;</entry>
-              <entry>AMD64/Intel 64; &aarch64;</entry>
-            </row>
-            <row>
-              <entry>&slert;</entry>
-              <entry>AMD64/Intel 64</entry>
-            </row>
-            <row>
-              <entry>&sles4sap;</entry>
-              <entry>AMD64/Intel 64; &power;</entry>
-            </row>
-            <row>
-              <entry>&sled;</entry>
-              <entry>AMD64/Intel 64</entry>
-            </row>
-            <row>
-              <entry>&susemgr; Server</entry>
-              <entry>AMD64/Intel 64; &power;; &zseries;</entry>
-            </row>
-            <row>
-              <entry>&susemgrproxy;</entry>
-              <entry>AMD64/Intel 64</entry>
-            </row>
-            <row>
-              <entry>&smr; Branch Server</entry>
-              <entry>AMD64/Intel 64</entry>
-            </row>
-            <row>
-              <entry>&ses;</entry>
-              <entry>AMD64/Intel 64; &arm;; &intel64;</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-=======
       &product_selection;
->>>>>>> maintenance/SLE15SP5
     </sect2>
 
     <sect2 xml:id="sec-planning-leanos-install-internet">

xml/slemicro_update_procedure.xml

@@ -144,27 +144,9 @@
    <title>Extensions during upgrade</title>
    <para>
     The &suse; Linux Enterprise Live Patching and &suse; Package Hub might get
-<<<<<<< HEAD
     updated during the upgrade procedure. If you upgrade from an odd release number to the next even one, the extensions retain the same version. For example, when upgrading from 5.3 to 5.4, the extension versions do not change. Otherwise, the extension versions change.  
      </para>
      </sect2>
-=======
-    updated during the upgrade procedure. See the graph below to check whether
-    the extensions will be updated in your case.
-   </para>
-   <figure xml:id="fig-extensions-upgrade">
-    <title>Upgrading extensions</title>
-    <mediaobject>
-     <imageobject role="fo">
-      <imagedata fileref="slemicro_upgrade_paths.svg" width="50%"/>
-     </imageobject>
-     <imageobject role="html">
-      <imagedata fileref="slemicro_upgrade_paths.svg" width="50%"/>
-     </imageobject>
-    </mediaobject>
-   </figure>
-  </sect2>
->>>>>>> maintenance/SLE15SP5
  </sect1>
  <sect1 xml:id="sec-upgrade-cancel-slemicro">
   <title>Reverting the migration process</title>