Merge pull request #35047 from kalexand-rh/OCP

fixing OCP and OpenShift Container Platform references

Author: kalexand-rh

cicd/gitops/gitops-release-notes.adoc

@@ -11,7 +11,7 @@ toc::[]
 
 * Ensure that the clusters have similar states for configuration, monitoring, and storage
 * Recover or recreate clusters from a known state
-* Apply or revert configuration changes to multiple OpenShift Container Platform clusters
+* Apply or revert configuration changes to multiple {product-title} clusters
 * Associate templated configuration with different environments
 * Promote applications across clusters, from staging to production
 

cli_reference/developer_cli_odo/creating_and_deploying_applications_with_odo/sample-applications.adoc

@@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-`{odo-title}` offers partial compatibility with any language or runtime listed within the OpenShift catalog of component types. For example:
+`{odo-title}` offers partial compatibility with any language or runtime listed within the {product-title} catalog of component types. For example:
 
 [source,terminal]
 ----

installing/installing_vsphere/preparing-to-install-on-vsphere.adoc

@@ -20,7 +20,7 @@ xref:../../installing/install_config/configuring-firewall.adoc#configuring-firew
 [id="choosing-a-method-to-install-ocp-on-vsphere"]
 == Choosing a method to install {product-title} on vSphere
 
-You can install {product-title} on vSphere by using installer-provisioned or user-provisioned infrastructure. The default installation type uses installer-provisioned infrastructure, where the installation program provisions the underlying infrastructure for the cluster. You can also install OpenShift Container Platform on infrastructure that you provide. If you do not use infrastructure that the installation program provisions, you must manage and maintain the cluster resources yourself.
+You can install {product-title} on vSphere by using installer-provisioned or user-provisioned infrastructure. The default installation type uses installer-provisioned infrastructure, where the installation program provisions the underlying infrastructure for the cluster. You can also install {product-title} on infrastructure that you provide. If you do not use infrastructure that the installation program provisions, you must manage and maintain the cluster resources yourself.
 
 See the xref:../../architecture/architecture-installation.html#installation-process_architecture-installation[Installation process] for more information about installer-provisioned and user-provisioned installation processes.
 
@@ -38,7 +38,7 @@ Installer-provisioned infrastructure allows the installation program to pre-conf
 
 * **xref:../../installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[Installing a cluster on vSphere with customizations]**: You can install {product-title} on vSphere by using installer-provisioned infrastructure installation with the default customization options.
 
-* **xref:../../installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[Installing a cluster on vSphere with network customizations]**: You can install {product-title} on installer-provisioned vSphere infrastructure, with network customizations. You can customize your OpenShift Container Platform network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements.
+* **xref:../../installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[Installing a cluster on vSphere with network customizations]**: You can install {product-title} on installer-provisioned vSphere infrastructure, with network customizations. You can customize your {product-title} network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements.
 
 * **xref:../../installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[Installing a cluster on vSphere in a restricted network]**: You can install a cluster on VMware vSphere infrastructure in a restricted network by creating an internal mirror of the installation release content.
  You can use this method to deploy {product-title} on an internal network that is not visible to the Internet.

jaeger/jaeger_install/rhbjaeger-installation.adoc

@@ -25,7 +25,7 @@ Before you can install {ProductName}, review the installation activities, and en
 ** xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[Install {product-title} {product-version} on user-provisioned AWS]
 ** xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Install {product-title} {product-version} on bare metal]
 ** xref:../../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[Install {product-title} {product-version} on vSphere]
-* Install the version of the {product-title} command line utility (the `oc` client tool) that matches your {product-title} version and add it to your path.
+* Install the version of the OpenShift CLI (`oc`) that matches your {product-title} version and add it to your path.
 
 * An account with the `cluster-admin` role.
 

modules/about-gitops.adoc

@@ -5,7 +5,7 @@
 [id="about-gitops_{context}"]
 = About GitOps
 
-GitOps is a declarative way to implement continuous deployment for cloud native applications. You can use GitOps to create repeatable processes for managing OpenShift Container Platform clusters and applications across multi-cluster Kubernetes environments. GitOps handles and automates complex deployments at a fast pace, saving time during deployment and release cycles.
+GitOps is a declarative way to implement continuous deployment for cloud native applications. You can use GitOps to create repeatable processes for managing {product-title} clusters and applications across multi-cluster Kubernetes environments. GitOps handles and automates complex deployments at a fast pace, saving time during deployment and release cycles.
 
 The GitOps workflow pushes an application through development, testing, staging, and production. GitOps either deploys a new application or updates an existing one, so you only need to update the repository; GitOps automates everything else.
 

modules/about-redhat-openshift-gitops.adoc

@@ -14,15 +14,14 @@ These repositories contain a declarative description of the infrastructure you n
 
 {gitops-title} uses Argo CD to maintain cluster resources. Argo CD is an open-source declarative tool for the continuous integration and continuous deployment (CI/CD) of applications. {gitops-title} implements Argo CD as a controller so that it continuously monitors application definitions and configurations defined in a Git repository. Then, Argo CD compares the specified state of these configurations with their live state on the cluster.
 
-Argo CD reports any configurations that deviate from their specified state. These reports allow administrators to automatically or manually resync configurations to the defined state. Therefore, Argo CD enables you to deliver global custom resources, like the resources that are used to configure OpenShift Container Platform clusters.
+Argo CD reports any configurations that deviate from their specified state. These reports allow administrators to automatically or manually resync configurations to the defined state. Therefore, Argo CD enables you to deliver global custom resources, like the resources that are used to configure {product-title} clusters.
 
 [id="key-features_{context}"]
 == Key features
 
 {gitops-title} helps you automate the following tasks:
 
 * Ensure that the clusters have similar states for configuration, monitoring, and storage
-* Recover or recreate clusters from a known state
-* Apply or revert configuration changes to multiple OpenShift Container Platform clusters
+* Apply or revert configuration changes to multiple {product-title} clusters
 * Associate templated configuration with different environments
 * Promote applications across clusters, from staging to production

modules/architecture-machine-roles.adoc

@@ -73,7 +73,7 @@ The OpenShift API server is managed by the OpenShift API Server Operator.
 
 The OpenShift controller manager is managed by the OpenShift Controller Manager Operator.
 |OpenShift OAuth API server
-|The OpenShift OAuth API server validates and configures the data to authenticate to OpenShift Container Platform, such as users, groups, and OAuth tokens.
+|The OpenShift OAuth API server validates and configures the data to authenticate to {product-title}, such as users, groups, and OAuth tokens.
 
 The OpenShift OAuth API server is managed by the Cluster Authentication Operator.
 |OpenShift OAuth server

modules/auth-allowing-javascript-access-api-server.adoc

@@ -5,7 +5,7 @@
 [id="auth-allowing-javascript-access-api-server_{context}"]
 = Allowing JavaScript-based access to the API server from additional hosts
 
-The default {product-title} configuration only allows the OpenShift web console to send requests to the API server.
+The default {product-title} configuration only allows the web console to send requests to the API server.
 
 If you need to access the API server or OAuth server from a JavaScript
 application using a different host name, you can configure additional host names

modules/cluster-logging-release-notes-5.0.0.adoc

@@ -80,9 +80,9 @@ In the table below, features are marked with the following statuses:
 * *-*: _Not Available_
 
 .Technology Preview tracker
-[cols="4,1,1,1",options="header"]
+[cols="1,1,1,1",options="header"]
 |====
-|Feature |OCP 4.5 |OCP 4.6 |Logging 5.0
+|Feature |{product-title} 4.5 |{product-title} 4.6 |Logging 5.0
 
 |Log forwarding
 |TP

modules/cluster-logging-release-notes-5.1.0.adoc

@@ -38,7 +38,7 @@ Deprecated functionality is still included in OpenShift Logging and continues to
 [id="openshift-logging-5-1-0-elasticsearch-curator"]
 === Elasticsearch Curator has been removed
 
-With this update, the Elasticsearch Curator has been removed and is no longer supported. Elasticsearch Curator helped you curate or manage your indices on OpenShift Container Platform 4.4 and earlier. Instead of using Elasticsearch Curator, configure the log retention time.
+With this update, the Elasticsearch Curator has been removed and is no longer supported. Elasticsearch Curator helped you curate or manage your indices on {product-title} 4.4 and earlier. Instead of using Elasticsearch Curator, configure the log retention time.
 
 [id="openshift-logging-5-1-0-bug-fixes"]
 == Bug fixes