[enterprise-4.12] Renames variants of the OpenShift internal image registry to OpenShif…

[stevsmit]

xref: #58485

CP from: af9abc5

[ocpdocs-previewbot]

🤖 Build preview is available at:
https://58857--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/14284

[stevsmit]

/cherry-pick enterprise-4.11

[openshift-cherrypick-robot]

@stevsmit: #58857 failed to apply on top of branch "enterprise-4.11":

Applying: Renames variants of the OpenShift internal image registry to OpenShift image registry
.git/rebase-apply/patch:2921: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	_attributes/attributes-microshift.adoc
M	_attributes/common-attributes.adoc
M	modules/cluster-samples-operator.adoc
M	modules/installation-about-restricted-network.adoc
M	modules/oc-by-example-content.adoc
M	modules/openshift-architecture-common-terms.adoc
M	modules/registry-common-terms.adoc
M	modules/registry-exposing-default-registry-manually.adoc
M	modules/registry-exposing-secure-registry-manually.adoc
M	modules/registry-integrated-openshift-registry.adoc
M	modules/registry-third-party-registries.adoc
M	modules/rosa-sts-account-wide-roles-and-policies.adoc
M	modules/rosa-sts-operator-roles.adoc
M	post_installation_configuration/cluster-tasks.adoc
M	registry/configuring-registry-operator.adoc
M	rest_api/config_apis/image-config-openshift-io-v1.adoc
M	rest_api/workloads_apis/build-build-openshift-io-v1.adoc
M	rest_api/workloads_apis/buildconfig-build-openshift-io-v1.adoc
Falling back to patching base and 3-way merge...
Auto-merging rest_api/workloads_apis/buildconfig-build-openshift-io-v1.adoc
CONFLICT (content): Merge conflict in rest_api/workloads_apis/buildconfig-build-openshift-io-v1.adoc
Auto-merging rest_api/workloads_apis/build-build-openshift-io-v1.adoc
CONFLICT (content): Merge conflict in rest_api/workloads_apis/build-build-openshift-io-v1.adoc
Auto-merging rest_api/config_apis/image-config-openshift-io-v1.adoc
CONFLICT (content): Merge conflict in rest_api/config_apis/image-config-openshift-io-v1.adoc
Auto-merging registry/configuring-registry-operator.adoc
Auto-merging post_installation_configuration/cluster-tasks.adoc
Auto-merging modules/rosa-sts-operator-roles.adoc
Auto-merging modules/rosa-sts-account-wide-roles-and-policies.adoc
Auto-merging modules/registry-third-party-registries.adoc
Auto-merging modules/registry-integrated-openshift-registry.adoc
CONFLICT (content): Merge conflict in modules/registry-integrated-openshift-registry.adoc
Auto-merging modules/registry-exposing-secure-registry-manually.adoc
Auto-merging modules/registry-exposing-default-registry-manually.adoc
Auto-merging modules/registry-common-terms.adoc
CONFLICT (content): Merge conflict in modules/registry-common-terms.adoc
Auto-merging modules/openshift-architecture-common-terms.adoc
Auto-merging modules/oc-by-example-content.adoc
CONFLICT (content): Merge conflict in modules/oc-by-example-content.adoc
Auto-merging modules/installation-about-restricted-network.adoc
Auto-merging modules/cluster-samples-operator.adoc
Auto-merging _attributes/common-attributes.adoc
CONFLICT (modify/delete): _attributes/attributes-microshift.adoc deleted in HEAD and modified in Renames variants of the OpenShift internal image registry to OpenShift image registry. Version Renames variants of the OpenShift internal image registry to OpenShift image registry of _attributes/attributes-microshift.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Renames variants of the OpenShift internal image registry to OpenShift image registry
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick enterprise-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.