Skip to content

Commit 703a006

Browse files
committed
Added some clarifications and updated according to feedback.
1 parent 94205bf commit 703a006

File tree

2 files changed

+15
-28
lines changed

2 files changed

+15
-28
lines changed

contributing/code_of_conduct/enforcement_team.rst

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ enforcement team or of you prefer contact only individual members of the enforce
1717
Members
1818
-------
1919

20+
Here are all the members of the Code of Conduct enforcement team. You can contact
21+
any of them by sending an email or tweet. You could also contact all of them at once
22+
by emailing **coc@symfony.com**.
23+
2024
Lukas Kahwe Smith
2125
`````````````````
22-
.. image:: https://avatars3.githubusercontent.com/u/300279?s=400&v=4
23-
:height: 150px
24-
:width: 150px
25-
:alt: Likas Kahwe Smith
26-
:class: pull-right
27-
2826
Lukas is part of symfony core team and working for Liip. Lorem ipsum dolor sit amet,
2927
consectetur adipiscing elit. Proin enim nibh, susciit sed rhoncus quis, blandit
3028
quis sapien. Ut congue pharetra rhoncus.
@@ -34,12 +32,6 @@ quis sapien. Ut congue pharetra rhoncus.
3432
3533
Lukas Kahwe Smith
3634
`````````````````
37-
.. image:: https://avatars3.githubusercontent.com/u/300279?s=400&v=4
38-
:height: 150px
39-
:width: 150px
40-
:alt: Likas Kahwe Smith
41-
:class: pull-right
42-
4335
Lukas is part of symfony core team and working for Liip. Lorem ipsum dolor sit amet,
4436
consectetur adipiscing elit. Proin enim nibh, suscipit sed rhoncus quis, blandit
4537
quis sapien. Ut congue pharetra rhoncus.
@@ -49,11 +41,6 @@ quis sapien. Ut congue pharetra rhoncus.
4941
5042
Lukas Kahwe Smith
5143
`````````````````
52-
.. image:: https://avatars3.githubusercontent.com/u/300279?s=400&v=4
53-
:height: 150px
54-
:width: 150px
55-
:alt: Likas Kahwe Smith
56-
:class: pull-right
5744

5845
Lukas is part of symfony core team and working for Liip. Lorem ipsum dolor sit amet,
5946
consectetur adipiscing elit. Proin enim nibh, suscipit sed rhoncus quis, blandit
@@ -71,4 +58,3 @@ be 3 persons. The team should be representing as many demographics as possible,
7158
ideally from different employers and not in a private partnership with Symfony
7259
and/or SensioLabs.
7360

74-

contributing/code_of_conduct/reporting_guidelines.rst

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
Reporting Guidelines
22
====================
33

4-
If you believe someone is violating the code of conduct we ask that you report
4+
If you believe someone is violating the Code of Conduct we ask that you report
55
it to the :doc:`enforcement team </contributing/code_of_conduct/enforcement_team>`
66
by emailing, twitter, in person or any way you see fit.
77

8-
**All reports will be kept confidential.** In some cases we may determine that
9-
a public statement will need to be made. If that's the case, the identities of
10-
all victims, reporters, and the accused will remain confidential unless those
11-
individuals instruct us otherwise.
8+
**All reports will be kept confidential.** The privacy of everyone included in
9+
the report is of our highest concern. Second to privacy there is transparency.
10+
After every report we will determine if a public statement should be made. If
11+
that's the case, the identities of all victims, reporters, and the accused will
12+
remain confidential unless those individuals instruct us otherwise. The details
13+
of the incident may also be generalized.
1214

1315
If you believe anyone is in physical danger, please notify appropriate emergency
1416
services first by calling the relevant local authorities. If you are unsure what
@@ -37,7 +39,7 @@ acknowledging receipt as soon as possible, but within 24 hours.
3739
The team will immediately meet to review the incident and determine:
3840

3941
* What happened.
40-
* Whether this event constitutes a code of conduct violation.
42+
* Whether this event constitutes a Code of Conduct violation.
4143
* What kind of response is appropriate.
4244

4345
If this is determined to be an ongoing incident or a threat to physical safety,
@@ -48,17 +50,16 @@ and that everyone is physically safe.
4850
Once the team has a complete account of the events, they will make a decision as
4951
to how to respond. Responses may include:
5052

51-
* Nothing (if we determine no code of conduct violation occurred).
53+
* Nothing (if we determine no Code of Conduct violation occurred).
5254
* A private reprimand from the Code of Conduct response team to the individual(s)
5355
involved.
54-
* A public reprimand.
5556
* An imposed vacation (i.e. asking someone to "take a week off" from a mailing
5657
list or Slack).
5758
* A permanent or temporary ban from some or all Symfony conference/community
5859
spaces (events, meetings, mailing lists, IRC, Slack, etc.)
5960
* A request to engage in mediation and/or an accountability plan.
60-
* On a case by case basis, the enforcement team might share information an incidents
61-
with employers or other 3rd parties in order to fulfill their mandate.
61+
* On a case by case basis, other actions may be possible but will usually be
62+
coordinated with the core-team.
6263

6364
We'll respond within one week to the person who filed the report with either a
6465
resolution or an explanation of why the situation is not yet resolved.

0 commit comments

Comments
 (0)