From 0be00a1dac09a8a64eb6f1feac45e6ba7d5b5385 Mon Sep 17 00:00:00 2001 From: Tanja Roth <taroth@suse.com> Date: Wed, 8 Nov 2023 16:41:50 +0100 Subject: [PATCH] doc-kit run (fetch updates) --- .gitignore | 1 + doc-kit.conf | 4 ++-- xml/generic-entities.ent | 51 +++++++++++++++++++++++++--------------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index c2164e1c..5efb164a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ build/ .vscode/ .idea/ *.code-workspace +.vimrc diff --git a/doc-kit.conf b/doc-kit.conf index 4c84c18e..00dffb29 100644 --- a/doc-kit.conf +++ b/doc-kit.conf @@ -1,9 +1,9 @@ type: docbook5-book variant: license-gfdl -file: 50fc57833230d2afd445ef11a36e81d2850993b1 .gitignore +file: d5aba8356449342d0bac0a62116b85f1b44ee73d .gitignore file: c6b4745307e90c9b88905b434cbbaddc54e4541b .editorconfig -file: 01205dda71486c3419a0ecd95244524b72b93185 xml/generic-entities.ent +file: 71bdb8014805fa7e20ee8f0cbb78b5245b7f69ef xml/generic-entities.ent file: a79a3bc929478668955564bab48aecc8502555f6 xml/network-entities.ent file: 78cb16c93e8a51b4c9ec32c4b30466b87979fb6a xml/common_intro_available_doc.xml file: 6b82b8fa32f3c8cd8c76e804e420ae4a9312ec27 xml/common_intro_support.xml diff --git a/xml/generic-entities.ent b/xml/generic-entities.ent index 0ea2d637..3562205c 100644 --- a/xml/generic-entities.ent +++ b/xml/generic-entities.ent @@ -77,17 +77,17 @@ <!ENTITY sles4sap "&sls; for &sap; Applications"> <!ENTITY s4s "&sles4sap;"> <!ENTITY slem "&sle; Micro"> -<!ENTITY bci "&slea; Base Container Image"> +<!ENTITY bci "&slea; Base Container Images"> <!ENTITY bcia "&slea; BCI"> -<!ENTITY dinstaller "D-Installer"> +<!ENTITY dinstaller "Agama"> <!-- ALP --> <!ENTITY alp "Adaptable Linux Platform"> <!ENTITY alpshort "ALP"> <!-- SLE HA --> -<!ENTITY hasi "&ha; Extension"> -<!ENTITY sleha "&sle; &hasi;"> + +<!ENTITY sleha "&sle; &ha;"> <!ENTITY hageo "Geo Clustering for &sleha;"> <!-- SUSE Manager --> @@ -98,29 +98,29 @@ <!ENTITY smr "&susemgr; for Retail"> -<!-- SUSE PRODUCT ACRONYMS (Scott Corfield via news@suse.com, 2019-03-25) --> +<!-- SUSE PRODUCT ACRONYMS (as approved in TermWeb 2023) --> <!ENTITY slea "SLE"> <!ENTITY sleda "SLED"> <!ENTITY slsa "SLES"> -<!ENTITY slehaa "SLE-HA"> -<!ENTITY slehaga "SLE-HA-GEO"> <!-- This one is not officially defined. --> -<!ENTITY slehpca "SLE-HPC"> -<!ENTITY sles4sapa "SLES-SAP"> +<!ENTITY slehaa "SLE HA"> +<!ENTITY slehaga "SLE HA GEO"> <!-- This one is not officially defined. --> +<!ENTITY slehpca "SLE HPC"> +<!ENTITY sles4sapa "SLES for SAP"> <!ENTITY s4sa "&sles4sapa;"> -<!ENTITY sleposa "SLE-POS"> -<!ENTITY slerta "SLE-RT"> -<!ENTITY slewea "SLE-WE"> -<!ENTITY slelpa "SLE-LP"> -<!ENTITY slema "&slea; Micro"> -<!ENTITY vmdpa "SLE-VMDP"> +<!ENTITY sleposa "SLE POS"> +<!ENTITY slerta "SLE RT"> +<!ENTITY slewea "SLE WE"> +<!ENTITY slelpa "SLE LP"> +<!ENTITY slema "&slea; Micro"> +<!ENTITY vmdpa "SLE VMDP"> <!ENTITY sesa "SES"> <!ENTITY soca "SOC"> -<!ENTITY capa "SUSE-CAP"> -<!ENTITY caaspa "SUSE-CaaSP"> +<!ENTITY capa "SUSE CAP"> +<!ENTITY caaspa "SUSE CaaSP"> <!ENTITY caspa "&caaspa;"> <!ENTITY sumaa "SUMA"> -<!ENTITY smra "SUMA-Retail"> +<!ENTITY smra "SUMA for Retail"> <!-- PRODUCT NAMES WITH (R) SIGN (incomplete) --> @@ -288,7 +288,7 @@ use &deng;! --> <!ENTITY klpa "KLP"> <!ENTITY ulp "user space live patching"> <!ENTITY ulpa "ULP"> -<!ENTITY kiwi "KIWI NG"> +<!ENTITY kiwi "KIWI NG"> <!ENTITY kprobes "Kprobes"> <!ENTITY krb "Kerberos"> <!ENTITY kube "Kubernetes"> @@ -547,6 +547,16 @@ use &deng;! --> <!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 "‐" ><!--HYPHEN --> +<!ENTITY ndash "–" ><!--EN DASH --> +<!ENTITY trade "™" ><!--TRADE MARK SIGN --> +<!ENTITY copy "©" ><!--COPYRIGHT SIGN --> +<!ENTITY sol "/" ><!--SOLIDUS --> +<!ENTITY rdquo "”" ><!--RIGHT DOUBLE QUOTATION MARK --> +<!ENTITY ldquo "“" ><!--LEFT DOUBLE QUOTATION MARK --> +<!ENTITY nbsp " " ><!--NO-BREAK SPACE --> <!-- LEGACY COMPATIBILITY ENTITIES --> <!-- Do not use in new documentation. --> @@ -590,3 +600,6 @@ use &deng;! --> <!-- SLE, old guide names --> <!ENTITY sle_jeos_quick "&jeos; Quick Start"> <!ENTITY smtguide "Subscription Management Tool Guide"> + +<!-- SLE HA, old productname entity --> +<!ENTITY hasi "&ha;"> \ No newline at end of file