doc-kit update

SUSE · May 2, 2024 · a93b7e0 · a93b7e0
1 parent a8f5428
commit a93b7e0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 30 deletions.
diff --git a/doc-kit.conf b/doc-kit.conf
@@ -3,12 +3,12 @@ variant: license-gfdl
 
 file: d5aba8356449342d0bac0a62116b85f1b44ee73d  .gitignore
 file: c6b4745307e90c9b88905b434cbbaddc54e4541b  .editorconfig
-file: 1cce617c0f95dd2dd3442220ad4220153cfdac93  xml/generic-entities.ent
+file: f2c87ac37c4c5e9f0e26945fb58e7c63a22bb35d  xml/generic-entities.ent
 file: a79a3bc929478668955564bab48aecc8502555f6  xml/network-entities.ent
-file: bb1883074f56e583475571647a9b724e5e3b5d3f  xml/common_intro_available_doc.xml
+file: 42fafc60a5e9622a138cede94d63a5b0bdc118c1  xml/common_intro_available_doc.xml
 file: 6b82b8fa32f3c8cd8c76e804e420ae4a9312ec27  xml/common_intro_support.xml
-file: a7dde5524c60c5ea24fa07a9381fd0111e55bae9  xml/common_intro_convention.xml
+file: 0e30d909a3d9305a496f3aecf3aa981f3f16f465  xml/common_intro_convention.xml
 file: 2af06d76aa36c3a85968e56e24440d56926cf81b  xml/common_intro_feedback.xml
 file: 9f5f8165bfa8b076d80107d811b89c6c6bded8dd  xml/common_copyright_gfdl.xml
 file: 7022e7485da1b892ea57faf858857981eb3644bc  xml/common_legal.xml
-file: d8d35b7d60a7800407fa0a8f0c0d83f7458a46d3  xml/common_license_gfdl1.2.xml
+file: 58a687a6b796c73ec9716f56b2530e52aea24a6c  xml/common_license_gfdl1.2.xml
diff --git a/xml/common_intro_available_doc.xml b/xml/common_intro_available_doc.xml
@@ -45,7 +45,7 @@
    <!--based on 'Support Resources' listed at https://www.suse.com/support/kb/-->
    <listitem>
     <para>
-     If you have run into an issue, also check out the Technical Information
+     If you run into an issue, check out the Technical Information
      Documents (TIDs) that are available online at <link xlink:href="https://www.suse.com/support/kb/"/>.
      Search the &suse; Knowledgebase for known solutions driven by customer need.
      </para>

diff --git a/xml/common_intro_convention.xml b/xml/common_intro_convention.xml
@@ -106,7 +106,7 @@
    <para>
     Commands can be split into two or multiple lines by a backslash character
     (<literal>\</literal>) at the end of a line. The backslash informs the shell that
-    the command invocation will continue after the line's end:
+    the command invocation will continue after the end of the line:
    </para>
    <screen>&prompt.user;<command>echo</command> a b \
 c d</screen>

diff --git a/xml/common_license_gfdl1.2.xml b/xml/common_license_gfdl1.2.xml
@@ -504,7 +504,7 @@
   Free Documentation License from time to time. Such new versions will be
   similar in spirit to the present version, but may differ in detail to address
   new problems or concerns. See
-  <link xlink:href="https://www.gnu.org/copyleft/">https://www.gnu.org/copyleft/</link>.
+  <link xlink:href="https://www.gnu.org/copyleft/"/>.
  </para>
 
  <para>

diff --git a/xml/generic-entities.ent b/xml/generic-entities.ent
@@ -82,17 +82,17 @@
 <!ENTITY bci-product            "&slea; Base Container Images">
 
 
-<!-- ALP -->
-<!ENTITY alp                    "Adaptable Linux Platform">
-<!ENTITY alpshort               "ALP">
-<!ENTITY alp-dolomite           "&alpshort;&nbsp;Dolomite">
-
+<!-- ALP/SUSE Linux Framework One -->
+<!ENTITY slm                    "&suselinux; Micro">
+<!ENTITY slcc                   "&suselinux; Container Collection">
+<!ENTITY slcs                   "&suselinux; Container Solution">
 
 <!-- SLE HA -->
 
 <!ENTITY sleha                  "&sle; &ha;">
 <!ENTITY hageo                  "Geo Clustering for &sleha;">
 
+
 <!-- SUSE Manager -->
 <!ENTITY susemgr                "&suse; Manager">
 <!ENTITY suma                   "&susemgr;">
@@ -209,25 +209,12 @@ use &deng;! -->
 
 
 <!-- URLS -->
+<!-- use stand-alone only, not as part of URLs, see Style Guide-->
 
 <!ENTITY dsc                    "https://documentation.suse.com">
-<!ENTITY dsc-sles               "&dsc;/sles">
-<!ENTITY dsc-sled               "&dsc;/sled">
-<!ENTITY dsc-ha                 "&dsc;/sle-ha">
-<!ENTITY dsc-sap                "&dsc;/sles-sap">
-<!ENTITY dsc-ses                "&dsc;/ses">
-<!ENTITY dsc-suma               "&dsc;/suma">
-<!ENTITY dsc-caasp              "&dsc;/suse-caasp">
-<!ENTITY dsc-cap                "&dsc;/suse-cap">
-<!ENTITY dsc-soc                "&dsc;/soc">
-
-
 <!ENTITY beta-www               "https://susedoc.github.io">
-
 <!ENTITY doo                    "https://doc.opensuse.org">
-
 <!ENTITY sc-rn                  "https://www.suse.com/releasenotes">
-
 <!ENTITY sccurl                 "https://scc.suse.com/">
 
 <!-- HARDWARE ARCHITECTURES AND PLATFORMS -->
@@ -273,8 +260,7 @@ use &deng;! -->
 <!ENTITY ad                     "Active Directory">
 <!ENTITY ada                    "AD">
 <!ENTITY aide                   "AIDE">
-<!ENTITY alp-installer          "Agama">
-<!ENTITY dinstaller             "&alp-installer;">
+<!ENTITY agama                  "Agama">
 <!ENTITY ansible                "Ansible">
 <!ENTITY ay                     "AutoYaST">
 <!ENTITY bcache                 "<systemitem xmlns='http://docbook.org/ns/docbook' class='resource'>bcache</systemitem>">
@@ -328,7 +314,7 @@ use &deng;! -->
 <!ENTITY yelp                   "Help">
 
 
-<!-- ALP -->
+<!-- ALP/SUSE Linux Framework One -->
 <!ENTITY fuelignition-dld-site   "https://ignite.opensuse.org">
 <!ENTITY virt-scenario           "<command xmlns='http://docbook.org/ns/docbook'>virt-scenario</command>">
 
@@ -352,6 +338,10 @@ use &deng;! -->
 <!ENTITY ingress                "Ingress">
 <!ENTITY keepalived             "Keepalived">
 
+<!-- HPC -->
+
+<!ENTITY hpc                    "High Performance Computing">
+<!ENTITY hpcm                   "HPC module">
 
 
 <!-- SLES FOR SAP -->
@@ -373,6 +363,7 @@ use &deng;! -->
 <!ENTITY bci                    "&slea; Base Container Image">
 <!ENTITY bcia                   "&slea; BCI">
 <!ENTITY netavark               "Netavark">
+<!ENTITY compose                "docker-compose">
 
 
 
@@ -531,6 +522,7 @@ use &deng;! -->
 <!ENTITY sle_container_guide    "Container Guide">
 <!ENTITY sle_pcidss_guide       "&pcidss; (&pcidssa;) Guide">
 <!ENTITY sle_pcidss_guide_a     "&pcidssa; Guide">
+<!ENTITY hpc_guide              "HPC Guide">
 
 
 <!-- SLE Micro-specific -->
@@ -572,10 +564,13 @@ use &deng;! -->
 <!ENTITY nbsp             "&#x000A0;" ><!--NO-BREAK SPACE -->
 <!ENTITY ndash            "&#x02013;" ><!--EN DASH -->
 <!ENTITY rdquo            "&#x0201D;" ><!--RIGHT DOUBLE QUOTATION MARK -->
+<!ENTITY rsquo            "&#x02019;" ><!--RIGHT SINGLE QUOTATION MARK -->
 <!ENTITY reg              "&#x000AE;" ><!--REGISTERED SIG -->
 <!ENTITY sol              "&#x0002F;" ><!--SOLIDUS -->
 <!ENTITY thrdmrk          "*"         ><!--ASTERISK -->
+<!ENTITY times            "&#x000D7;" ><!--MULTIPLICATION SIGN -->
 <!ENTITY trade            "&#x02122;" ><!--TRADE MARK SIGN -->
+<!ENTITY verbar           "&#x0007C;" ><!--VERTICAL LINE -->
 
 <!-- LEGACY COMPATIBILITY ENTITIES -->
 <!-- Do not use in new documentation. -->
@@ -621,4 +616,4 @@ use &deng;! -->
 <!ENTITY smtguide              "Subscription Management Tool Guide">
 
 <!-- SLE HA, old productname entity -->
-<!ENTITY hasi                   "&ha;">
+<!ENTITY hasi                   "&ha;">