From 1ce9ea5777e924509fea2e5417d5cc5edc040938 Mon Sep 17 00:00:00 2001
From: Laura Hinson <lahinson@redhat.com>
Date: Fri, 10 Jul 2026 14:55:48 -0400
Subject: [PATCH] [OSDOCS-20644]: CQA: HCP feature gates

---
 _topic_maps/_topic_map.yml                       |  2 +-
 .../hcp-using-feature-gates.adoc                 |  5 +++--
 modules/hcp-enable-feature-sets.adoc             | 16 +++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
index 66017edcc0a2..b0a145afd51b 100644
--- a/_topic_maps/_topic_map.yml
+++ b/_topic_maps/_topic_map.yml
@@ -2795,7 +2795,7 @@ Topics:
   File: hcp-authentication-authorization
 - Name: Handling machine configuration for hosted control planes
   File: hcp-machine-config
-- Name: Using feature gates in a hosted cluster
+- Name: Feature gates in a hosted cluster
   File: hcp-using-feature-gates
 - Name: Observability for hosted control planes
   File: hcp-observability
diff --git a/hosted_control_planes/hcp-using-feature-gates.adoc b/hosted_control_planes/hcp-using-feature-gates.adoc
index 234c2f71704e..51a53f3954be 100644
--- a/hosted_control_planes/hcp-using-feature-gates.adoc
+++ b/hosted_control_planes/hcp-using-feature-gates.adoc
@@ -1,11 +1,12 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="hcp-using-feature-gates"]
-= Using feature gates in a hosted cluster
 include::_attributes/common-attributes.adoc[]
+[id="hcp-using-feature-gates"]
+= Feature gates in a hosted cluster
 :context: hcp-using-feature-gates
 
 toc::[]
 
+[role="_abstract"]
 You can use feature gates in a hosted cluster to enable features that are not part of the default set of features. You can enable the `TechPreviewNoUpgrade` feature set by using feature gates in your hosted cluster.
 
 include::modules/hcp-enable-feature-sets.adoc[leveloffset=+1]
diff --git a/modules/hcp-enable-feature-sets.adoc b/modules/hcp-enable-feature-sets.adoc
index af0e11a8d652..29e1b55b9888 100644
--- a/modules/hcp-enable-feature-sets.adoc
+++ b/modules/hcp-enable-feature-sets.adoc
@@ -6,6 +6,7 @@
 [id="hcp-enable-feature-sets_{context}"]
 = Enabling feature sets by using feature gates
 
+[role="_abstract"]
 You can enable the `TechPreviewNoUpgrade` feature set in a hosted cluster by editing the `HostedCluster` custom resource (CR) with the OpenShift CLI.
 
 .Prerequisites
@@ -28,20 +29,21 @@ $ oc edit hostedcluster <hosted_cluster_name> -n <hosted_cluster_namespace>
 apiVersion: hypershift.openshift.io/v1beta1
 kind: HostedCluster
 metadata:
-  name: <hosted_cluster_name> <1>
-  namespace: <hosted_cluster_namespace> <2>
+  name: <hosted_cluster_name>
+  namespace: <hosted_cluster_namespace>
 spec:
   configuration:
     featureGate:
-      featureSet: TechPreviewNoUpgrade <3>
+      featureSet: TechPreviewNoUpgrade
 ----
-<1> Specifies your hosted cluster name.
-<2> Specifies your hosted cluster namespace.
-<3> This feature set is a subset of the current Technology Preview features.
++
+* `metadata.name` specifies your hosted cluster name.
+* `metadata.namespace` specifies your hosted cluster namespace.
+* `spec.configuration.featureGate.featureSet` is a subset of the current Technology Preview features.
 +
 [WARNING]
 ====
-Enabling the `TechPreviewNoUpgrade` feature set on your cluster cannot be undone and prevents minor version updates. This feature set allows you to enable these Technology Preview features on test clusters, where you can fully test them. Do not enable this feature set on production clusters.
+Enabling the `TechPreviewNoUpgrade` feature set on your cluster cannot be undone and prevents minor version updates. With this feature set, you can enable these Technology Preview features on test clusters, where you can fully test them. Do not enable this feature set on production clusters.
 ====
 
 . Save the file to apply the changes.