[enterprise-4.17] OSDOCS-16696: updates j-n for content-type

[JoeAldinger]

xref: #101327
cherrypick: b60d742

Version(s):
4.14+

Issue:
https://issues.redhat.com/browse/OSDOCS-16696

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

[openshift-ci-robot]

@JoeAldinger: This pull request references OSDOCS-16696 which is a valid jira issue.

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@JoeAldinger: This pull request references OSDOCS-16696 which is a valid jira issue.

In response to this:

xref: #101327
cherrypick: b60d742

Version(s):
4.14+

Issue:

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@JoeAldinger: This pull request references OSDOCS-16696 which is a valid jira issue.

In response to this:

xref: #101327
cherrypick: b60d742

Version(s):
4.14+

Issue:
https://issues.redhat.com/browse/OSDOCS-16696

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

[ocpdocs-previewbot]

🤖 Thu Oct 30 15:37:23 - Prow CI generated the docs preview:
https://101436--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

[openshift-ci]

@JoeAldinger: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

[JoeAldinger]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@JoeAldinger: new pull request created: #101453

In response to this:

/cherrypick enterprise-4.16

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-sigs/prow repository.

[JoeAldinger]

/cherrypick enterprise-4.15

[JoeAldinger]

/cherrypick enterprise-4.14

[openshift-cherrypick-robot]

@JoeAldinger: #101436 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-16696: updates j-n for content-type
Using index info to reconstruct a base tree...
M	modules/ldap-syncing-spec.adoc
A	modules/machine-config-daemon-metrics-understanding.adoc
M	modules/machine-config-operator.adoc
M	modules/machineset-vsphere-required-permissions.adoc
M	modules/machineset-yaml-osp-sr-iov-port-security.adoc
M	modules/machineset-yaml-osp-sr-iov.adoc
M	modules/master-node-sizing.adoc
M	modules/minimum-required-permissions-upi-gcp.adoc
M	modules/node-tuning-operator-supported-tuned-daemon-plug-ins.adoc
M	modules/nodes-containers-events-list.adoc
M	modules/nw-egressnetworkpolicy-object.adoc
M	modules/nw-high-performance-multicast.adoc
M	modules/nw-metallb-infra-considerations.adoc
M	modules/nw-metallb-metrics.adoc
M	modules/nw-ne-openshift-ingress.adoc
M	modules/nw-network-config.adoc
M	modules/nw-networkpolicy-optimize-ovn.adoc
A	modules/nw-ovn-k-anp-troubeshooting.adoc
M	modules/nw-ovn-k-baseline-adminnetwork-policy.adoc
M	modules/nw-sriov-network-object.adoc
M	modules/nw-sriov-supported-devices.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-supported-devices.adoc
Auto-merging modules/nw-sriov-network-object.adoc
Auto-merging modules/nw-ovn-k-baseline-adminnetwork-policy.adoc
CONFLICT (modify/delete): modules/nw-ovn-k-anp-troubeshooting.adoc deleted in HEAD and modified in OSDOCS-16696: updates j-n for content-type. Version OSDOCS-16696: updates j-n for content-type of modules/nw-ovn-k-anp-troubeshooting.adoc left in tree.
Auto-merging modules/nw-networkpolicy-optimize-ovn.adoc
Auto-merging modules/nw-network-config.adoc
Auto-merging modules/nw-ne-openshift-ingress.adoc
Auto-merging modules/nw-metallb-metrics.adoc
Auto-merging modules/nw-metallb-infra-considerations.adoc
Auto-merging modules/nw-high-performance-multicast.adoc
Auto-merging modules/nw-egressnetworkpolicy-object.adoc
Auto-merging modules/nodes-containers-events-list.adoc
Auto-merging modules/node-tuning-operator-supported-tuned-daemon-plug-ins.adoc
Auto-merging modules/minimum-required-permissions-upi-gcp.adoc
Auto-merging modules/master-node-sizing.adoc
Auto-merging modules/machineset-yaml-osp-sr-iov.adoc
Auto-merging modules/machineset-yaml-osp-sr-iov-port-security.adoc
Auto-merging modules/machineset-vsphere-required-permissions.adoc
Auto-merging modules/machine-config-operator.adoc
Auto-merging modules/machine-config-daemon-metrics.adoc
CONFLICT (content): Merge conflict in modules/machine-config-daemon-metrics.adoc
Auto-merging modules/ldap-syncing-spec.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-16696: updates j-n for content-type

In response to this:

/cherrypick enterprise-4.15

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-sigs/prow repository.

[openshift-cherrypick-robot]

@JoeAldinger: #101436 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-16696: updates j-n for content-type
Using index info to reconstruct a base tree...
M	modules/ldap-syncing-spec.adoc
M	modules/logging-into-a-cluster-after-installation.adoc
A	modules/machine-config-daemon-metrics-understanding.adoc
M	modules/machine-config-operator.adoc
M	modules/machineset-azure-accelerated-networking.adoc
M	modules/machineset-dedicated-instances.adoc
M	modules/machineset-vsphere-required-permissions.adoc
M	modules/machineset-yaml-osp-sr-iov-port-security.adoc
M	modules/machineset-yaml-osp-sr-iov.adoc
M	modules/master-node-sizing.adoc
M	modules/minimum-required-permissions-upi-gcp.adoc
M	modules/node-tuning-operator-supported-tuned-daemon-plug-ins.adoc
M	modules/nodes-containers-events-list.adoc
M	modules/nodes-pods-using-example.adoc
M	modules/nodes-scheduler-node-affinity-example.adoc
M	modules/nodes-scheduler-pod-affinity-example.adoc
M	modules/nw-egressnetworkpolicy-object.adoc
M	modules/nw-high-performance-multicast.adoc
M	modules/nw-metallb-infra-considerations.adoc
M	modules/nw-metallb-metrics.adoc
M	modules/nw-ne-openshift-ingress.adoc
M	modules/nw-network-config.adoc
M	modules/nw-networkpolicy-optimize-ovn.adoc
A	modules/nw-ovn-k-anp-troubeshooting.adoc
M	modules/nw-ovn-k-baseline-adminnetwork-policy.adoc
M	modules/nw-sriov-network-object.adoc
M	modules/nw-sriov-supported-devices.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-supported-devices.adoc
Auto-merging modules/nw-sriov-network-object.adoc
Auto-merging modules/nw-ovn-k-baseline-adminnetwork-policy.adoc
CONFLICT (modify/delete): modules/nw-ovn-k-anp-troubeshooting.adoc deleted in HEAD and modified in OSDOCS-16696: updates j-n for content-type. Version OSDOCS-16696: updates j-n for content-type of modules/nw-ovn-k-anp-troubeshooting.adoc left in tree.
Auto-merging modules/nw-networkpolicy-optimize-ovn.adoc
Auto-merging modules/nw-network-config.adoc
Auto-merging modules/nw-ne-openshift-ingress.adoc
Auto-merging modules/nw-metallb-metrics.adoc
Auto-merging modules/nw-metallb-infra-considerations.adoc
Auto-merging modules/nw-high-performance-multicast.adoc
Auto-merging modules/nw-egressnetworkpolicy-object.adoc
Auto-merging modules/nodes-scheduler-pod-affinity-example.adoc
Auto-merging modules/nodes-scheduler-node-affinity-example.adoc
Auto-merging modules/nodes-pods-using-example.adoc
Auto-merging modules/nodes-containers-events-list.adoc
Auto-merging modules/node-tuning-operator-supported-tuned-daemon-plug-ins.adoc
Auto-merging modules/minimum-required-permissions-upi-gcp.adoc
Auto-merging modules/master-node-sizing.adoc
Auto-merging modules/machineset-yaml-osp-sr-iov.adoc
Auto-merging modules/machineset-yaml-osp-sr-iov-port-security.adoc
Auto-merging modules/machineset-vsphere-required-permissions.adoc
Auto-merging modules/machineset-dedicated-instances.adoc
Auto-merging modules/machineset-azure-accelerated-networking.adoc
Auto-merging modules/machine-config-operator.adoc
Auto-merging modules/machine-config-daemon-metrics.adoc
CONFLICT (content): Merge conflict in modules/machine-config-daemon-metrics.adoc
Auto-merging modules/logging-into-a-cluster-after-installation.adoc
Auto-merging modules/ldap-syncing-spec.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-16696: updates j-n for content-type

In response to this:

/cherrypick enterprise-4.14

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-sigs/prow repository.