Fixed DC files.

SUSE · Jan 29, 2025 · b09efaa · b09efaa
1 parent aac7dcd
commit b09efaa
Show file tree

Hide file tree

Showing 32 changed files with 0 additions and 152 deletions.
diff --git a/DC-Micro-PAM-security b/DC-Micro-PAM-security
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="pam.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="pam-description"
 SRC_DIR="articles"
-=======
-MAIN=pam-description.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="pam-description"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFOS="slmicro"

diff --git a/DC-Micro-active-directory b/DC-Micro-active-directory
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="active-directory.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="active-directory"
 SRC_DIR="articles"
-=======
-MAIN=active-directory.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="active-directory"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFCONDITION="suse-product"

diff --git a/DC-Micro-cockpit b/DC-Micro-cockpit
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="cockpit-slemicro.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-cockpit.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 ## Profiling

diff --git a/DC-Micro-compose b/DC-Micro-compose
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="docker-compose.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-compose.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 
 ## Profiling
 PROFOS="slmicro"

diff --git a/DC-Micro-deployment-images b/DC-Micro-deployment-images
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 MAIN="Micro-deployment-images.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-deployment-images.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"

diff --git a/DC-Micro-deployment-pxe b/DC-Micro-deployment-pxe
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 MAIN="deployment-pxe-boot.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-deployment-pxe.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"

diff --git a/DC-Micro-deployment-raw-images b/DC-Micro-deployment-raw-images
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 MAIN="deployment-raw-images-bare-metal.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-deployment-raw-images.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"

diff --git a/DC-Micro-deployment-raw-images-ibmz b/DC-Micro-deployment-raw-images-ibmz
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 MAIN="deployment-raw-images-ibm-dasd.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-deployment-raw-images-ibmz.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"

diff --git a/DC-Micro-deployment-raw-images-ibmz-zfcp b/DC-Micro-deployment-raw-images-ibmz-zfcp
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 MAIN="deployment-raw-images-ibm-dasd.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-deployment-raw-images-ibmz-zfcp.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"

diff --git a/DC-Micro-deployment-raw-images-virtual-machines b/DC-Micro-deployment-raw-images-virtual-machines
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 MAIN="deployment-raw-images-virtual-machines.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-deployment-raw-images-virtual-machines.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"

diff --git a/DC-Micro-deployment-selfinstall-images b/DC-Micro-deployment-selfinstall-images
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 MAIN="deployment-selfinstall-images-bare-metal.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-deployment-selfinstall-images.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"

diff --git a/DC-Micro-keylime b/DC-Micro-keylime
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="keylime.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="keylime-security"
 SRC_DIR="articles"
-=======
-MAIN=keylime-security.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="keylime-security"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFOS="slmicro"

diff --git a/DC-Micro-managing-system-logfiles b/DC-Micro-managing-system-logfiles
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="logging-managing-system-logfiles.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="logging-managing-system-logfiles"
 SRC_DIR="articles"
-=======
-MAIN=logging-managing-system-logfiles.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="logging-managing-system-logfiles"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 PROFOS="slmicro"
 

diff --git a/DC-Micro-network-configuration b/DC-Micro-network-configuration
@@ -3,14 +3,9 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="network-configuration-nm.asm.xml"
 STRUCTID="network-configuration-nm-marble"
 SRC_DIR="articles"
-=======
-MAIN=Micro-network-configuration.xml
-STRUCTID="network-configuration-nm-marble"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 
 ## Profiling
 PROFOS="slmicro"

diff --git a/DC-Micro-ntp-time-synchronization b/DC-Micro-ntp-time-synchronization
@@ -1,18 +1,11 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="ntp-time-synchronization.asm.xml"
 # Point to the ID of the <structure> of your assembly
 #ROOTID="article-example"
 STRUCTID="ntp-time-synchronization-micro"
 SRC_DIR="articles"
-=======
-MAIN=Micro-ntp-time-synchronization.xml
-# Point to the ID of the <structure> of your assembly
-#ROOTID="article-example"
-STRUCTID="ntp-time-synchronization-micro"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFOS="slmicro"

diff --git a/DC-Micro-pcp b/DC-Micro-pcp
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="performance-copilot-metrics.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="pcp-container"
 SRC_DIR="articles"
-=======
-MAIN=pcp-container.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="pcp-container"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFOS="slemicro"

diff --git a/DC-Micro-pf_bb_config b/DC-Micro-pf_bb_config
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="pf-bb-config.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="pf-bb-config"
 SRC_DIR="articles"
-=======
-MAIN=pf-bb-config.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="pf-bb-config"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFOS="slmicro"

diff --git a/DC-Micro-podman b/DC-Micro-podman
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="podman.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="podman-basics"
 SRC_DIR="articles"
-=======
-MAIN=podman-basics.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="podman-basics"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFCONDITION="suse-product"

diff --git a/DC-Micro-public-cloud b/DC-Micro-public-cloud
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="SLE-Micro-public-cloud.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-public-cloud.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 
 ## Profiling
 PROFOS="slmicro"

diff --git a/DC-Micro-raids b/DC-Micro-raids
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="raid.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-raids.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 STRUCTID="software-raid-micro"
 
 ## Profiling

diff --git a/DC-Micro-selinux b/DC-Micro-selinux
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="SELinux.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="selinux-article"
 SRC_DIR="articles"
-=======
-MAIN=selinux-article.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="selinux-article"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFOS="slmicro"

diff --git a/DC-Micro-setroubleshoot b/DC-Micro-setroubleshoot
@@ -1,16 +1,10 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="SELinux-troubleshooting.asm.xml"
 # Point to the ID of the <structure> of your assembly
 ROOTID="setroubleshoot"
 SRC_DIR="articles"
-=======
-MAIN=setroubleshoot.xml
-# Point to the ID of the <structure> of your assembly
-ROOTID="setroubleshoot"
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 PROFCONDITION="suse-product"

diff --git a/DC-Micro-snapper-basic-concepts b/DC-Micro-snapper-basic-concepts
@@ -1,12 +1,8 @@
 # This file originates from the project https://github.com/openSUSE/doc-kit
 # This file can be edited downstream.
 
-<<<<<<< HEAD
 MAIN="snapper-basic-concepts.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-snapper-basic-concepts.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 
 PROFOS="slmicro"
 #PROFCONDITION="suse-product"

diff --git a/DC-Micro-sudo-configure-superuser-privileges b/DC-Micro-sudo-configure-superuser-privileges
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="sudo-configure-superuser-privileges.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-sudo-configure-superuser-privileges.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 ## Profiling

diff --git a/DC-Micro-sudo-run-commands-as-superuser b/DC-Micro-sudo-run-commands-as-superuser
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="sudo-run-commands-as-superuser.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-sudo-run-commands-as-superuser.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 
 ## Profiling

diff --git a/DC-Micro-systemd-basics b/DC-Micro-systemd-basics
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="systemd-basics.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-systemd-basics.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 IMG_SRC_DIR="images"
 ## Profiling
 PROFOS="slmicro"

diff --git a/DC-Micro-systemd-working-with-timers b/DC-Micro-systemd-working-with-timers
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="systemd-timer-working-with.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-systemd-working-with-timers.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 
 ## Profiling
 PROFOS="slmicro"

diff --git a/DC-Micro-toolbox b/DC-Micro-toolbox
@@ -3,12 +3,8 @@
 ## ----------------------------
 ##
 ## Basics
-<<<<<<< HEAD
 MAIN="toolbox-container.asm.xml"
 SRC_DIR="articles"
-=======
-MAIN=Micro-toolbox.xml
->>>>>>> 75537b5 (Adding files fro locdrop.)
 
 ## Profiling
 PROFOS="slmicro"