Skip to content

Conversation

@bobfuru
Copy link
Contributor

@bobfuru bobfuru commented Apr 19, 2021

Came across the need for a few wording clarifications, so fixed those, and also removed hard wraps while here.

Preview link: https://deploy-preview-31675--osdocs.netlify.app/openshift-enterprise/latest/updating/updating-cluster-between-minor.html#understanding-upgrade-channels_updating-cluster-between-minor

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 19, 2021
@bobfuru bobfuru added branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-needed Signifies that the peer review team needs to review this PR and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 19, 2021
@bobfuru bobfuru added this to the Next Release milestone Apr 19, 2021
@bobfuru
Copy link
Contributor Author

bobfuru commented Apr 19, 2021

@openshift/team-documentation PTAL

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed "to EUS the"

@netlify
Copy link

netlify bot commented Apr 19, 2021

Deploy preview for osdocs ready!

Built with commit 8b5fb5b

https://deploy-preview-31675--osdocs.netlify.app

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed unnecessary commas: not, and never was, available

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 19, 2021
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed "install of a 4.6 version"

Copy link
Contributor

Choose a reason for hiding this comment

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

I know this is existing text. However, when I first read the last sentence, it made me think that {product-version}.2 contains known vulnerabilities. I read it to suggest {product-version}.2 version was never available because the update service will not suggest updating to a version of {product-title} that contains known vulnerabilities.
Would it make sense to move the last sentence to the second sentence?

The service recommends only upgrades that have been tested and have no serious issues. The service recommends only upgrades that have been tested and have no serious issues. For example, if your cluster...

Just a thought.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good suggestion about relocating that last sentence for clarity. Done.

@mburke5678
Copy link
Contributor

@bobfuru One thought. Otherwise LGTM.

@mburke5678 mburke5678 added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Apr 19, 2021
@bobfuru bobfuru merged commit 44ea50b into openshift:master Apr 19, 2021
@bobfuru bobfuru deleted the upgrade-typo branch April 19, 2021 17:12
@bobfuru
Copy link
Contributor Author

bobfuru commented Apr 19, 2021

/cherrypick enterprise-4.8

@bobfuru
Copy link
Contributor Author

bobfuru commented Apr 19, 2021

/cherrypick enterprise-4.7

@bobfuru
Copy link
Contributor Author

bobfuru commented Apr 19, 2021

/cherrypick enterprise-4.6

@bobfuru
Copy link
Contributor Author

bobfuru commented Apr 19, 2021

/cherrypick enterprise-4.5

@openshift-cherrypick-robot

@bobfuru: #31675 failed to apply on top of branch "enterprise-4.7":

Applying: Fixes a few typos and adds soft wraps
Using index info to reconstruct a base tree...
M	modules/understanding-upgrade-channels.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/understanding-upgrade-channels.adoc
CONFLICT (content): Merge conflict in modules/understanding-upgrade-channels.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fixes a few typos and adds soft wraps
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".

Details

In response to this:

/cherrypick enterprise-4.7

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.

@openshift-cherrypick-robot

@bobfuru: new pull request created: #31678

Details

In response to this:

/cherrypick enterprise-4.8

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.

@openshift-cherrypick-robot

@bobfuru: #31675 failed to apply on top of branch "enterprise-4.6":

Applying: Fixes a few typos and adds soft wraps
Using index info to reconstruct a base tree...
M	modules/understanding-upgrade-channels.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/understanding-upgrade-channels.adoc
CONFLICT (content): Merge conflict in modules/understanding-upgrade-channels.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fixes a few typos and adds soft wraps
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".

Details

In response to this:

/cherrypick enterprise-4.6

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.

@openshift-cherrypick-robot

@bobfuru: #31675 failed to apply on top of branch "enterprise-4.5":

Applying: Fixes a few typos and adds soft wraps
Using index info to reconstruct a base tree...
M	modules/understanding-upgrade-channels.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/understanding-upgrade-channels.adoc
CONFLICT (content): Merge conflict in modules/understanding-upgrade-channels.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fixes a few typos and adds soft wraps
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".

Details

In response to this:

/cherrypick enterprise-4.5

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.

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

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants