openshift · jab-rh · Oct 15, 2024 · Oct 8, 2024
diff --git a/modules/ossm-release-2-3-12.adoc b/modules/ossm-release-2-3-12.adoc
@@ -13,7 +13,7 @@ Module included in the following assemblies:
 *Result* – If changed, describe the current user experience
 ////
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.5.2, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 The most current version of the {SMProductName} Operator can be used with all supported versions of {SMProductShortName}. The version of {SMProductShortName} is specified using the `ServiceMeshControlPlane` resource.
 

diff --git a/modules/ossm-release-2-4-10.adoc b/modules/ossm-release-2-4-10.adoc
@@ -7,7 +7,7 @@ Module included in the following assemblies:
 [id="ossm-release-2-4-10_{context}"]
 = {SMProductName} version 2.4.10
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.6.1, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.14 and later.
 
 [id=ossm-release-2-4-10-components_{context}]
 == Component updates

diff --git a/modules/ossm-release-2-4-8.adoc b/modules/ossm-release-2-4-8.adoc
@@ -11,7 +11,7 @@ Module included in the following assemblies:
 //As of May 8, there are no new features so the phrase "new features" has been removed. This is a z-stream release to update containers before they are Grade B or C on May 28.
 //Includes 2.5.2, 2.4.8, 2.3.12
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.5.2, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 The most current version of the {SMProductName} Operator can be used with all supported versions of {SMProductShortName}. The version of {SMProductShortName} is specified using the `ServiceMeshControlPlane`.
 

diff --git a/modules/ossm-release-2-4-9.adoc b/modules/ossm-release-2-4-9.adoc
@@ -7,7 +7,7 @@ Module included in the following assemblies:
 [id="ossm-release-2-4-9_{context}"]
 = {SMProductName} version 2.4.9
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.6.0, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.12 and later.
 
 [id="ossm-release-2-4-9-components_{context}"]
 == Component updates

diff --git a/modules/ossm-release-2-5-2.adoc b/modules/ossm-release-2-5-2.adoc
@@ -13,9 +13,8 @@ Module included in the following assemblies:
 *Result* – If changed, describe the current user experience
 ////
 
-This release of {SMProductName} includes versions 2.4.8 and 2.3.12, addresses Common Vulnerabilities and Exposures (CVEs), and contains bug fixes.
-
-This release is supported on {product-title} 4.12 and later.
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.5.2, and includes the following `ServiceMeshControlPlane` resource version updates: 2.5.2, 2.4.8 and 2.3.12.
+This release addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 [id="ossm-component-updates-2-5-2-only_{context}"]
 == Component updates

diff --git a/modules/ossm-release-2-5-3.adoc b/modules/ossm-release-2-5-3.adoc
@@ -7,7 +7,7 @@ Module included in the following assemblies:
 [id="ossm-release-2-5-3_{context}"]
 = {SMProductName} version 2.5.3
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.6.0, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.12 and later.
 
 [id=ossm-release-2-5-3-components_{context}]
 == Component updates

diff --git a/modules/ossm-release-2-5-4.adoc b/modules/ossm-release-2-5-4.adoc
@@ -7,7 +7,7 @@ Module included in the following assemblies:
 [id="ossm-release-2-5-4_{context}"]
 = {SMProductName} version 2.5.4
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.6.1, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.14 and later.
 
 [id=ossm-release-2-5-4-components_{context}]
 == Component updates

diff --git a/modules/ossm-release-2-6-0.adoc b/modules/ossm-release-2-6-0.adoc
@@ -13,7 +13,8 @@ Module included in the following assemblies:
 *Result* – If changed, describe the current user experience
 ////
 
-This release of {SMProductName} includes versions 2.5.3 and 2.4.9, adds new features, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.14 and later.
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.6.0, and includes the following `ServiceMeshControlPlane` resource version updates: 2.6.0, 2.5.3 and 2.4.9.
+This release adds new features, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.14 and later.
 
 This release ends maintenance support for {SMProductName} version 2.3. If you are using {SMProductShortName} version 2.3, you should update to a supported version.
 

diff --git a/modules/ossm-release-2-6-1.adoc b/modules/ossm-release-2-6-1.adoc
@@ -7,7 +7,8 @@ Module included in the following assemblies:
 [id="ossm-release-2-6-1_{context}"]
 = {SMProductName} version 2.6.1
 
-This release of {SMProductName} includes 2.6.1, 2.5.4, and 2.4.10; addresses Common Vulnerabilities and Exposures (CVEs); contains a bug fix; and is supported on {product-title} 4.14 and later.
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.6.1, and includes the following `ServiceMeshControlPlane` resource version updates: 2.6.1, 2.5.4 and 2.4.10.
+This release addresses Common Vulnerabilities and Exposures (CVEs), contains a bug fix, and is supported on {product-title} 4.14 and later.
 
 The most current version of the {KialiProduct} can be used with all supported versions of {SMProductName}. The version of {SMProductShortName} is specified by using the `ServiceMeshControlPlane` resource.  The version of {SMProductShortName} automatically ensures a compatible version of Kiali.
 

diff --git a/modules/ossm-rn-new-features.adoc b/modules/ossm-rn-new-features.adoc
@@ -23,7 +23,9 @@ These previous releases added features and improvements.
 //As of March 28, 2024, there are no new features so the phrase "new features" has been removed. This release is to address container grades and Bug fixes.
 //Includes 2.5.1, 2.4.7, 2.3.11
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.5.1, and includes the following `ServiceMeshControlPlane` resource version updates: 2.5.1, 2.4.7 and 2.3.11.
+
+This release addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 === Component versions for {SMProductName} version 2.5.1
 
@@ -49,7 +51,9 @@ This release of {SMProductName} addresses Common Vulnerabilities and Exposures (
 [id="new-features-ossm-2-5"]
 == New features {SMProductName} version 2.5
 
-This release of {SMProductName} adds new features, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.5.0, and includes the following `ServiceMeshControlPlane` resource version updates: 2.5.0, 2.4.6 and 2.3.10.
+
+This release adds new features, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 This release ends maintenance support for OpenShift {SMProductShortName} version 2.2. If you are using OpenShift {SMProductShortName} version 2.2, you should update to a supported version.
 
@@ -158,7 +162,7 @@ A new version of the Gateway API custom resource definition (CRD) is now availab
 //2.5.1, 2.4.7, 2.3.11
 //As of March 28, 2024, there are no new features so the phrase "new features" has been removed. This release is to address container grades, and at bug fixes.
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.5.1, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 === Component versions for {SMProductName} version 2.4.7
 
@@ -183,7 +187,7 @@ This release of {SMProductName} addresses Common Vulnerabilities and Exposures (
 [id="new-features-ossm-2-4-6"]
 == New features {SMProductName} version 2.4.6
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.5.0, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 === Component versions for {SMProductName} version 2.4.6
 |===
@@ -201,7 +205,9 @@ This release of {SMProductName} addresses Common Vulnerabilities and Exposures (
 
 == New features {SMProductName} version 2.4.5
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.11 and later versions.
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.4.5, and includes the following `ServiceMeshControlPlane` resource version updates: 2.4.5, 2.3.9 and 2.2.12.
+
+This release addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.11 and later.
 
 === Component versions included in {SMProductName} version 2.4.5
 //Component table updated for 2.4.5, 2.3.9, and 2.2.12
@@ -482,7 +488,7 @@ endif::openshift-rosa,openshift-dedicated[]
 //2.5.1, 2.4.7, 2.3.11
 //As of March 28, 2024, there are no new features so the phrase "new features" has been removed.
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.5.1, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 === Component versions for {SMProductName} version 2.3.11
 
@@ -508,7 +514,7 @@ This release of {SMProductName} addresses Common Vulnerabilities and Exposures (
 == New features {SMProductName} version 2.3.10
 //Update with 2.5
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.5.0, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
 
 === Component versions for {SMProductName} version 2.3.10
 |===
@@ -527,7 +533,7 @@ This release of {SMProductName} addresses Common Vulnerabilities and Exposures (
 == New features {SMProductName} version 2.3.9
 //Update with 2.4.5
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.11 and later versions.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.4.5, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.11 and later.
 
 === Component versions included in {SMProductName} version 2.3.9
 //Updated with 2.4.5
@@ -836,7 +842,7 @@ Additionally, the SMMR must also be configured for cluster-wide deployment. This
 
 == New features {SMProductName} version 2.2.12
 
-This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.11 and later versions.
+This release of {SMProductName} is included with the {SMProductName} Operator 2.4.5, addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.11 and later.
 
 === Component versions included in {SMProductName} version 2.2.12
 //2.2.12 released with 2.4.5