Skip to content

Commit dcaa8c9

Browse files
committed
Updated according to feedback.
1 parent 703a006 commit dcaa8c9

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

contributing/code_of_conduct/enforcement_team.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ and how to help implement its spirit throughout the community. In case these goa
1212
conflict, we will prioritize safety of community members over all other goals.
1313

1414
If you think there is or has been a violation to the code of conduct please contact
15-
enforcement team or of you prefer contact only individual members of the enforcement team.
15+
enforcement team or if you prefer contact only individual members of the enforcement team.
1616

1717
Members
1818
-------
@@ -52,9 +52,7 @@ quis sapien. Ut congue pharetra rhoncus.
5252
About the Enforcement Team
5353
--------------------------
5454

55-
The :doc:`Symfony core team </contributing/code/core_team>` appoints enforcement
56-
team with candidates they see fit. The enforcement team will consists of at least
55+
The :doc:`Symfony project leader </contributing/code/core_team>` appoints enforcement
56+
team with candidates they see fit. The enforcement team will consist of at least
5757
be 3 persons. The team should be representing as many demographics as possible,
58-
ideally from different employers and not in a private partnership with Symfony
59-
and/or SensioLabs.
60-
58+
ideally from different employers and not in a private partnership.

contributing/code_of_conduct/reporting_guidelines.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ that's the case, the identities of all victims, reporters, and the accused will
1212
remain confidential unless those individuals instruct us otherwise. The details
1313
of the incident may also be generalized.
1414

15-
If you believe anyone is in physical danger, please notify appropriate emergency
16-
services first by calling the relevant local authorities. If you are unsure what
17-
service or agency is appropriate to contact, include this in your report and we
18-
will attempt to notify them.
15+
If you believe anyone is in physical danger or doing something that is against
16+
the law, please notify appropriate emergency services first by calling the relevant
17+
local authorities. If you are unsure what service or agency is appropriate to
18+
contact, include this in your report and we will attempt to notify them.
1919

2020
In your report please include:
2121

2222
* Your contact info for follow-up contact.
2323
* Names (legal, nicknames, or pseudonyms) of any individuals involved.
2424
* If there were other witnesses besides you, please try to include them as well.
2525
* When and where the incident occurred. Please be as specific as possible.
26-
* Your account of what occurred.
26+
* Your description of what occurred.
2727
* If there is a publicly available record (e.g. a mailing list archive or a
28-
public IRC or Slack log), please include a link.
28+
public IRC or Slack log), please include a link and a screenshot.
2929
* Any extra context you believe existed for the incident.
3030
* If you believe this incident is ongoing.
3131
* Any other information you believe we should have.
@@ -36,7 +36,8 @@ What happens after you file a report?
3636
You will receive a reply from the :doc:`enforcement team </contributing/code_of_conduct/enforcement_team>`
3737
acknowledging receipt as soon as possible, but within 24 hours.
3838

39-
The team will immediately meet to review the incident and determine:
39+
The team member receiving the report will immediately contact all or some other
40+
enforcement team members to review the incident and determine:
4041

4142
* What happened.
4243
* Whether this event constitutes a Code of Conduct violation.
@@ -59,12 +60,12 @@ to how to respond. Responses may include:
5960
spaces (events, meetings, mailing lists, IRC, Slack, etc.)
6061
* A request to engage in mediation and/or an accountability plan.
6162
* On a case by case basis, other actions may be possible but will usually be
62-
coordinated with the core-team.
63+
coordinated with the core team and Symfony.
6364

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

67-
Once we've determined our final action, we'll contact the original reporter to
68+
Once we've determined our final actions, we'll contact the original reporter to
6869
let them know what action (if any) we'll be taking. We'll take into account feedback
6970
from the reporter on the appropriateness of our response, but our response will be
7071
determined by what will be best for community safety.
@@ -93,7 +94,6 @@ Reporting Guidelines derived from those of the `Stumptown Syndicate`_ and the
9394

9495
Adopted by `Symfony`_ organizers on 21 February 2018.
9596

96-
9797
.. _`Stumptown Syndicate`: http://stumptownsyndicate.org/code-of-conduct/reporting-guidelines/
9898
.. _`Django Software Foundation`: https://www.djangoproject.com/conduct/reporting/
9999
.. _`Symfony`: https://symfony.com

0 commit comments

Comments
 (0)