Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d50d31b

Browse filesBrowse files
javiereguiluzjaviereguiluz
committed
minor #9750 Rename enforcement team to CARE team (iltar)
This PR was merged into the 2.7 branch. Discussion ---------- Rename enforcement team to CARE team There were some negative comments about calling it the "enforcement team". This is what it is, but it made some people feel like it was too harsh, too close to policing and easy to give knee-jerk reactions to. Reading the "less obvious checklist" posted by @lsmith77 in symfony/diversity#6 (comment), I noticed DjangoCon had a positive name for this team/group. > _Your CoC is useless if you can not respond to issues. Set up a CoC team. In DjangoCon Europe, they’re sometimes called CoC Active Response Ensurers or CARE. An ideal size for this is four people. These people are the primary responsible persons for dealing with any reports, and should be able to have their hands free at any time. They can involve other team members if needed, but having a small CARE team makes it easier to respond consistently, professionally and timely, without distracting the rest of the team._ > > Source: https://github.com/mxsasha/lessobviouschecklist/blob/master/README.md#code-of-conduct I would like to propose an adoption of this name as it sounds more positive and caring (:smile:) Note that I made this towards the master, if I need to change this to 2.7 or 2.8 let me know. Commits ------- dad5cfb Rename enforcement team to CARE team
2 parents 3a0893a + dad5cfb commit d50d31b
Copy full SHA for d50d31b

File tree

Expand file treeCollapse file tree

5 files changed

+26
-26
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+26
-26
lines changed

‎contributing/code_of_conduct/enforcement_team.rst renamed to ‎contributing/code_of_conduct/care_team.rst

Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
Enforcement Team
2-
================
1+
CARE Team
2+
=========
33

44
Our Pledge
55
----------
66

7-
In the interest of fostering an open and welcoming environment, the enforcement team
7+
In the interest of fostering an open and welcoming environment, the CoC Active Response Ensurers, or CARE,
88
pledge to ensure that the spirit of the :doc:`Code of Conduct </contributing/code_of_conduct/index>`
99
is respected. Our main priority is to ensure the safety of our community members.
1010
The second goal is to help educate the community as a whole to be aware of the CoC
1111
and how to help implement its spirit throughout the community. In case these goals
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 if you prefer contact only individual members of the enforcement team.
15+
the CARE team or if you prefer contact only individual members of the CARE team.
1616

1717
Members
1818
-------
1919

20-
Here are all the members of the Code of Conduct enforcement team. You can contact
20+
Here are all the members of the Code of Conduct CARE team. You can contact
2121
any of them directly using the contact details below or you can also contact all of
2222
them at once by emailing **coc@symfony.com**.
2323

24-
About the Enforcement Team
25-
--------------------------
24+
About the CARE Team
25+
-------------------
2626

27-
The :doc:`Symfony project leader </contributing/code/core_team>` appoints enforcement
28-
team with candidates they see fit. The enforcement team will consist of at least
27+
The :doc:`Symfony project leader </contributing/code/core_team>` appoints the CARE
28+
team with candidates they see fit. The CARE team will consist of at least
2929
3 people. The team should be representing as many demographics as possible,
3030
ideally from different employers.

‎contributing/code_of_conduct/code_of_conduct.rst

Copy file name to clipboardExpand all lines: contributing/code_of_conduct/code_of_conduct.rst
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ Examples of unacceptable behavior by participants include:
3737
Our Responsibilities
3838
--------------------
3939

40-
:doc:`Enforcement team members </contributing/code_of_conduct/enforcement_team>`
40+
:doc:`CoC Active Response Ensurers, or CARE</contributing/code_of_conduct/care_team>`,
4141
are responsible for clarifying the standards of acceptable
4242
behavior and are expected to take appropriate and fair corrective action in
4343
response to any instances of unacceptable behavior.
4444

45-
Enforcement team members have the right and responsibility to remove, edit, or
45+
CARE team members have the right and responsibility to remove, edit, or
4646
reject comments, commits, code, wiki edits, issues, and other contributions
4747
that are not aligned to this Code of Conduct, or to ban temporarily or
4848
permanently any contributor for other behaviors that they deem inappropriate,
@@ -56,20 +56,20 @@ when an individual is representing the project or its community. Examples of
5656
representing a project or community include using an official project e-mail
5757
address, posting via an official social media account, or acting as an appointed
5858
representative at an online or offline event. Representation of a project may be
59-
further defined and clarified by enforcement team members.
59+
further defined and clarified by CARE team members.
6060

6161
Enforcement
6262
-----------
6363

6464
Instances of abusive, harassing, or otherwise unacceptable behavior
6565
:doc:`may be reported </contributing/code_of_conduct/reporting_guidelines>`
66-
by contacting the :doc:`enforcement team members </contributing/code_of_conduct/enforcement_team>`.
66+
by contacting the :doc:`CARE team members </contributing/code_of_conduct/care_team>`.
6767
All complaints will be reviewed and investigated and will result in a response that
68-
is deemed necessary and appropriate to the circumstances. The enforcement team is
68+
is deemed necessary and appropriate to the circumstances. The CARE team is
6969
obligated to maintain confidentiality with regard to the reporter of an incident.
7070
Further details of specific enforcement policies may be posted separately.
7171

72-
Enforcement team members who do not follow or enforce the Code of Conduct in good
72+
CARE team members who do not follow or enforce the Code of Conduct in good
7373
faith may face temporary or permanent repercussions as determined by the
7474
:doc:`core team </contributing/code/core_team>`.
7575

@@ -86,7 +86,7 @@ Related Documents
8686
:maxdepth: 1
8787

8888
reporting_guidelines
89-
enforcement_team
89+
care_team
9090
concrete_example_document
9191

9292
.. _Contributor Covenant: https://www.contributor-covenant.org

‎contributing/code_of_conduct/index.rst

Copy file name to clipboardExpand all lines: contributing/code_of_conduct/index.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Code of Conduct
66

77
code_of_conduct
88
reporting_guidelines
9-
enforcement_team
9+
care_team
1010
concrete_example_document

‎contributing/code_of_conduct/reporting_guidelines.rst

Copy file name to clipboardExpand all lines: contributing/code_of_conduct/reporting_guidelines.rst
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Reporting Guidelines
22
====================
33

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

88
**All reports will be kept confidential.** The privacy of everyone included in
@@ -32,11 +32,11 @@ In your report please include:
3232
What happens after you file a report?
3333
-------------------------------------
3434

35-
You will receive a reply from the :doc:`enforcement team </contributing/code_of_conduct/enforcement_team>`
35+
You will receive a reply from the :doc:`CARE team </contributing/code_of_conduct/care_team>`
3636
acknowledging receipt as soon as possible, but within 24 hours.
3737

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

4141
* What happened.
4242
* Whether this event constitutes a Code of Conduct violation.
@@ -69,20 +69,20 @@ let them know what action (if any) we'll be taking. We'll take into account feed
6969
from the reporter on the appropriateness of our response, but our response will be
7070
determined by what will be best for community safety.
7171

72-
The enforcement team keeps a private record of all incidents. By default all reports
73-
are shared with the entire enforcement team unless the reporter specifically asks
74-
to exclude specific enforcement team members, in which case these enforcement team
72+
The CARE team keeps a private record of all incidents. By default all reports
73+
are shared with the entire CARE team unless the reporter specifically asks
74+
to exclude specific CARE team members, in which case these CARE team
7575
members will not be included in any communication on the incidents as well as records
7676
created related to the incidents.
7777

78-
Enforcement team members are expected to inform the enforcement team and the reporters
78+
CARE team members are expected to inform the CARE team and the reporters
7979
in case of conflicts on interest and recuse themselves if this is deemed a problem.
8080

8181
Appealing the response
8282
----------------------
8383

8484
Only permanent resolutions (such as bans) may be appealed. To appeal a decision
85-
of the working group, contact the :doc:`enforcement team </contributing/code_of_conduct/enforcement_team>`
85+
of the working group, contact the :doc:`CARE team </contributing/code_of_conduct/care_team>`
8686
with your appeal and they will review the case.
8787

8888
Document origin

‎contributing/map.rst.inc

Copy file name to clipboardExpand all lines: contributing/map.rst.inc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
* :doc:`/contributing/code_of_conduct/code_of_conduct`
44
* :doc:`/contributing/code_of_conduct/reporting_guidelines`
5-
* :doc:`/contributing/code_of_conduct/enforcement_team`
5+
* :doc:`/contributing/code_of_conduct/care_team`
66
* :doc:`/contributing/code_of_conduct/concrete_example_document`
77

88
* **Code**

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.