Merge pull request #67315 from openshift-cherrypick-robot/cherry-pick…

…-67287-to-enterprise-4.13 [enterprise-4.13] OBSDOCS-152: Remove duplicated content
openshift · Nov 2, 2023 · a9e4f1b · a9e4f1b
2 parents 59e2542 + f7c5622
commit a9e4f1b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 33 deletions.
diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
@@ -2476,8 +2476,6 @@ Topics:
   Dir: v5_7
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Configuring Logging
-    File: logging-5-7-configuration
   - Name: Administering Logging
     File: logging-5-7-administration
 #  Name: Logging Reference
@@ -2486,8 +2484,6 @@ Topics:
   Dir: v5_6
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Configuring Logging
-    File: logging-5-6-configuration
   - Name: Administering Logging
     File: logging-5-6-administration
   - Name: Logging Reference
@@ -2498,8 +2494,6 @@ Topics:
   Topics:
   - Name: Administering Logging
     File: logging-5-5-administration
-#  - Name: Configuring Logging
-#    File: logging-5-5-configuration
 - Name: About Logging
   File: cluster-logging
 - Name: Installing Logging

diff --git a/logging/log_collection_forwarding/log-forwarding.adoc b/logging/log_collection_forwarding/log-forwarding.adoc
@@ -50,6 +50,8 @@ endif::[]
 
 include::modules/logging-create-clf.adoc[leveloffset=+1]
 
+include::modules/logging-multiline-except.adoc[leveloffset=+1]
+
 [id="log-forwarding-audit-logs"]
 == Sending audit logs to the internal log store
 

diff --git a/logging/v5_5/logging-5-5-configuration.adoc b/logging/v5_5/logging-5-5-configuration.adoc
diff --git a/logging/v5_6/logging-5-6-configuration.adoc b/logging/v5_6/logging-5-6-configuration.adoc
diff --git a/logging/v5_7/logging-5-7-configuration.adoc b/logging/v5_7/logging-5-7-configuration.adoc