Merge pull request #1554 from SUSE/fs/fix_product_names

xml/art_amd-sev.xml

@@ -398,7 +398,7 @@
     </para>
 
     <para>
-      The following example starts a network installation of a SLES15 SP4
+      The following example starts a network installation of a &slsa; 15 SP4
       virtual machine protected with SEV-ES.
     </para>
 

xml/audit_components.xml

@@ -48,7 +48,7 @@
       <dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
         <dm:bugtracker>
         </dm:bugtracker>
-	<dm:translation>yes</dm:translation>
+        <dm:translation>yes</dm:translation>
       </dm:docmanager>
     </info>
     <para>
@@ -209,11 +209,12 @@
   <important>
    <title>audispd merged into auditd</title>
    <para>
-    In &sles;&nbsp;15&nbsp;SP4 the code for
-    <systemitem class="daemon">audispd</systemitem> has
-    been merged into <systemitem class="daemon">auditd</systemitem>.
-    All <systemitem class="daemon">audispd</systemitem> configurations
-    are now in <filename>/etc/audit/auditd.conf</filename> and
+    In <phrase os="sles;sled;slemicro">&sles;&nbsp;15&nbsp;SP4</phrase><phrase
+    os="osuse">&leap; 15.4</phrase> the code for <systemitem
+    class="daemon">audispd</systemitem> has been merged into <systemitem
+    class="daemon">auditd</systemitem>.  All <systemitem
+    class="daemon">audispd</systemitem> configurations are now in
+    <filename>/etc/audit/auditd.conf</filename> and
     <filename>/etc/audit/plugins.d</filename>.
    </para>
   </important>

xml/ay_erb_templates.xml

@@ -479,9 +479,8 @@
        <entry>
         <para>
          Distribution name (<phrase os="sles;osuse">for example,
-         <literal>SLES</literal> or <literal>openSUSE
-         Tumbleweed</literal></phrase><phrase os="slemicro"><literal>SLE
-         Micro</literal></phrase>)
+         <literal>&slsa;</literal> or <literal>&opensuse;
+         Tumbleweed</literal></phrase><phrase os="slemicro"><literal>&slem;</literal></phrase>)
         </para>
        </entry>
       </row>
@@ -508,7 +507,7 @@
    </informaltable>
    <para os="sles;osuse">
     You might use this information to decide which product to install, using
-    pretty much the same profile for all of them (SLE or openSUSE
+    pretty much the same profile for all of them (&slea; or &opensuse;
     distributions).
    </para>
    <example os="sles;osuse">

xml/ay_firewall.xml

@@ -359,30 +359,32 @@
  <sect2 os="sles;sled;osuse" xml:id="CreateProfile-firewall-stage">
   <title>Installation stages when the &firewalld; profile is applied</title>
   <para>
-   Starting with &productname;&nbsp;15&nbsp;SP3, the &firewalld; profile is
-   usually applied at the end of the first stage of the installation. (To learn
-   about the installation stages, see <xref linkend="overviewandconcept"/>.)
-   However, there are circumstances where the profile is applied in the second
-   stage. The following list specifies the conditions under which the
-   &firewalld; profile is applied in the first or second stage:
+   Starting with &productname;&nbsp;15<phrase
+   os="sles;sled">&nbsp;SP3</phrase><phrase os="osuse">.3</phrase>, the
+   &firewalld; profile is usually applied at the end of the first stage of the
+   installation. (To learn about the installation stages, see <xref
+   linkend="overviewandconcept"/>.)  However, there are circumstances where the
+   profile is applied in the second stage. The following list specifies the
+   conditions under which the &firewalld; profile is applied in the first or
+   second stage:
   </para>
   <itemizedlist>
    <listitem>
     <para>
-     You are running &ay; with a &firewalld; section, and not installing &slea;
+     You are running &ay; with a &firewalld; section, and not installing &productname;
      over SSH or VNC. The firewall is configured in the first stage.
     </para>
    </listitem>
    <listitem>
     <para>
-     You are running &ay; with a &firewalld; section, installing &slea; over
+     You are running &ay; with a &firewalld; section, installing &productname; over
      SSH or VNC, and no second stage is required. The firewall is configured in
      the first stage.
     </para>
    </listitem>
    <listitem>
     <para>
-     You are running &ay; with a &firewalld; section, installing &slea; over
+     You are running &ay; with a &firewalld; section, installing &productname; over
      SSH or VNC, and the second stage is required. The firewall is configured
      in the second stage.
     </para>

xml/ay_partitioning.xml

@@ -1846,7 +1846,7 @@
       </para>
       <para>
        The accepted values for each RAID depend on the RAID level (eg. <literal>raid5</literal>)
-       and the number of devices in the RAID. Given that RAID0 or RAID1 do not provide 
+       and the number of devices in the RAID. Given that RAID0 or RAID1 do not provide
        any parity, do not specify this option for such devices.
       </para>
 <screen>&lt;parity_algorithm&gt;left_asymmetric&lt;/parity_algorithm&gt;</screen>
@@ -2135,7 +2135,8 @@ size=40G features='0' hwhandler='0' wp=rw
    RAID implementations. For example, you can dynamically migrate a
    multi-device Btrfs volume from one RAID level to another, RAID levels can be
    set on a per-file basis, and more. However, not all of these features are
-   fully supported yet in &productname; &product-ga; SP&product-sp;.
+   fully supported yet in &productname;&nbsp;&product-ga;<phrase
+   os="sles;sled">&nbsp;SP</phrase><phrase os="osuse">.</phrase>&product-sp;.
   </para>
   <para>
    With &ay;, a multi-device Btrfs can be configured by specifying a drive with

xml/ay_security_settings.xml

@@ -131,7 +131,8 @@
  <sect2 xml:id="CreateProfile-Security-selinux">
   <title>Linux Security Module (LSM) settings</title>
   <para>
-    In &sle;&nbsp;15.4 and up, the installation control file has a new
+    In <phrase os="sles;sled;slemicro">&sle;&nbsp;15 SP4</phrase><phrase
+    os="osuse">&leap; 15.4</phrase> and up, the installation control file has a new
     option, <literal>&lt;lsm_select&gt;</literal> for configuring
     which major Linux Security Module (LSM) will be activated by
     default after installation: &aa;, &selnx;, or none.
@@ -157,7 +158,7 @@
     </listitem>
    </varlistentry>
   </variablelist>
- </sect2> 
+ </sect2>
  <!-- Does this feature apply to openSUSE too? Which version? -->
  <sect2 xml:id="CreateProfile-Security-policies">
   <title>Using &openscap; security policies</title>
@@ -193,7 +194,7 @@
     <literal>&lt;suse_register&gt;</literal> section (see <xref linkend="CreateProfile-Register"/>).
    </para>
    <para>
-    If you install without an internet connection, add the 
+    If you install without an internet connection, add the
     <literal>Basesystem</literal> module from the QU2 medium to the
     <literal>&lt;add_on_products&gt;</literal> section:
    </para>

xml/book_security.xml

@@ -78,7 +78,7 @@
   <xi:include href="security_sysctl.xml"/>
  </part>
 
- <part xml:id="part-compliance">
+ <part os="sles;sled" xml:id="part-compliance">
   <title>Regulations and Compliance</title>
   <xi:include href="common_criteria.xml"/>
   <xi:include href="security_fips.xml"/>

xml/book_tuning.xml

@@ -84,7 +84,7 @@
   <xi:include href="tuning_taskscheduler.xml"/>
   <xi:include href="tuning_memory.xml"/>
   <xi:include href="tuning_network.xml"/>
-  <xi:include href="tuning_sapconf.xml"/>
+  <xi:include os="sles" href="tuning_sapconf.xml"/>
  </part>
 
 <!-- ===================================================================== -->

xml/deployment_selfinstall_procedure.xml

@@ -98,7 +98,7 @@
   </step>
   <step>
    <para>
-    Select <guimenu>Install SLE Micro</guimenu> to start the installation
+    Select <guimenu>Install &slem;</guimenu> to start the installation
     process.
    </para>
   </step>
@@ -116,7 +116,7 @@
   </step>
   <step>
    <para>
-    Start the configuration process by selecting <guimenu>SLE Micro</guimenu>.
+    Start the configuration process by selecting <guimenu>&slem;</guimenu>.
     &slema; is either configured according to the instructions provided on the
     configuration device, or <emphasis>jeos-firstboot</emphasis> is started.
    </para>

xml/deployment_yast_installer.xml

@@ -2460,7 +2460,7 @@ sle-live-patching 8c541494</screen>
      from the beginning of the installation process, boot the system with the
      boot parameter
      <literal>YAST_SECURITY_POLICY=<replaceable>POLICY</replaceable></literal>.
-     To check for compliance with the &disaa; &stiga;, use 
+     To check for compliance with the &disaa; &stiga;, use
      <literal>YAST_SECURITY_POLICY=stig</literal>. For more information about
      boot parameters, refer to <xref linkend="cha-boot-parameters"/>.
     </para>
@@ -2494,7 +2494,7 @@ sle-live-patching 8c541494</screen>
      <guimenu>Network Settings</guimenu> module.<phrase os="sles;sled;osuse"> For details, see
      <xref linkend="sec-network-yast"/>.</phrase>
     </para>
-    <important os="sles">
+    <important os="sles;sled;slemicro">
      <title>Support for &nm;</title>
      <para>
       &suse; only supports &nm; for desktop workloads with &sleda; or the Workstation extension.

xml/file_management.xml

@@ -74,14 +74,15 @@
    </para>
 
    <para>
-    You are advised to review <xref linkend="cha-common-criteria"/>. It is
-    important to understand the need to separate the partitions that could
-    impact a running system (for example, log files filling up
-    <filename>/var/log</filename> are a good reason to separate
-    <filename>/var</filename> from the <filename>/</filename> partition).
-    Another thing to keep in mind is that you need to use LVM
-    or another volume manager or at the least the extended partition type
-    to work around the limit of four primary partitions on PC class systems.
+    <phrase os="sles;sled;slemicro">You are advised to review <xref
+    linkend="cha-common-criteria"/>. </phrase>It is important to understand the
+    need to separate the partitions that could impact a running system (for
+    example, log files filling up <filename>/var/log</filename> are a good
+    reason to separate <filename>/var</filename> from the
+    <filename>/</filename> partition).  Another thing to keep in mind is that
+    you need to use LVM or another volume manager or at the least the extended
+    partition type to work around the limit of four primary partitions on PC
+    class systems.
    </para>
 
    <para>
@@ -103,7 +104,7 @@
   </para>
 
   <para>
-   &sle; provides the <package>permissions</package> package to easily apply
+   &productname; provides the <package>permissions</package> package to easily apply
    file permissions. The package comes with three pre-defined system profiles:
   </para>
 

xml/gpu_passthru.xml

@@ -31,9 +31,9 @@
           GPU pass-through is supported on the &x86-64; architecture only.
         </para>
       </listitem>
-      <listitem>
+      <listitem os="sles;sled;slemicro">
         <para>
-          The host operating system needs to be SLES 12 SP3 or newer.
+          The host operating system needs to be &slsa; 12 SP3 or newer.
         </para>
       </listitem>
       <listitem>
@@ -63,9 +63,9 @@
     <sect2 xml:id="gpu-passthru-verify-host">
       <title>Verify the host environment</title>
       <procedure>
-        <step>
+        <step os="sles;sled;slemicro">
           <para>
-            Verify that the host operating system is SLES 12 SP3 or newer:
+            Verify that the host operating system is &slsa; 12 SP3 or newer:
           </para>
 <screen>
 &prompt.user;cat /etc/issue