Fix minvm entities

SUSE · Dec 22, 2023 · 828a965 · 828a965
1 parent c9a5f2f
commit 828a965
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 71 deletions.
diff --git a/doc-kit.conf b/doc-kit.conf
@@ -3,11 +3,7 @@ variant: license-gfdl
 
 file: d5aba8356449342d0bac0a62116b85f1b44ee73d  .gitignore
 file: c6b4745307e90c9b88905b434cbbaddc54e4541b  .editorconfig
-<<<<<<< HEAD
-file: 71bdb8014805fa7e20ee8f0cbb78b5245b7f69ef  xml/generic-entities.ent
-=======
 file: 1cce617c0f95dd2dd3442220ad4220153cfdac93  xml/generic-entities.ent
->>>>>>> eaee3274e (Run doc-kit update)
 file: a79a3bc929478668955564bab48aecc8502555f6  xml/network-entities.ent
 file: bb1883074f56e583475571647a9b724e5e3b5d3f  xml/common_intro_available_doc.xml
 file: 6b82b8fa32f3c8cd8c76e804e420ae4a9312ec27  xml/common_intro_support.xml

diff --git a/xml/art_minimal-vm.xml b/xml/art_minimal-vm.xml
@@ -9,7 +9,7 @@
  xml:lang="en">
  <info>
   <title>&sle_minvm_guide;</title>
-  <productname>&sls; &minvm;</productname>
+  <productname>&minvm;</productname>
   <productnumber>&productnumber;</productnumber>
   <date><?dbtimestamp format="B d, Y"?></date>
   <dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
@@ -24,7 +24,7 @@
   </dm:docmanager>
   <abstract>
    <para>
-    The following document provides an overview of &sls; &minvm; (formerly known
+    The following document provides an overview of &minvm; (formerly known
     as &jeos;) and describes the setup procedure.
    </para>
   </abstract>
@@ -44,7 +44,7 @@
 
   <para>
    If you already have &sls; certification, you are automatically certified for
-   &minvm;, as it is derived from the same code base. &sls; &minvm; allows you to
+   &minvm;, as it is derived from the same code base. &minvm; allows you to
    reduce the operating system to the packages essential for the specific usage
    scenario. This minimizes the number of packages and patches that need to be
    managed and applied. By removing unnecessary packages, you also reduce the
@@ -196,7 +196,7 @@
       <note>
        <title>Specific host tools packages</title>
        <para>
-        Each &sls; &minvm; flavor contains certain host tools packages. Refer to
+        Each &minvm; flavor contains certain host tools packages. Refer to
         the specific flavors section in the documentation for further
         information.
        </para>

diff --git a/xml/generic-entities.ent b/xml/generic-entities.ent
@@ -557,32 +557,6 @@ use &deng;! -->
 
 
 
-<<<<<<< HEAD
-<!-- CHARACTER ENTITIES -->
-
-<!ENTITY euro                   "&#x20AC;">
-<!ENTITY thrdmrk                "*">
-
-
-
-<!-- SYSTEM ENTITIES FOR DOCBOOK 5 -->
-
-<!ENTITY % sgml.features        "IGNORE">
-<!ENTITY % xml.features         "INCLUDE">
-<!ENTITY % dbcent PUBLIC        "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/dbcentx.mod">
-  %dbcent;
-
-<!-- DOCBOOK 4 ENTITITES -->
-
-<!ENTITY dash             "&#x02010;" ><!--HYPHEN -->
-<!ENTITY ndash            "&#x02013;" ><!--EN DASH -->
-<!ENTITY trade            "&#x02122;" ><!--TRADE MARK SIGN -->
-<!ENTITY copy             "&#x000A9;" ><!--COPYRIGHT SIGN -->
-<!ENTITY sol              "&#x0002F;" ><!--SOLIDUS -->
-<!ENTITY rdquo            "&#x0201D;" ><!--RIGHT DOUBLE QUOTATION MARK -->
-<!ENTITY ldquo            "&#x0201C;" ><!--LEFT DOUBLE QUOTATION MARK -->
-<!ENTITY nbsp             "&#x000A0;" ><!--NO-BREAK SPACE -->
-=======
 <!-- DOCBOOK 4 ENTITITES -->
 
 <!ENTITY ast              "&#x0002A;" ><!--ASTERISK -->
@@ -602,7 +576,6 @@ use &deng;! -->
 <!ENTITY sol              "&#x0002F;" ><!--SOLIDUS -->
 <!ENTITY thrdmrk          "*"         ><!--ASTERISK -->
 <!ENTITY trade            "&#x02122;" ><!--TRADE MARK SIGN -->
->>>>>>> eaee3274e (Run doc-kit update)
 
 <!-- LEGACY COMPATIBILITY ENTITIES -->
 <!-- Do not use in new documentation. -->

diff --git a/xml/rmt_install.xml b/xml/rmt_install.xml
@@ -91,39 +91,39 @@
 
 <screen>&prompt.sudo;<command>zypper in rmt-server</command></screen>
 
-  <sect2 xml:id="sec-rmt-installation-zypper-jeos">
-   <title>Installation on &minvm;</title>
-   <para>
-    &sls; &minvm; is a minimal customizable operating system that is designed
-    for specific usage scenarios, for example, to be run as:
-   </para>
-   <itemizedlist>
-    <listitem>
-     <para>
-      A container host
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      A virtual machine guest
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      An appliance base system
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      A small server image
-     </para>
-    </listitem>
-   </itemizedlist>
-   <para>
-    Therefore, &minvm; image is a good choice for being used as an &rmt;
-    server. You can download &sls; &minvm; images for &kvm;, &xen;, &hyperv;,
-    &vmware;, and OpenStack from the public &sls; download page at
-    <link
+    <sect2 xml:id="sec-rmt-installation-zypper-jeos">
+      <title>Installation on &minvm;</title>
+      <para>
+        &minvm; is a minimal customizable operating system that is
+        designed for specific usage scenarios, for example, to be run as:
+      </para>
+      <itemizedlist>
+        <listitem>
+          <para>
+            A container host
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            A virtual machine guest
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            An appliance base system
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            A small server image
+          </para>
+        </listitem>
+      </itemizedlist>
+      <para>
+        &minvm; image is a good choice for being used as an &rmt; server. You
+        can download &minvm; images for &kvm;, &xen;, &hyperv;, &vmware;,
+        and OpenStack from the public &sls; download page at
+        <link
    xlink:href="https://www.suse.com/download/sles/"/>. Find more
     information on &minvm; at
     <link

diff --git a/xml/software_management.xml b/xml/software_management.xml
@@ -114,10 +114,10 @@
     add packages as needed.
    </para>
 
-   <tip>
-    <title>&slsa; &minvm;</title>
+   <tip os="sles;sled;slemicro">
+    <title>&minvm;</title>
     <para>
-     The &sls; download page offers pre-configured and ready-to-run &slsa; &minvm; virtual machine images. &slsa; &minvm; has a small footprint and can be customized to fit specific needs of a system developer. &minvm; is designed for use in virtual machines and for virtual software appliance development. The key benefits of &slsa; &minvm; are efficiency and simplified management. More information about &minvm; is available in the dedicated guide. If &slsa; &minvm; does not meet your requirements, consider the minimal installation pattern.
+     The &sls; download page offers preconfigured and ready-to-run &minvm; virtual machine images. &minvm; has a small footprint and can be customized to fit specific needs of a system developer. &minvm; is designed for use in virtual machines and for virtual software appliance development. The key benefits of &minvm; are efficiency and simplified management. More information about &minvm; is available in the dedicated guide. If &minvm; does not meet your requirements, consider the minimal installation pattern.
     </para>
    </tip>