Skip to content

Commit 3034b76

Browse files
authored
Merge pull request #44135 from mburke5678/winc-fix-name
WINC fix product naming
2 parents 1262939 + 899f5d7 commit 3034b76

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

_attributes/common-attributes.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,5 @@ endif::[]
9999
:MaistraVersion: 2.1
100100
//Service Mesh v1
101101
:SMProductVersion1x: 1.1.17
102+
//Windows containers
103+
:productwinc: Red Hat OpenShift support for Windows Containers

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,9 +1994,9 @@ Name: Windows Container Support for OpenShift
19941994
Dir: windows_containers
19951995
Distros: openshift-origin,openshift-enterprise
19961996
Topics:
1997-
- Name: Windows Container Support for Openshift overview
1997+
- Name: Red Hat OpenShift support for Windows Containers overview
19981998
File: index
1999-
- Name: Windows Container Support for OpenShift release notes
1999+
- Name: Red Hat OpenShift support for Windows Containers release notes
20002000
File: windows-containers-release-notes-5-x
20012001
- Name: Understanding Windows container workloads
20022002
File: understanding-windows-container-workloads

modules/rosa-sdpolicy-platform.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
//
44
// * assemblies/rosa-service-definition.adoc
55

6+
:_content-type: ASSEMBLY
67
[id="rosa-sdpolicy-platform_{context}"]
78
= Platform
9+
:productwinc: Red Hat OpenShift support for Windows Containers
810

911
This section provides information about the service definition for the {product-title} (ROSA) platform.
1012

@@ -84,7 +86,7 @@ See the link:https://docs.openshift.com/rosa/rosa_policy/rosa-life-cycle.html[{p
8486

8587
[id="rosa-sdpolicy-window-containers_{context}"]
8688
== Windows Containers
87-
Windows Containers are not available on {product-title} at this time.
89+
{productwinc} is not available on {product-title} at this time.
8890

8991
[id="rosa-sdpolicy-container-engine_{context}"]
9092
== Container engine

welcome/oke_about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ vulnerabilities and errors protection as {product-title}. {oke} includes a
111111
allows you to use an integrated Linux operating system with container runtime
112112
from the same technology provider.
113113

114-
{oke} is subscription compatible with Windows Containers from Microsoft.
114+
The {oke} subscription is compatible with the {productwinc} subscription.
115115

116116
[[about_oke_enterprise_ready_configurations]]
117117
=== Enterprise-ready configurations

windows_containers/index.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
:_content-type: ASSEMBLY
22
[id="windows-container-overview"]
3-
= Windows Container Support for OpenShift overview
3+
= {productwinc} overview
44
include::_attributes/common-attributes.adoc[]
55
:context: windows-container-overview
66

77
toc::[]
88

9-
Windows Container Support for OpenShift is a feature providing the ability to run Windows compute nodes in an {product-title} cluster. This is possible by using the Red Hat Windows Machine Config Operator (WMCO) to install and manage Windows nodes. With a Red Hat subscription, you can get support for running Windows workloads in {product-title}. For more information, see the xref:../windows_containers/windows-containers-release-notes-5-x.adoc#windows-containers-release-notes-5-x[release notes].
9+
{productwinc} is a feature providing the ability to run Windows compute nodes in an {product-title} cluster. This is possible by using the Red Hat Windows Machine Config Operator (WMCO) to install and manage Windows nodes. With a Red Hat subscription, you can get support for running Windows workloads in {product-title}. For more information, see the xref:../windows_containers/windows-containers-release-notes-5-x.adoc#windows-containers-release-notes-5-x[release notes].
1010

1111
For workloads including both Linux and Windows, {product-title} allows you to deploy Windows workloads running on Windows Server containers while also providing traditional Linux workloads hosted on {op-system-first} or {op-system-base-full}. For more information, see xref:../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[getting started with Windows container workloads].
1212

windows_containers/understanding-windows-container-workloads.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
Windows Container Support for Red Hat OpenShift provides built-in support for running Microsoft Windows Server containers on {product-title}. For those that administer heterogeneous environments with a mix of Linux and Windows workloads, {product-title} allows you to deploy Windows workloads running on Windows Server containers while also providing traditional Linux workloads hosted on {op-system-first} or {op-system-base-full}.
9+
{productwinc} provides built-in support for running Microsoft Windows Server containers on {product-title}. For those that administer heterogeneous environments with a mix of Linux and Windows workloads, {product-title} allows you to deploy Windows workloads running on Windows Server containers while also providing traditional Linux workloads hosted on {op-system-first} or {op-system-base-full}.
1010

1111
[NOTE]
1212
====

windows_containers/windows-containers-release-notes-5-x.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Windows Container Support for Red Hat OpenShift is provided and available as an
2323

2424
You must have this separate subscription to receive support for Windows Container Support for Red Hat OpenShift. Without this additional Red Hat subscription, deploying Windows container workloads in production clusters is not supported. You can request support through the link:http://access.redhat.com/[Red Hat Customer Portal].
2525

26-
For more information, see the Red Hat OpenShift Container Platform Life Cycle Policy document for link:https://access.redhat.com/support/policy/updates/openshift#windows[Red Hat OpenShift support for Windows Containers].
26+
For more information, see the Red Hat OpenShift Container Platform Life Cycle Policy document for link:https://access.redhat.com/support/policy/updates/openshift#windows[{productwinc}].
2727

2828
If you do not have this additional Red Hat subscription, you can use the Community Windows Machine Config Operator, a distribution that lacks official support.
2929
endif::openshift-origin[]

0 commit comments

Comments
 (0)