summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2019-07-17 20:23:25 +0200
committerMartin Roth <martinroth@google.com>2019-07-19 16:36:47 +0000
commitc52078fd01d645290d7a5e116e836c85967f1503 (patch)
tree2f1b3006a5c91cf4da205a8bc89da327151ed8e6
parentb30a47b841f1c7d55d9cf207e1cc89f1b7f7fa51 (diff)
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>
-rw-r--r--Documentation/community/code_of_conduct.md27
1 files changed, 16 insertions, 11 deletions
diff --git a/Documentation/community/code_of_conduct.md b/Documentation/community/code_of_conduct.md
index f8ef8cb543..d45d1dc4a0 100644
--- a/Documentation/community/code_of_conduct.md
+++ b/Documentation/community/code_of_conduct.md
@@ -26,16 +26,26 @@ misunderstandings can (and do) happen. Assume that others are friendly
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 @@ a temporary ban or permanent expulsion from the community without warning
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