OSDOCS#17381: Doc sweep to add blank lines after headings in modules #102736

bergerhoffer · 2025-11-18T22:49:43Z

Version(s):
4.16+

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

Link to docs preview:
N/A

QE review:
N/A

Additional information:

ocpdocs-previewbot · 2025-11-18T23:05:36Z

🤖 Wed Nov 19 18:27:55 - Prow CI generated the docs preview:
https://102736--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

modules/update-oc-adm-upgrade-status.adoc

skopacz1

Caught a few more files that seemed to have been caught in the sweep when they should probably stay as is

modules/nw-multus-configure-dualstack-ip-address.adoc

modules/secrets-store-vault.adoc

openshift-ci · 2025-11-19T18:33:47Z

@bergerhoffer: 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.

bergerhoffer · 2025-11-20T17:02:43Z

/cherrypick enterprise-4.21

bergerhoffer · 2025-11-20T17:02:47Z

/cherrypick enterprise-4.20

openshift-cherrypick-robot · 2025-11-20T17:03:40Z

@bergerhoffer: new pull request created: #102817

In response to this:

/cherrypick enterprise-4.20

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 · 2025-11-20T17:03:45Z

@bergerhoffer: new pull request created: #102818

In response to this:

/cherrypick enterprise-4.21

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.

bergerhoffer · 2025-11-20T17:09:04Z

/cherrypick enterprise-4.19

bergerhoffer · 2025-11-20T17:09:07Z

/cherrypick enterprise-4.18

bergerhoffer · 2025-11-20T17:09:11Z

/cherrypick enterprise-4.17

bergerhoffer · 2025-11-20T17:09:15Z

/cherrypick enterprise-4.16

openshift-cherrypick-robot · 2025-11-20T17:09:52Z

@bergerhoffer: #102736 failed to apply on top of branch "enterprise-4.19":

Applying: OSDOCS#17381: Doc sweep to add blank lines after headings in modules
Using index info to reconstruct a base tree...
M	modules/configuring-vsphere-regions-zones.adoc
A	modules/installation-aws-marketplace-government.adoc
M	modules/installation-aws-regions-with-no-ami.adoc
M	modules/installation-ibm-cloud-regions.adoc
M	modules/installation-user-infra-machines-pxe.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc
A	modules/learning-getting-idp-creating.adoc
A	modules/learning-getting-started-accessing-hcm.adoc
A	modules/learning-getting-started-admin-cli.adoc
A	modules/learning-getting-started-cluster-status.adoc
A	modules/learning-getting-started-upgrading-recurring-updates.adoc
M	modules/manually-create-identity-access-management.adoc
M	modules/node-tuning-operator.adoc
M	modules/nodes-descheduler-profiles.adoc
M	modules/olm-architecture.adoc
M	modules/olm-overriding-operator-pod-affinity.adoc
M	modules/understanding-agent-install.adoc
A	modules/update-oc-adm-upgrade-status.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/update-oc-adm-upgrade-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/update-oc-adm-upgrade-status.adoc left in tree.
Auto-merging modules/understanding-agent-install.adoc
Auto-merging modules/olm-overriding-operator-pod-affinity.adoc
Auto-merging modules/olm-architecture.adoc
Auto-merging modules/nodes-descheduler-profiles.adoc
Auto-merging modules/node-tuning-operator.adoc
Auto-merging modules/manually-create-identity-access-management.adoc
CONFLICT (modify/delete): modules/learning-getting-started-upgrading-recurring-updates.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-upgrading-recurring-updates.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-cluster-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-cluster-status.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-admin-cli.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-admin-cli.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-accessing-hcm.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-accessing-hcm.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc left in tree.
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-ibm-cloud-regions.adoc
Auto-merging modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (modify/delete): modules/installation-aws-marketplace-government.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/installation-aws-marketplace-government.adoc left in tree.
Auto-merging modules/configuring-vsphere-regions-zones.adoc
Auto-merging cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.adoc
CONFLICT (content): Merge conflict in cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.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#17381: Doc sweep to add blank lines after headings in modules

In response to this:

/cherrypick enterprise-4.19

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 · 2025-11-20T17:09:56Z

@bergerhoffer: #102736 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS#17381: Doc sweep to add blank lines after headings in modules
Using index info to reconstruct a base tree...
M	modules/configuring-machine-pool-disk-volume-ocm.adoc
M	modules/configuring-vsphere-regions-zones.adoc
M	modules/containers-signature-verify-enable.adoc
M	modules/creating-a-machine-pool-ocm.adoc
M	modules/deleting-machine-pools-cli.adoc
M	modules/deleting-machine-pools-ocm.adoc
M	modules/hcp-bm-ingress.adoc
A	modules/installation-aws-marketplace-government.adoc
M	modules/installation-aws-regions-with-no-ami.adoc
M	modules/installation-ibm-cloud-regions.adoc
M	modules/installation-user-infra-machines-pxe.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc
A	modules/learning-getting-idp-creating.adoc
A	modules/learning-getting-started-accessing-hcm.adoc
A	modules/learning-getting-started-admin-cli.adoc
A	modules/learning-getting-started-cluster-status.adoc
A	modules/learning-getting-started-upgrading-recurring-updates.adoc
M	modules/managed-resources.adoc
M	modules/manually-create-identity-access-management.adoc
M	modules/node-tuning-operator.adoc
M	modules/nodes-descheduler-profiles.adoc
M	modules/nvidia-gpu-csps.adoc
M	modules/nw-multus-configure-dualstack-ip-address.adoc
M	modules/olm-architecture.adoc
M	modules/olm-overriding-operator-pod-affinity.adoc
M	modules/olm-overview.adoc
M	modules/running-network-verification-manually-ocm.adoc
M	modules/understanding-agent-install.adoc
A	modules/update-oc-adm-upgrade-status.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/update-oc-adm-upgrade-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/update-oc-adm-upgrade-status.adoc left in tree.
Auto-merging modules/understanding-agent-install.adoc
Auto-merging modules/running-network-verification-manually-ocm.adoc
Auto-merging modules/olm-overview.adoc
Auto-merging modules/olm-overriding-operator-pod-affinity.adoc
Auto-merging modules/olm-architecture.adoc
Auto-merging modules/nw-multus-configure-dualstack-ip-address.adoc
Auto-merging modules/nvidia-gpu-csps.adoc
CONFLICT (content): Merge conflict in modules/nvidia-gpu-csps.adoc
Auto-merging modules/nodes-descheduler-profiles.adoc
Auto-merging modules/node-tuning-operator.adoc
Auto-merging modules/manually-create-identity-access-management.adoc
Auto-merging modules/managed-resources.adoc
CONFLICT (modify/delete): modules/learning-getting-started-upgrading-recurring-updates.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-upgrading-recurring-updates.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-cluster-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-cluster-status.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-admin-cli.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-admin-cli.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-accessing-hcm.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-accessing-hcm.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc left in tree.
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-ibm-cloud-regions.adoc
Auto-merging modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (modify/delete): modules/installation-aws-marketplace-government.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/installation-aws-marketplace-government.adoc left in tree.
Auto-merging modules/hcp-bm-ingress.adoc
Auto-merging modules/deleting-machine-pools-ocm.adoc
Auto-merging modules/deleting-machine-pools-cli.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-cli.adoc
Auto-merging modules/creating-a-machine-pool-ocm.adoc
Auto-merging modules/containers-signature-verify-enable.adoc
Auto-merging modules/configuring-vsphere-regions-zones.adoc
Auto-merging modules/configuring-machine-pool-disk-volume-ocm.adoc
Auto-merging cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.adoc
CONFLICT (content): Merge conflict in cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.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#17381: Doc sweep to add blank lines after headings in modules

In response to this:

/cherrypick enterprise-4.18

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 · 2025-11-20T17:10:01Z

@bergerhoffer: #102736 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS#17381: Doc sweep to add blank lines after headings in modules
Using index info to reconstruct a base tree...
M	modules/configuring-machine-pool-disk-volume-ocm.adoc
M	modules/configuring-vsphere-regions-zones.adoc
M	modules/containers-signature-verify-enable.adoc
M	modules/creating-a-machine-pool-ocm.adoc
M	modules/deleting-machine-pools-cli.adoc
M	modules/deleting-machine-pools-ocm.adoc
M	modules/hcp-bm-ingress.adoc
A	modules/hcp-ibm-power-create-heterogeneous-nodepools-agent-hc.adoc
A	modules/installation-aws-marketplace-government.adoc
M	modules/installation-aws-regions-with-no-ami.adoc
M	modules/installation-bare-metal-config-yaml.adoc
M	modules/installation-ibm-cloud-regions.adoc
M	modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live.adoc
M	modules/installation-user-infra-machines-advanced.adoc
M	modules/installation-user-infra-machines-pxe.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc
A	modules/learning-getting-idp-creating.adoc
A	modules/learning-getting-started-accessing-hcm.adoc
A	modules/learning-getting-started-admin-cli.adoc
A	modules/learning-getting-started-cluster-status.adoc
A	modules/learning-getting-started-upgrading-recurring-updates.adoc
A	modules/managed-resources.adoc
M	modules/manually-create-identity-access-management.adoc
M	modules/microshift-ca-adding-bundle-ostree.adoc
M	modules/node-tuning-operator.adoc
M	modules/nodes-descheduler-profiles.adoc
M	modules/nvidia-gpu-csps.adoc
M	modules/nw-multus-configure-dualstack-ip-address.adoc
A	modules/nw-ovn-kubernetes-observability.adoc
M	modules/olm-architecture.adoc
M	modules/olm-overriding-operator-pod-affinity.adoc
M	modules/olm-overview.adoc
A	modules/olmv1-clusteroperator.adoc
A	modules/persistent-storage-csi-gcp-hyperdisk-limitations.adoc
M	modules/registry-configuring-storage-baremetal.adoc
M	modules/running-network-verification-manually-ocm.adoc
M	modules/understanding-agent-install.adoc
A	modules/update-oc-adm-upgrade-status.adoc
Falling back to patching base and 3-way merge...
Auto-merging support/troubleshooting/sd-managed-resources.adoc
CONFLICT (modify/delete): modules/update-oc-adm-upgrade-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/update-oc-adm-upgrade-status.adoc left in tree.
Auto-merging modules/understanding-agent-install.adoc
Auto-merging modules/running-network-verification-manually-ocm.adoc
Auto-merging modules/registry-configuring-storage-baremetal.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-gcp-hyperdisk-limitations.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/persistent-storage-csi-gcp-hyperdisk-limitations.adoc left in tree.
CONFLICT (modify/delete): modules/olmv1-clusteroperator.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/olmv1-clusteroperator.adoc left in tree.
Auto-merging modules/olm-overview.adoc
CONFLICT (content): Merge conflict in modules/olm-overview.adoc
Auto-merging modules/olm-overriding-operator-pod-affinity.adoc
Auto-merging modules/olm-architecture.adoc
CONFLICT (modify/delete): modules/nw-ovn-kubernetes-observability.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/nw-ovn-kubernetes-observability.adoc left in tree.
Auto-merging modules/nw-multus-configure-dualstack-ip-address.adoc
Auto-merging modules/nvidia-gpu-csps.adoc
CONFLICT (content): Merge conflict in modules/nvidia-gpu-csps.adoc
Auto-merging modules/nodes-descheduler-profiles.adoc
Auto-merging modules/node-tuning-operator.adoc
Auto-merging modules/microshift-ca-adding-bundle-ostree.adoc
Auto-merging modules/manually-create-identity-access-management.adoc
CONFLICT (modify/delete): modules/learning-getting-started-upgrading-recurring-updates.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-upgrading-recurring-updates.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-cluster-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-cluster-status.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-admin-cli.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-admin-cli.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-accessing-hcm.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-accessing-hcm.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc left in tree.
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-advanced.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
Auto-merging modules/installation-ibm-cloud-regions.adoc
Auto-merging modules/installation-bare-metal-config-yaml.adoc
Auto-merging modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (modify/delete): modules/installation-aws-marketplace-government.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/installation-aws-marketplace-government.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-ibm-power-create-heterogeneous-nodepools-agent-hc.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/hcp-ibm-power-create-heterogeneous-nodepools-agent-hc.adoc left in tree.
Auto-merging modules/hcp-bm-ingress.adoc
Auto-merging modules/deleting-machine-pools-ocm.adoc
Auto-merging modules/deleting-machine-pools-cli.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-cli.adoc
Auto-merging modules/creating-a-machine-pool-ocm.adoc
Auto-merging modules/containers-signature-verify-enable.adoc
Auto-merging modules/configuring-vsphere-regions-zones.adoc
Auto-merging modules/configuring-machine-pool-disk-volume-ocm.adoc
Auto-merging cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.adoc
CONFLICT (content): Merge conflict in cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.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#17381: Doc sweep to add blank lines after headings in modules

In response to this:

/cherrypick enterprise-4.17

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 · 2025-11-20T17:10:05Z

@bergerhoffer: #102736 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS#17381: Doc sweep to add blank lines after headings in modules
Using index info to reconstruct a base tree...
M	modules/compliance-crd-advanced-compliance-scan.adoc
M	modules/compliance-crd-compliance-suite.adoc
M	modules/configuring-machine-pool-disk-volume-ocm.adoc
M	modules/configuring-vsphere-regions-zones.adoc
M	modules/containers-signature-verify-enable.adoc
M	modules/creating-a-machine-pool-ocm.adoc
M	modules/deleting-machine-pools-cli.adoc
M	modules/deleting-machine-pools-ocm.adoc
A	modules/hcp-bm-ingress.adoc
A	modules/hcp-bm-machine-health-disable.adoc
A	modules/hcp-bm-machine-health.adoc
A	modules/hcp-ibm-power-create-heterogeneous-nodepools-agent-hc.adoc
A	modules/installation-aws-marketplace-government.adoc
M	modules/installation-aws-regions-with-no-ami.adoc
M	modules/installation-azure-marketplace-subscribe.adoc
M	modules/installation-azure-user-infra-uploading-rhcos.adoc
M	modules/installation-bare-metal-config-yaml.adoc
M	modules/installation-ibm-cloud-regions.adoc
M	modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live.adoc
M	modules/installation-user-infra-machines-advanced.adoc
M	modules/installation-user-infra-machines-pxe.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc
A	modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc
A	modules/learning-getting-idp-creating.adoc
A	modules/learning-getting-started-accessing-hcm.adoc
A	modules/learning-getting-started-admin-cli.adoc
A	modules/learning-getting-started-cluster-status.adoc
A	modules/learning-getting-started-upgrading-recurring-updates.adoc
A	modules/managed-resources.adoc
M	modules/manually-create-identity-access-management.adoc
M	modules/microshift-ca-adding-bundle-ostree.adoc
M	modules/node-tuning-operator.adoc
M	modules/nodes-descheduler-profiles.adoc
M	modules/nvidia-gpu-csps.adoc
M	modules/nw-multus-configure-dualstack-ip-address.adoc
M	modules/nw-ovn-k-adminnetwork-policy-action-rules.adoc
A	modules/nw-ovn-kubernetes-observability.adoc
M	modules/olm-architecture.adoc
M	modules/olm-overriding-operator-pod-affinity.adoc
M	modules/olm-overview.adoc
A	modules/olmv1-clusteroperator.adoc
A	modules/persistent-storage-csi-gcp-hyperdisk-limitations.adoc
M	modules/policy-identity-access-management.adoc
A	modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc
M	modules/registry-configuring-storage-baremetal.adoc
M	modules/running-network-verification-manually-ocm.adoc
M	modules/understanding-agent-install.adoc
A	modules/update-oc-adm-upgrade-status.adoc
Falling back to patching base and 3-way merge...
Auto-merging support/troubleshooting/sd-managed-resources.adoc
CONFLICT (modify/delete): modules/update-oc-adm-upgrade-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/update-oc-adm-upgrade-status.adoc left in tree.
Auto-merging modules/understanding-agent-install.adoc
Auto-merging modules/running-network-verification-manually-ocm.adoc
Auto-merging modules/registry-configuring-storage-baremetal.adoc
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc left in tree.
Auto-merging modules/policy-identity-access-management.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-gcp-hyperdisk-limitations.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/persistent-storage-csi-gcp-hyperdisk-limitations.adoc left in tree.
CONFLICT (modify/delete): modules/olmv1-clusteroperator.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/olmv1-clusteroperator.adoc left in tree.
Auto-merging modules/olm-overview.adoc
CONFLICT (content): Merge conflict in modules/olm-overview.adoc
Auto-merging modules/olm-overriding-operator-pod-affinity.adoc
Auto-merging modules/olm-architecture.adoc
CONFLICT (modify/delete): modules/nw-ovn-kubernetes-observability.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/nw-ovn-kubernetes-observability.adoc left in tree.
Auto-merging modules/nw-ovn-k-adminnetwork-policy-action-rules.adoc
Auto-merging modules/nw-multus-configure-dualstack-ip-address.adoc
Auto-merging modules/nvidia-gpu-csps.adoc
CONFLICT (content): Merge conflict in modules/nvidia-gpu-csps.adoc
Auto-merging modules/nodes-descheduler-profiles.adoc
Auto-merging modules/node-tuning-operator.adoc
Auto-merging modules/microshift-ca-adding-bundle-ostree.adoc
Auto-merging modules/manually-create-identity-access-management.adoc
CONFLICT (modify/delete): modules/learning-getting-started-upgrading-recurring-updates.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-upgrading-recurring-updates.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-cluster-status.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-cluster-status.adoc left in tree.
CONFLICT (modify/delete): modules/learning-getting-started-accessing-hcm.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-getting-started-accessing-hcm.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-secrets.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-environment-variables.adoc left in tree.
CONFLICT (modify/delete): modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/learning-deploying-configmaps-secrets-envvar-configmaps.adoc left in tree.
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-advanced.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
Auto-merging modules/installation-ibm-cloud-regions.adoc
Auto-merging modules/installation-bare-metal-config-yaml.adoc
Auto-merging modules/installation-azure-user-infra-uploading-rhcos.adoc
Auto-merging modules/installation-azure-marketplace-subscribe.adoc
Auto-merging modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-regions-with-no-ami.adoc
CONFLICT (modify/delete): modules/installation-aws-marketplace-government.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/installation-aws-marketplace-government.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-ibm-power-create-heterogeneous-nodepools-agent-hc.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/hcp-ibm-power-create-heterogeneous-nodepools-agent-hc.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-bm-machine-health.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/hcp-bm-machine-health.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-bm-machine-health-disable.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/hcp-bm-machine-health-disable.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-bm-ingress.adoc deleted in HEAD and modified in OSDOCS#17381: Doc sweep to add blank lines after headings in modules. Version OSDOCS#17381: Doc sweep to add blank lines after headings in modules of modules/hcp-bm-ingress.adoc left in tree.
Auto-merging modules/deleting-machine-pools-ocm.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-ocm.adoc
Auto-merging modules/deleting-machine-pools-cli.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-cli.adoc
Auto-merging modules/creating-a-machine-pool-ocm.adoc
CONFLICT (content): Merge conflict in modules/creating-a-machine-pool-ocm.adoc
Auto-merging modules/containers-signature-verify-enable.adoc
Auto-merging modules/configuring-vsphere-regions-zones.adoc
CONFLICT (content): Merge conflict in modules/configuring-vsphere-regions-zones.adoc
Auto-merging modules/configuring-machine-pool-disk-volume-ocm.adoc
Auto-merging modules/compliance-crd-compliance-suite.adoc
Auto-merging modules/compliance-crd-advanced-compliance-scan.adoc
Auto-merging cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.adoc
CONFLICT (content): Merge conflict in cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.adoc
Auto-merging cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-admin.adoc
CONFLICT (content): Merge conflict in cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-admin.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#17381: Doc sweep to add blank lines after headings in modules

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.

openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 18, 2025

bergerhoffer added branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 labels Nov 19, 2025

bergerhoffer force-pushed the OSDOCS-17381-headings branch from 7b98af2 to 1fb1d04 Compare November 19, 2025 16:11

skopacz1 reviewed Nov 19, 2025

View reviewed changes

modules/update-oc-adm-upgrade-status.adoc Show resolved Hide resolved

skopacz1 reviewed Nov 19, 2025

View reviewed changes

modules/nw-multus-configure-dualstack-ip-address.adoc Show resolved Hide resolved

modules/secrets-store-vault.adoc Show resolved Hide resolved

OSDOCS#17381: Doc sweep to add blank lines after headings in modules

99f5de3

bergerhoffer force-pushed the OSDOCS-17381-headings branch from 1fb1d04 to 99f5de3 Compare November 19, 2025 18:15

jeana-redhat approved these changes Nov 19, 2025

View reviewed changes

bergerhoffer merged commit b9f5099 into openshift:main Nov 20, 2025
2 checks passed

openshift-cherrypick-robot mentioned this pull request Nov 20, 2025

[enterprise-4.20] OSDOCS#17381: Doc sweep to add blank lines after headings in modules #102817

Merged

openshift-cherrypick-robot mentioned this pull request Nov 20, 2025

[enterprise-4.21] OSDOCS#17381: Doc sweep to add blank lines after headings in modules #102818

Merged

OSDOCS#17381: Doc sweep to add blank lines after headings in modules #102736

OSDOCS#17381: Doc sweep to add blank lines after headings in modules #102736

Uh oh!

Conversation

bergerhoffer commented Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

skopacz1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

openshift-ci bot commented Nov 19, 2025

Uh oh!

Uh oh!

bergerhoffer commented Nov 20, 2025

Uh oh!

bergerhoffer commented Nov 20, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2025

Uh oh!

bergerhoffer commented Nov 20, 2025

Uh oh!

bergerhoffer commented Nov 20, 2025

Uh oh!

bergerhoffer commented Nov 20, 2025

Uh oh!

bergerhoffer commented Nov 20, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bergerhoffer commented Nov 18, 2025 •

edited

Loading

ocpdocs-previewbot commented Nov 18, 2025 •

edited

Loading