Adds beta tag (#5519)

(cherry picked from commit 13eaeb0) # Conflicts: # docs/cloud-native-security/d4c-get-started.asciidoc # docs/cloud-native-security/d4c-overview.asciidoc
elastic · Jul 8, 2024 · ed02ca2 · ed02ca2
1 parent b3fdfa1
commit ed02ca2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/docs/cloud-native-security/d4c-get-started.asciidoc b/docs/cloud-native-security/d4c-get-started.asciidoc
@@ -6,7 +6,20 @@
 :frontmatter-tags-content-type: [how-to]
 :frontmatter-tags-user-goals: [get-started]
 
+<<<<<<< HEAD
 This page describes how to set up Container Workload Protection (CWP) for various use cases.
+=======
+beta::[]
+
+This page describes how to set up Cloud Workload Protection (CWP) for Kubernetes.
+
+.Requirements
+[sidebar]
+--
+- Kubernetes node operating systems must have Linux kernels 5.10.16 or higher.
+- {stack} version 8.8 or higher.
+--
+>>>>>>> 13eaeb04 (Adds beta tag (#5519))
 
 [discrete]
 == Initial setup

diff --git a/docs/cloud-native-security/d4c-overview.asciidoc b/docs/cloud-native-security/d4c-overview.asciidoc
@@ -1,7 +1,13 @@
 [[d4c-overview]]
 = Container workload protection
 
+<<<<<<< HEAD
 Elastic Container Workload Protection (CWP) provides cloud-native runtime protections for containerized environments by identifying and optionally blocking unexpected system behavior in Kubernetes containers.
+=======
+beta::[]
+
+Elastic Cloud Workload Protection (CWP) for Kubernetes provides cloud-native runtime protections for containerized environments by identifying and optionally blocking unexpected system behavior in Kubernetes containers.
+>>>>>>> 13eaeb04 (Adds beta tag (#5519))
 
 [[d4c-use-cases]]
 [discrete]