diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html index 19f980eba..12ece55b9 100644 --- a/djangoproject/templates/conduct/base.html +++ b/djangoproject/templates/conduct/base.html @@ -14,7 +14,7 @@
{% blocktranslate trimmed %} All content on this page is licensed under a - Creative Commons - Attribution license. + Creative Commons + Attribution-ShareAlike license. {% endblocktranslate %}
+ ++ {% blocktranslate trimmed %} + Our documents and policies are adapted from and inspired by + a + number of sources. + {% endblocktranslate %} +
{% endblock %} diff --git a/djangoproject/templates/conduct/changes.html b/djangoproject/templates/conduct/changes.html index 024870aa6..e9668733b 100644 --- a/djangoproject/templates/conduct/changes.html +++ b/djangoproject/templates/conduct/changes.html @@ -16,11 +16,14 @@{% blocktranslate trimmed %} @@ -30,33 +33,7 @@
{% blocktranslate trimmed %} A complete list of changes can always be found - on GitHub; - major changes and releases are summarized below.{% endblocktranslate %}
- -- {% url 'members:teams' as teams_url %} - {% blocktranslate trimmed %} - All responses to reports of conduct violations will be managed by the - Code of Conduct working group. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - The Django Software Foundation's Board of Directors ("the board") will establish - this working group, comprised of at least three members. One member will be - designated chair of the working group and will be responsible for all reports back to - the board. The board will review membership on a regular basis. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - When a report is sent to the working group they will immediately reply to the - report to confirm receipt. This reply must be sent within 24 hours, and the - working group should strive to respond much quicker than that. - {% endblocktranslate %}
- - {% url 'conduct_reporting' as conduct_reporting %} -- {% blocktranslate trimmed %} - See the reporting guidelines for details of - what reports should contain. If a report doesn't contain enough information, the - working group will obtain all relevant data before acting. The working group is - empowered to act on the DSF's behalf in contacting any individuals involved to - get a more complete account of events. - {% endblocktranslate %}
- -{% translate "The working group will then review the incident and determine, to the best of their ability:" %} -
- {% blocktranslate trimmed %} - This information will be collected in writing, and whenever possible the - working group's deliberations will be recorded and retained (i.e. chat transcripts, email - discussions, recorded voice conversations, etc). - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - The working group should aim to have a resolution agreed upon within one week. - In the event that a resolution can't be determined in that time, the working group will - respond to the reporter(s) with an update and projected timeline for resolution. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - If the act is ongoing (such as someone engaging in harassment on the forum), or involves - a threat to anyone's safety (e.g. threats of violence), any working group member - may act immediately (before reaching consensus) to end the situation. In ongoing - situations, any member may at their discretion employ any of the tools available - to the working group, including bans and blocks. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - If the incident involves physical danger, any member of the working group may -- - and should -- act unilaterally to protect safety. This can include contacting - law enforcement (or other local personnel) and speaking on behalf of the DSF. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - In situations where an individual working group member acts unilaterally, they must - report their actions to the working group for review within 24 hours.{% endblocktranslate %}
- -- {% blocktranslate trimmed %} - The working group must agree on a resolution by consensus. If the working group cannot - reach consensus and deadlocks for over a week, the working group will turn the matter - over to the board for resolution.{% endblocktranslate %}
- -{% translate "Possible responses may include:" %} -
- {% blocktranslate trimmed %} - Once a resolution is agreed upon, but before it is enacted, the working group - will contact the original reporter and any other affected parties and explain - the proposed resolution. The working group will ask if this resolution is - acceptable, and must note feedback for the record. However, the working group is - not required to act on this feedback. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - Finally the working group will make a report for the DSF board. In case the - incident or report involves a current member of the board, the working group will - provide the report only to the other board members. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - The working group will never publicly discuss the issue; all public statements - will be made by the DSF board. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - In the event of any conflict of interest a working group member must immediately - notify the other members, and recuse themselves if necessary. If a report concerns - a possible violation by a current working group member, this member should be - excluded from the response process. For these cases, anyone can make a report - directly to any of the working group chairs, as documented in the - reporting guidelines. - {% endblocktranslate %}
- -- {% blocktranslate trimmed %} - Editor's note: Writing this document posed a unique challenge. Most - similar guides are written on the assumption of an in-person event. However, the - Django community doesn't exist in one place, and most of the time we're spread - out across the world and interact online. This makes trying to define and - enforce community standards a different type of challenge. This document is - adapted from the Ada Initiative template and the PyCon 2013 Procedure for - Handling Harassment Incidents, but changed to reflect the nature of our - community. It is our expectation that this will be a living document and change - as we grow to understand how to meet this challenge and best serve our community - and ideals.{% endblocktranslate %} -
- + This manual has moved to + GitHub. Please see the latest version there.{% endblocktranslate %} + {% endblock %} diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html index 71cd1803e..4133c1266 100644 --- a/djangoproject/templates/conduct/faq.html +++ b/djangoproject/templates/conduct/faq.html @@ -104,6 +104,72 @@+ {% blocktranslate trimmed %} + The Code of Conduct + Working Group is responsible for investigating reports and enforcing the Code + of Conduct. The working group is appointed by the Django Software Foundation + board and operates according to the procedures documented in the + Working Group Manual. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + For day-to-day moderation in Django's online spaces (like the forum and Discord), + the Online Community + Working Group handles issues using their own moderation processes. The Code + of Conduct Working Group becomes involved for formal reports, cross-community + violations, or issues escalated by the online moderators. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + Contributor Covenant refers to "Community Moderators" as a general term for + whoever enforces a code of conduct. In Django, that role is filled by these two + working groups, each with distinct but complementary responsibilities. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + Repairing harm is a restorative justice approach that focuses on addressing the + impact of a violation rather than simply punishing the person who caused it. When + someone violates the Code of Conduct, our goal isn't just to apply consequences, + it's to help make things right for those affected and prevent similar harm in the + future. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + Repairing harm might include: + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + This approach recognizes that people can learn from mistakes and that communities + are stronger when we focus on growth, accountability, and making amends rather + than purely punitive measures. Of course, some violations are severe enough that + removal from the community is necessary to protect others, but that's a last + resort. + {% endblocktranslate %} +
+{% translate "Sadly, not everyone knows this." %}
@@ -119,6 +185,50 @@+ {% blocktranslate trimmed %} + If you are contacted by the Code of Conduct Working Group about a possible + violation, it's important to respond professionally and constructively: + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + The working group's goal is to respond proportionally to violations and work with + everyone involved to prevent future issues. We want to maintain a safe, + collaborative community of kind, compassionate people of all kinds. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + The Code of Conduct applies to all Django-managed spaces and when someone is + officially representing Django. However, as stated in the Code of Conduct, + violations of this code outside these spaces may affect a person's ability to + participate within them. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + This means that while we don't police behavior everywhere on the internet, the + working group may consider serious external conduct when it directly impacts the + safety and well-being of Django community members. + {% endblocktranslate %} +
+diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html index b4852a3cb..79ce06fc0 100644 --- a/djangoproject/templates/conduct/reporting.html +++ b/djangoproject/templates/conduct/reporting.html @@ -26,115 +26,361 @@
+ {% blocktranslate trimmed %} + Not every conflict or disagreement represents a Code of Conduct violation. + Tensions can occur between community members even when they are trying their best + to collaborate in good faith. Differences of opinion, technical disagreements, and + communication challenges are normal parts of working together. However, violations + often occur in how we respond to these disagreements. It's acceptable to question + the merit of a technical decision, but it's not acceptable to question the merit + or value of the people who made that decision. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + If you are unsure whether an incident is a violation, or whether the space where + it happened is covered by this Code of Conduct, we encourage you to still report + it. We would much rather have a few extra reports where we decide to take no + action, rather than miss a report of an actual violation. We do not look + negatively on you if we find the incident is not a violation. And knowing about + incidents that are not violations, or happen outside our spaces, can also help us + to improve the Code of Conduct or the processes surrounding it. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + You do not need to be directly affected by an incident to report it. If you + witness or become aware of behavior that violates the Code of Conduct, we + encourage you to report it, even if you were not the target of the behavior. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + While reports can be submitted in any language, please note that the working + group primarily operates in English. If you use translation tools to prepare your + report, please let us know so we can keep that in mind during our evaluation. We + will make every effort to work with reports submitted in any language. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + In your report please include: + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + The working group is committed to protecting your privacy and the privacy of all + individuals involved in Code of Conduct matters. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + Reports and the identity of reporters will be kept confidential to the extent + possible. The working group will not share reporter identities with the reported + party. However, in some situations, context may allow individuals to infer who + made a report. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + Personal information is: + {% endblocktranslate %} +
+ +{% blocktranslate trimmed %} - If you are unsure whether the incident is a violation, or whether the space - where it happened is covered by this Code of Conduct, we encourage you to still - report it. We would much rather have a few extra reports where we decide to take - no action, rather than miss a report of an actual violation. We do not look - negatively on you if we find the incident is not a violation. And knowing - about incidents that are not violations, or happen outside our spaces, can also - help us to improve the Code of Conduct or the processes surrounding it.{% endblocktranslate %}
+ For details on how records are maintained, see the Record + Keeping section below. + {% endblocktranslate %} + + +{% translate "In your report please include:" %} -
+ {% blocktranslate trimmed %} + Retaliation against anyone who reports a concern in good faith is itself a + violation of this Code of Conduct and will be treated seriously. If you + experience retaliation after making a report, please report that as well. + {% endblocktranslate %}
-{% blocktranslate trimmed %} You will receive an email from the DSF Code of Conduct Working Group - acknowledging receipt immediately. We promise to acknowledge receipt within 24 - hours (and will aim for much quicker than that).{% endblocktranslate %}
+ acknowledging receipt. The working group strives to respond promptly, recognizing + that as volunteers, coordination may take time. The working group will keep you + informed of progress and any delays. + {% endblocktranslate %} + -{% translate "The working group will immediately meet to review the incident and determine:" %} -
+ {% blocktranslate trimmed %} + The working group will immediately meet to review the incident and determine: + {% endblocktranslate %}
+{% blocktranslate trimmed %} If this is determined to be an ongoing incident or a threat to physical safety, - the working groups' immediate priority will be to protect everyone involved. - This means we may delay an "official" response until we believe that the - situation has ended and that everyone is physically safe.{% endblocktranslate %}
+ the working group's immediate priority will be to protect everyone involved. This + means we may delay an "official" response until we believe that the situation has + ended and that everyone is physically safe. + {% endblocktranslate %} + + ++ {% blocktranslate trimmed %} + Examples of ongoing incidents include: someone continuing to engage in harassment + on a forum, persistent unwelcome contact, or any situation where harmful behavior + is actively continuing. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + For ongoing situations or threats to safety, working group members may act + immediately (before reaching consensus) to protect community members. This can + include temporarily restricting someone's access to certain spaces or requiring + they avoid contact with specific individuals. See our Working + Group Manual for more details on how we handle urgent situations. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + The working group aims to have an initial response to you within one week of + receiving your report, though we recognize that complex cases may take longer. + We will keep you informed throughout the investigation process. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + The working group must agree on a resolution by consensus. If the working group + cannot reach consensus within a reasonable timeframe, the working group will turn + the matter over to the board for resolution. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + Once the working group has a complete account of the events, they will make a + decision as to how to respond using our Enforcement + Ladder. The enforcement ladder includes responses ranging from warnings to + permanent bans, with the goal of repairing harm while considering the incident's + impact on individuals and the community. Depending on the severity of a violation, + lower levels may be skipped. + {% endblocktranslate %} +
+ +{% blocktranslate trimmed %} - Once the working group has a complete account of the events they will make a - decision as to how to response. Responses may include:{% endblocktranslate %} -
{% blocktranslate trimmed %} - We'll respond within one week to the person who filed the report with either a - resolution or an explanation of why the situation is not yet resolved.{% endblocktranslate %}
+ However, the working group is not required to act on this feedback. The final + decision rests with the working group, using their best judgment to balance the + needs of the affected parties with the safety and health of the broader community. + {% endblocktranslate %} +{% blocktranslate trimmed %} - Once we've determined our final action, we'll contact the original reporter to - let them know what action (if any) we'll be taking. We'll take into account - feedback from the reporter on the appropriateness of our response, but we don't - guarantee we'll act on it.{% endblocktranslate %}
+ Once we've determined our final action, we'll contact you to let you know what + action (if any) we'll be taking. + {% endblocktranslate %} +{% blocktranslate trimmed %} Finally, the Working Group will make a report on the situation to the DSF board. - The board may choose to a public report of the incident.{% endblocktranslate %}
+ The board may choose to issue a public report of the incident. + {% endblocktranslate %} + + ++ {% blocktrans trimmed %} + Any member of the working group must immediately notify the other members in + writing (by disclosure on the report email thread) and recuse themselves from + handling a report if they: + {% endblocktrans %} +
-{% blocktranslate trimmed %} - If your report concerns a current member of the Code of Conduct working group, you - may not feel comfortable sending your report to the working group, as all members will - see the report.{% endblocktranslate %}
+ If your report concerns a current member of the Code of Conduct working group, + you may not feel comfortable sending your report to the working group, as all + members will see the report. + {% endblocktranslate %} +{% url 'members:teams' as teams_url %} {% blocktranslate trimmed %} - In that case, you can make a report directly to any or all of the current - (vice/co) chairs of the Code of Conduct working group. Their e-mail addresses are - listed on the Code of - Conduct working group page. The chairs will follow the usual enforcement - process with the other members, but will exclude the member(s) that the report - concerns from any discussion or decision making.{% endblocktranslate %}
+ In that case, you can make a report directly to any or all of the current chairs + of the Code of Conduct working group. Their email addresses are listed on the + Code of Conduct working + group page. The chairs will follow the usual enforcement process with the + other members, but will exclude the member(s) that the report concerns from any + discussion or decision making. + {% endblocktranslate %} +{% blocktranslate trimmed %} - If your report concerns all current (vice/co) chairs of the working group, please - send your report directly to the DSF board at + If your report concerns all current chairs of the working group, please send your + report directly to the DSF board at foundation@djangoproject.com - instead.{% endblocktranslate %}
+ instead. + {% endblocktranslate %} + -{% blocktranslate trimmed %} - Any of the parties directly involved or affected can request reconsideration - of the working group’s decision. To make such a request, contact the DSF Board at + Any of the parties directly involved or affected can request reconsideration of + the working group's decision. To make such a request, contact the DSF Board at foundation@djangoproject.com - with your request and motivation and the DSF board will review the case.{% endblocktranslate %}
+ with your request and motivation and the DSF board will review the case. + {% endblocktranslate %} + + ++ {% blocktranslate trimmed %} + The working group will never publicly discuss specific incidents. All public + statements about individual Code of Conduct matters will be made by the DSF board, + if deemed necessary. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + However, to demonstrate that the Code of Conduct is being actively and fairly + enforced, the working group will publish annual transparency reports including + anonymized statistics such as: + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + These reports will be prepared in a way that protects the confidentiality of all + involved parties while providing community accountability. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + The working group maintains records of all information and communications related + to incident reports, including: + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + Records are retained in accordance with the Django Software Foundation's data + retention policies and applicable privacy laws. + {% endblocktranslate %} +
+ ++ {% blocktranslate trimmed %} + All members of the working group involved in handling a specific incident report + have access to all records related to that report. This ensures informed + decision-making. The board may request access to records for oversight purposes. + {% endblocktranslate %} +
{% endblock %}