From ed02ca22fc5e40208eaa7120da71e6da3827ad14 Mon Sep 17 00:00:00 2001
From: Benjamin Ironside Goldstein
 <91905639+benironside@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:01:25 -0400
Subject: [PATCH] Adds beta tag (#5519)

(cherry picked from commit 13eaeb042011e71f70aa0d38456d31ab509a3860)

# Conflicts:
#	docs/cloud-native-security/d4c-get-started.asciidoc
#	docs/cloud-native-security/d4c-overview.asciidoc
---
 docs/cloud-native-security/d4c-get-started.asciidoc | 13 +++++++++++++
 docs/cloud-native-security/d4c-overview.asciidoc    |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/docs/cloud-native-security/d4c-get-started.asciidoc b/docs/cloud-native-security/d4c-get-started.asciidoc
index 0fdde6d55e..53d7a5f5c4 100644
--- 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
index 5c3634a911..c4508db2c3 100644
--- 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]