Skip to content

A few minor adjustments to make short descriptions better#104841

Merged
stevsmit merged 1 commit intoopenshift:mainfrom
stevsmit:16834-osdocs-followup
Jan 15, 2026
Merged

A few minor adjustments to make short descriptions better#104841
stevsmit merged 1 commit intoopenshift:mainfrom
stevsmit:16834-osdocs-followup

Conversation

@stevsmit
Copy link
Member

@stevsmit stevsmit commented Jan 15, 2026

Follow up to #103433.

Version(s):
4.16+

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

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Copy link
Contributor

@ShaunaDiaz ShaunaDiaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just one Q, LGTM

@stevsmit stevsmit force-pushed the 16834-osdocs-followup branch from 8888f89 to d28cd4c Compare January 15, 2026 16:30
@openshift-ci
Copy link

openshift-ci bot commented Jan 15, 2026

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

@stevsmit stevsmit merged commit c4783aa into openshift:main Jan 15, 2026
2 checks passed
@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.21

@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.20

@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.19

@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.18

@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.17

@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.16

@openshift-cherrypick-robot

@stevsmit: new pull request created: #104849

Details

In response to this:

/cherry-pick 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

@stevsmit: new pull request created: #104850

Details

In response to this:

/cherry-pick 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

@stevsmit: new pull request created: #104851

Details

In response to this:

/cherry-pick 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

@stevsmit: new pull request created: #104852

Details

In response to this:

/cherry-pick 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

@stevsmit: new pull request created: #104853

Details

In response to this:

/cherry-pick 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

@stevsmit: #104841 failed to apply on top of branch "enterprise-4.16":

Applying: A few minor adjustments to make short descriptions better
Using index info to reconstruct a base tree...
M	modules/nw-multus-add-pod.adoc
M	modules/nw-multus-advanced-annotations.adoc
M	modules/nw-multus-delete-network.adoc
M	modules/nw-multus-edit-network.adoc
M	modules/nw-multus-remove-pod.adoc
A	networking/multiple_networks/secondary_networks/attaching-pod.adoc
A	networking/multiple_networks/secondary_networks/editing-additional-network.adoc
A	networking/multiple_networks/secondary_networks/removing-additional-network.adoc
A	networking/multiple_networks/secondary_networks/removing-pod.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/multiple_networks/removing-pod.adoc
Auto-merging networking/multiple_networks/edit-additional-network.adoc
Auto-merging networking/multiple_networks/attaching-pod.adoc
Auto-merging modules/nw-multus-remove-pod.adoc
Auto-merging modules/nw-multus-edit-network.adoc
CONFLICT (content): Merge conflict in modules/nw-multus-edit-network.adoc
Auto-merging modules/nw-multus-delete-network.adoc
CONFLICT (content): Merge conflict in modules/nw-multus-delete-network.adoc
Auto-merging modules/nw-multus-advanced-annotations.adoc
Auto-merging modules/nw-multus-add-pod.adoc
CONFLICT (content): Merge conflict in modules/nw-multus-add-pod.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 A few minor adjustments to make short descriptions better

Details

In response to this:

/cherry-pick 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.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants