Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up more language for inclusiveness #17182

Merged
merged 1 commit into from
Jan 27, 2023
Merged

Clean up more language for inclusiveness #17182

merged 1 commit into from
Jan 27, 2023

Conversation

TomSweeneyRedHat
Copy link
Member

@TomSweeneyRedHat TomSweeneyRedHat commented Jan 22, 2023 •
edited by rhatdan
Loading

We had a number of references, mostly in docs, to the word master that can now be changed to main. This PR does that and makes the project a bit more inclusive.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat [email protected]

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added the do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None label Jan 22, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TomSweeneyRedHat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 22, 2023
rhatdan
rhatdan reviewed Jan 22, 2023
View reviewed changes
docs/tutorials/basic_networking.md
@@ -4,7 +4,7 @@
# Basic Networking Guide for Podman


It seems once people master the basics of containers, networking is one of the first
Copy link
Member

Choose a reason for hiding this comment

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

This feels forced, but fine.

Copy link
Member

Choose a reason for hiding this comment

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

How is conquermore inclusive? :-)

I am not a native speaker so just ignore my note if you disagree, but the new text is not really clear. Maybe "learn", "understand"?

Copy link
Member

Choose a reason for hiding this comment

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

I think understand is correct, None of us have really mastered or conquered it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Changing to understand, good thought @giuseppe

@openshift-ci openshift-ci bot added release-note-none and removed do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None labels Jan 22, 2023
@rhatdan
Copy link
Member

rhatdan commented Jan 22, 2023

LGTM

@vrothberg
Copy link
Member

LGTM but CI isn't happy

@TomSweeneyRedHat
Copy link
Member Author

I think I found the offending trailing whitespace and have nuked it. I also touched up per Giuseppe's suggestion, I'll have to find something else to conquer now I guess.....

@TomSweeneyRedHat
Copy link
Member Author

OK< I'm confuzeled. This change is only md files with the exception of a dependebot script. Yet I'm hitting:

[+1577s] [Fail] Podman play kube [It] podman play kube test with hostIPC 
[+1577s] /var/tmp/go/src/github.com/containers/podman/test/e2e/play_kube_test.go:4992

Is this a known issue?

@vrothberg
Copy link
Member

Is this a known issue?

Also happening in #17246. I am just going through emails but will catch up with what's going on here.

@vrothberg
Copy link
Member

Also happening in #17228.

@vrothberg
Copy link
Member

OK, it looks like commit 623ad2a and #17186 got merged at the same time. They work in isolation but break in combination.

@vrothberg
Copy link
Member

Please rebase #17247 got merged and the test will pass again.

@TomSweeneyRedHat
Clean up more language for inclusiveness
9db657f 
We had a number of references, mostly in docs, to the word master that
can now be changed to main.  This PR does that and makes the project a
bit more inclusive.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat
Copy link
Member Author

Thanks for the sleuthing @vrothberg ! Rebased and repushed.

@rhatdan
Copy link
Member

rhatdan commented Jan 27, 2023

/lgtm
/hold

@TomSweeneyRedHat
Copy link
Member Author

The "Test Bindings" test failed and left no trace of an error. Restarted. I dread these "straightforward" PRs like this. I think the CI watches for them and goes into ultra-mischief mode....

@rhatdan
Copy link
Member

rhatdan commented Jan 27, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2023
@openshift-merge-robot openshift-merge-robot merged commit 986a3a6 into containers:main Jan 27, 2023
@TomSweeneyRedHat TomSweeneyRedHat deleted the dev/tsweeney/fixlang3 branch June 30, 2023 21:43
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 28, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rhatdan rhatdan rhatdan left review comments

@giuseppe giuseppe giuseppe left review comments

Assignees

@rhatdan rhatdan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@TomSweeneyRedHat @rhatdan @vrothberg @giuseppe @openshift-merge-robot