Skip to content

Conversation

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 27, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@bmcelvee
Copy link
Contributor Author

Planning to add an assembly or module to describe the Red Hat Ecosystem Catalog.

@bmcelvee bmcelvee force-pushed the update-catalog-term branch from 9290213 to 822d162 Compare August 3, 2020 20:38
@jboxman
Copy link
Contributor

jboxman commented Aug 4, 2020

@bmcelvee do we capitalize Container and Image when not referring to API objects? In the wild, it's rare to see container capitalized.

@bmcelvee
Copy link
Contributor Author

bmcelvee commented Aug 4, 2020

@jboxman depends on the circumstance. Since we're referring to a title here, Container does need to be capitalized. But as it turns out image doesn't, so I'll update the PR to reflect that. Thanks!

@openshift-bot
Copy link

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci-robot openshift-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 2, 2020
@openshift-bot
Copy link

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci-robot openshift-ci-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Dec 2, 2020
@openshift-bot
Copy link

Rotten issues close after 30d of inactivity.

Reopen the issue by commenting /reopen.
Mark the issue as fresh by commenting /remove-lifecycle rotten.
Exclude this issue from closing again by commenting /lifecycle frozen.

/close

@openshift-ci-robot
Copy link

@openshift-bot: Closed this PR.

Details

In response to this:

Rotten issues close after 30d of inactivity.

Reopen the issue by commenting /reopen.
Mark the issue as fresh by commenting /remove-lifecycle rotten.
Exclude this issue from closing again by commenting /lifecycle frozen.

/close

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.

@bergerhoffer
Copy link
Contributor

@bmcelvee This came up in a discussion for the supplementary style guide here: redhat-documentation/supplementary-style-guide#53

Should we reopen this PR to get the terminology fixed?

Copy link
Contributor

@bergerhoffer bergerhoffer Feb 1, 2021

Choose a reason for hiding this comment

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

If we do reopen this PR for inclusion, "Container Images" should be "Container images" throughout the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi! Yes, I'll reopen this PR. Thank you for that note.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks a lot @bmcelvee!

@bergerhoffer
Copy link
Contributor

@bmcelvee I'm reopening this PR just so that it doesn't get lost. Let me know if you want me to take it over to get it wrapped up. Thanks!

@bergerhoffer bergerhoffer reopened this Mar 9, 2021
@bmcelvee bmcelvee force-pushed the update-catalog-term branch from 822d162 to bb3d12b Compare March 17, 2021 19:36
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 17, 2021
@netlify
Copy link

netlify bot commented Mar 17, 2021

Deploy preview for osdocs ready!

Built with commit 74cd1d4

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

@bmcelvee bmcelvee force-pushed the update-catalog-term branch from bb3d12b to 47ea8b6 Compare March 17, 2021 19:42
@bmcelvee bmcelvee changed the title [WIP] Update container catalog terminology Update container catalog terminology Mar 17, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 17, 2021
@bmcelvee bmcelvee added branch/enterprise-4.5 branch/enterprise-4.6 and removed lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. labels Mar 17, 2021
@bmcelvee
Copy link
Contributor Author

@bmcelvee I'm reopening this PR just so that it doesn't get lost. Let me know if you want me to take it over to get it wrapped up. Thanks!

Thanks, @bergerhoffer! Found and updated the remaining references to Red Hat Container Catalog.

@bmcelvee bmcelvee added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 17, 2021
Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

One question; looks good otherwise!

Copy link
Contributor

Choose a reason for hiding this comment

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

Should this link follow the other changes and point to https://catalog.redhat.com/software/containers/explore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a good question. registry.redhat.io redirects to https://catalog.redhat.com/software/containers/explore. I can go ahead and change those, but I think I'll need to open a CIT issue to change registry.redhat.io links to https://catalog.redhat.com/software/containers/explore in other files because there are a lot of independent references and links to the registry.redhat.io URL.

@codyhoag codyhoag 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 Mar 17, 2021
@bmcelvee bmcelvee force-pushed the update-catalog-term branch from 47ea8b6 to 74cd1d4 Compare March 17, 2021 20:43
@bmcelvee bmcelvee merged commit 9849604 into openshift:master Mar 17, 2021
@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.5

@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.6

@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.7

@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.8

@openshift-cherrypick-robot

@bmcelvee: #24205 failed to apply on top of branch "enterprise-4.5":

Applying: Update container catalog terminology
Using index info to reconstruct a base tree...
M	architecture/understanding-development.adoc
M	modules/installation-obtaining-installer.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-obtaining-installer.adoc
CONFLICT (content): Merge conflict in modules/installation-obtaining-installer.adoc
Auto-merging architecture/understanding-development.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 Update container catalog terminology
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.

@openshift-cherrypick-robot

@bmcelvee: #24205 failed to apply on top of branch "enterprise-4.6":

Applying: Update container catalog terminology
Using index info to reconstruct a base tree...
M	architecture/understanding-development.adoc
M	modules/installation-obtaining-installer.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-obtaining-installer.adoc
CONFLICT (content): Merge conflict in modules/installation-obtaining-installer.adoc
Auto-merging architecture/understanding-development.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 Update container catalog terminology
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

@bmcelvee: #24205 failed to apply on top of branch "enterprise-4.7":

Applying: Update container catalog terminology
Using index info to reconstruct a base tree...
M	modules/installation-obtaining-installer.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-obtaining-installer.adoc
CONFLICT (content): Merge conflict in modules/installation-obtaining-installer.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 Update container catalog terminology
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

@bmcelvee: #24205 failed to apply on top of branch "enterprise-4.8":

Applying: Update container catalog terminology
Using index info to reconstruct a base tree...
M	modules/installation-obtaining-installer.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-obtaining-installer.adoc
CONFLICT (content): Merge conflict in modules/installation-obtaining-installer.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 Update container catalog terminology
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.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.

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

8 participants