Skip to content

TELCODOCS-2764: DITA compatibility fixes for vDU reference cluster co…#106778

Merged
slovern merged 1 commit into
openshift:mainfrom
kquinn1204:TELCODOCS-2764-dita-rewrite-ztp-reference-cluster-configuration-for-vdu
Jun 22, 2026
Merged

TELCODOCS-2764: DITA compatibility fixes for vDU reference cluster co…#106778
slovern merged 1 commit into
openshift:mainfrom
kquinn1204:TELCODOCS-2764-dita-rewrite-ztp-reference-cluster-configuration-for-vdu

Conversation

@kquinn1204

Copy link
Copy Markdown
Contributor

…nfiguration

Fix all 29 AsciiDocDITA Vale errors and warnings across the assembly and its 24 included modules: add [role="_abstract"] short descriptions, add missing content-type attribute, rewrite related-links to contain only xrefs, extract inline assembly content to new concept modules, and attach trailing NOTE to last procedure step.

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 17, 2026
@openshift-ci-robot

openshift-ci-robot commented Feb 17, 2026

Copy link
Copy Markdown

@kquinn1204: This pull request references TELCODOCS-2764 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.22.0" version, but no target version was set.

Details

In response to this:

…nfiguration

Fix all 29 AsciiDocDITA Vale errors and warnings across the assembly and its 24 included modules: add [role="_abstract"] short descriptions, add missing content-type attribute, rewrite related-links to contain only xrefs, extract inline assembly content to new concept modules, and attach trailing NOTE to last procedure step.

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 openshift-ci Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 17, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented Feb 17, 2026

Copy link
Copy Markdown

Comment thread modules/ztp-sno-du-recommended-cluster-install-manifests.adoc Outdated
Comment thread modules/ztp-sno-du-recommended-postinstallation-cluster-configurations.adoc Outdated
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 19, 2026
@kquinn1204 kquinn1204 force-pushed the TELCODOCS-2764-dita-rewrite-ztp-reference-cluster-configuration-for-vdu branch from ba47b36 to d4ef366 Compare June 22, 2026 09:06
…nfiguration

Fix all 29 AsciiDocDITA Vale errors and warnings across the assembly and
its 24 included modules: add [role="_abstract"] short descriptions, add
missing content-type attribute, rewrite related-links to contain only
xrefs, extract inline assembly content to new concept modules, and
attach trailing NOTE to last procedure step.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2026
@kquinn1204 kquinn1204 force-pushed the TELCODOCS-2764-dita-rewrite-ztp-reference-cluster-configuration-for-vdu branch from d4ef366 to cdcad9c Compare June 22, 2026 09:07
@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown

@kquinn1204: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@slovern slovern added this to the Continuous Release milestone Jun 22, 2026
@slovern slovern merged commit bba88d8 into openshift:main Jun 22, 2026
2 checks passed
@slovern

slovern commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-5.0

@slovern

slovern commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.22

@slovern

slovern commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.21

@slovern

slovern commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

Copy link
Copy Markdown

@slovern: new pull request created: #113850

Details

In response to this:

/cherrypick enterprise-5.0

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

Copy link
Copy Markdown

@slovern: new pull request created: #113851

Details

In response to this:

/cherrypick enterprise-4.22

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

Copy link
Copy Markdown

@slovern: new pull request created: #113852

Details

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@slovern: #106778 failed to apply on top of branch "enterprise-4.20":

Applying: TELCODOCS-2764: DITA compatibility fixes for vDU reference cluster configuration
Using index info to reconstruct a base tree...
M	edge_computing/ztp-reference-cluster-configuration-for-vdu.adoc
M	modules/ztp-enabling-workload-partitioning-sno.adoc
M	modules/ztp-sno-du-removing-the-console-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging edge_computing/ztp-reference-cluster-configuration-for-vdu.adoc
CONFLICT (content): Merge conflict in edge_computing/ztp-reference-cluster-configuration-for-vdu.adoc
Auto-merging modules/ztp-enabling-workload-partitioning-sno.adoc
Auto-merging modules/ztp-sno-du-removing-the-console-operator.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 set advice.mergeConflict false"
Patch failed at 0001 TELCODOCS-2764: DITA compatibility fixes for vDU reference cluster configuration

Details

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.20 branch/enterprise-4.21 branch/enterprise-4.22 branch/enterprise-5.0 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants