Change in coreboot[master]: Documentation/code_of_conduct: Highlight the reporting process
Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Documentation/code_of_conduct: Highlight the reporting process
Make it a separate section, emphasize that people should get support early, note that personal interaction and email are the two best ways to seek help.
Change-Id: I8cb613fefe1a7b4db1ee948fb9927a38f0421011 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M Documentation/community/code_of_conduct.md 1 file changed, 16 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/34390/1
diff --git a/Documentation/community/code_of_conduct.md b/Documentation/community/code_of_conduct.md index f8ef8cb..d45d1dc 100644 --- a/Documentation/community/code_of_conduct.md +++ b/Documentation/community/code_of_conduct.md @@ -26,16 +26,26 @@ and may have picked less-than-stellar wording by accident as long as you possibly can.
-If you have a grievance due to conduct in this community, we want to hear -about it so we can handle the situation. Please contact our arbitration -team directly: They will listen to you and react in a timely fashion. +## Reporting Issues + +If you have a grievance due to conduct in this community, we're sorry +that you have had a bad experience, and we want to hear about it so +we can resolve the situation. + +Please contact members of our arbitration team (listed below) promptly +and directly, in person (if available) or by email: They will listen +to you and react in a timely fashion. + +If you feel uncomfortable, please don't wait it out, ask for help, +so we can work on setting things right.
For transparency there is no alias or private mailing list address for you to reach out to, since we want to make sure that you know who will -(and who won't) read your message. +and who won't read your message.
-However since people might be on travel or otherwise be unavailable at -times, consider reaching out to multiple persons. +However since people might be on travel or otherwise be unavailable +at times, please reach out to multiple persons at once, especially +when using email.
The team will treat your messages confidential as far as the law permits. For the purpose of knowing what law applies, the list provides the usual @@ -78,11 +88,6 @@ can be part of the arbitration team, or organizers of events and online communities.
-## If You Witness or Are Subject to Unacceptable Behavior - -If you are subject to or witness unacceptable behavior, or have any other -concerns, please notify someone from the arbitration team immediately. -
## Addressing Grievances
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Patch Set 1: Code-Review+1
(1 comment)
There's mixed first-person and third-person expressions used in this paragraph. Not sure which would be best to use.
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... File Documentation/community/code_of_conduct.md:
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... PS1, Line 36: listen Minor: The sounds of email are rather quiet and uninformative. My vocabulary is failing me: is there any expression which would convey the same meaning irrespective of the communication medium? Or does "listen" also work for written communication channels?
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Patch Set 1: Code-Review+1
At least to me the term 'listen' is appropriate in this context.
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Patch Set 1: Code-Review+2
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... File Documentation/community/code_of_conduct.md:
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... PS1, Line 36: listen
Minor: The sounds of email are rather quiet and uninformative. […]
"hear you out"? "discuss the issue with you?"
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... File Documentation/community/code_of_conduct.md:
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... PS1, Line 36: listen
"hear you out"? "discuss the issue with you?"
"hear you out" has the same issue as "listen", while we won't "discuss" (which can be considered adversarial) but remain on the receiving end about the report.
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... File Documentation/community/code_of_conduct.md:
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... PS1, Line 36: listen
"hear you out" has the same issue as "listen", while we won't "discuss" (which can be considered adv […]
sounds good. :)
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... File Documentation/community/code_of_conduct.md:
https://review.coreboot.org/c/coreboot/+/34390/1/Documentation/community/cod... PS1, Line 36: listen
sounds good. […]
Done
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34390 )
Change subject: Documentation/code_of_conduct: Highlight the reporting process ......................................................................
Documentation/code_of_conduct: Highlight the reporting process
Make it a separate section, emphasize that people should get support early, note that personal interaction and email are the two best ways to seek help.
Change-Id: I8cb613fefe1a7b4db1ee948fb9927a38f0421011 Signed-off-by: Patrick Georgi pgeorgi@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34390 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Werner Zeh werner.zeh@siemens.com Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-by: Martin Roth martinroth@google.com --- M Documentation/community/code_of_conduct.md 1 file changed, 16 insertions(+), 11 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved Martin Roth: Looks good to me, approved Werner Zeh: Looks good to me, but someone else must approve Angel Pons: Looks good to me, but someone else must approve
diff --git a/Documentation/community/code_of_conduct.md b/Documentation/community/code_of_conduct.md index f8ef8cb..d45d1dc 100644 --- a/Documentation/community/code_of_conduct.md +++ b/Documentation/community/code_of_conduct.md @@ -26,16 +26,26 @@ and may have picked less-than-stellar wording by accident as long as you possibly can.
-If you have a grievance due to conduct in this community, we want to hear -about it so we can handle the situation. Please contact our arbitration -team directly: They will listen to you and react in a timely fashion. +## Reporting Issues + +If you have a grievance due to conduct in this community, we're sorry +that you have had a bad experience, and we want to hear about it so +we can resolve the situation. + +Please contact members of our arbitration team (listed below) promptly +and directly, in person (if available) or by email: They will listen +to you and react in a timely fashion. + +If you feel uncomfortable, please don't wait it out, ask for help, +so we can work on setting things right.
For transparency there is no alias or private mailing list address for you to reach out to, since we want to make sure that you know who will -(and who won't) read your message. +and who won't read your message.
-However since people might be on travel or otherwise be unavailable at -times, consider reaching out to multiple persons. +However since people might be on travel or otherwise be unavailable +at times, please reach out to multiple persons at once, especially +when using email.
The team will treat your messages confidential as far as the law permits. For the purpose of knowing what law applies, the list provides the usual @@ -78,11 +88,6 @@ can be part of the arbitration team, or organizers of events and online communities.
-## If You Witness or Are Subject to Unacceptable Behavior - -If you are subject to or witness unacceptable behavior, or have any other -concerns, please notify someone from the arbitration team immediately. -
## Addressing Grievances
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)
-
Martin Roth (Code Review)
-
Patrick Georgi (Code Review)
-
Werner Zeh (Code Review)