Skip to content

Commit f9a22d0

Browse files
authored
Merge pull request creativecommons#653 from creativecommons/contributor-covenant-v2.1
update for Contributor Covenant v2.1
2 parents 663e537 + b6cd587 commit f9a22d0

File tree

2 files changed

+132
-77
lines changed

2 files changed

+132
-77
lines changed

content/community/code-of-conduct/contents.lr

Lines changed: 69 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,82 +4,103 @@ _template: page-with-toc.html
44
---
55
title: CC Open Source Code of Conduct
66
---
7-
description: The following Code of Conduct applies to all digital spaces managed by the Creative Commons engineering team, including GitHub, mailing lists, IRC and any other spaces which the development community uses for communication. Our Slack code of conduct is separate and <a href=" https://wiki.creativecommons.org/wiki/Slack/Code_of_Conduct">can be found here</a>.
7+
description: The following Code of Conduct applies to all digital spaces managed by the Creative Commons technology team, including GitHub, mailing lists, and any other spaces which the development community uses for communication. Our Slack code of conduct is separate and <a href=" https://wiki.creativecommons.org/wiki/Slack/Code_of_Conduct">can be found here</a>.
88
---
99
body:
1010

1111
## Our Pledge
1212

13-
In the interest of fostering an open and welcoming environment, we as
14-
contributors and maintainers pledge to making participation in our project and
15-
our community a harassment-free experience for everyone, regardless of age, body
16-
size, disability, ethnicity, sex characteristics, gender identity and expression,
17-
level of experience, education, socio-economic status, nationality, personal
18-
appearance, race, religion, or sexual identity and orientation.
13+
We as members, contributors, and leaders pledge to make participation in our
14+
community a harassment-free experience for everyone, regardless of age, body
15+
size, visible or invisible disability, ethnicity, sex characteristics, gender
16+
identity and expression, level of experience, education, socio-economic status,
17+
nationality, personal appearance, race, caste, color, religion, or sexual
18+
identity and orientation.
19+
20+
We pledge to act and interact in ways that contribute to an open, welcoming,
21+
diverse, inclusive, and healthy community.
1922

2023
## Our Standards
2124

22-
Examples of behavior that contributes to creating a positive environment
23-
include:
25+
Examples of behavior that contributes to a positive environment for our
26+
community include:
2427

25-
* Using welcoming and inclusive language
26-
* Being respectful of differing viewpoints and experiences
27-
* Gracefully accepting constructive criticism
28-
* Focusing on what is best for the community
29-
* Showing empathy towards other community members
28+
* Demonstrating empathy and kindness toward other people
29+
* Being respectful of differing opinions, viewpoints, and experiences
30+
* Giving and gracefully accepting constructive feedback
31+
* Accepting responsibility and apologizing to those affected by our mistakes,
32+
and learning from the experience
33+
* Focusing on what is best not just for us as individuals, but for the overall
34+
community
3035

31-
Examples of unacceptable behavior by participants include:
36+
Examples of unacceptable behavior include:
3237

33-
* The use of sexualized language or imagery and unwelcome sexual attention or
34-
advances
35-
* Trolling, insulting/derogatory comments, and personal or political attacks
38+
* The use of sexualized language or imagery, and sexual attention or advances of
39+
any kind
40+
* Trolling, insulting or derogatory comments, and personal or political attacks
3641
* Public or private harassment
37-
* Publishing others' private information, such as a physical or electronic
38-
address, without explicit permission
42+
* Publishing others' private information, such as a physical or email address,
43+
without their explicit permission
3944
* Other conduct which could reasonably be considered inappropriate in a
4045
professional setting
4146

42-
## Our Responsibilities
47+
## Enforcement Responsibilities
4348

44-
Project maintainers are responsible for clarifying the standards of acceptable
45-
behavior and are expected to take appropriate and fair corrective action in
46-
response to any instances of unacceptable behavior.
49+
Community leaders are responsible for clarifying and enforcing our standards of
50+
acceptable behavior and will take appropriate and fair corrective action in
51+
response to any behavior that they deem inappropriate, threatening, offensive,
52+
or harmful.
4753

48-
Project maintainers have the right and responsibility to remove, edit, or
49-
reject comments, commits, code, wiki edits, issues, and other contributions
50-
that are not aligned to this Code of Conduct, or to ban temporarily or
51-
permanently any contributor for other behaviors that they deem inappropriate,
52-
threatening, offensive, or harmful.
54+
Community leaders have the right and responsibility to remove, edit, or reject
55+
comments, commits, code, wiki edits, issues, and other contributions that are
56+
not aligned to this Code of Conduct, and will communicate reasons for moderation
57+
decisions when appropriate.
5358

5459
## Scope
5560

56-
This Code of Conduct applies both within project spaces and in public spaces
57-
when an individual is representing the project or its community. Examples of
58-
representing a project or community include using an official project e-mail
59-
address, posting via an official social media account, or acting as an appointed
60-
representative at an online or offline event. Representation of a project may be
61-
further defined and clarified by project maintainers.
61+
This Code of Conduct applies within all community spaces, and also applies when
62+
an individual is officially representing the community in public spaces.
63+
Examples of representing our community include using an official e-mail address,
64+
posting via an official social media account, or acting as an appointed
65+
representative at an online or offline event.
6266

6367
## Enforcement
6468

6569
Instances of abusive, harassing, or otherwise unacceptable behavior may be
66-
reported by contacting the project team at **[conduct@creativecommons.org]((mailto:conduct@creativecommons.org)**. All
67-
complaints will be reviewed and investigated and will result in a response that
68-
is deemed necessary and appropriate to the circumstances. The project team is
69-
obligated to maintain confidentiality with regard to the reporter of an incident.
70-
Further details of specific enforcement policies: [Codes of Conduct Enforcement](/community/code-of-conduct/enforcement/).
70+
reported to the community leaders responsible for enforcement at
71+
**[conduct@creativecommons.org](mailto:conduct@creativecommons.org)**.
72+
All complaints will be reviewed and investigated promptly and fairly.
73+
74+
All community leaders are obligated to respect the privacy and security of the
75+
reporter of any incident.
76+
77+
Further details of specific enforcement policies: [Codes of Conduct
78+
Enforcement](/community/code-of-conduct/enforcement/).
79+
80+
## Last Revised
7181

72-
Project maintainers who do not follow or enforce the Code of Conduct in good
73-
faith may face temporary or permanent repercussions as determined by other
74-
members of the project's leadership.
82+
- 2022-05-11
83+
- For a detailed list of changes, see [History for
84+
content/community/code-of-conduct/contents.lr -
85+
creativecommons/creativecommons.github.io-source][commits].
86+
87+
[commits]: https://github.com/creativecommons/creativecommons.github.io-source/commits/main/content/community/code-of-conduct/contents.lr
7588

7689
## Attribution
7790

78-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
79-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html.
91+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
92+
version 2.1, available at
93+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
8094

81-
[homepage]: https://www.contributor-covenant.org
95+
Community Impact Guidelines were inspired by
96+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
8297

83-
For answers to common questions about this code of conduct, see
84-
https://www.contributor-covenant.org/faq.
98+
For answers to common questions about this code of conduct, see the FAQ at
99+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
100+
[https://www.contributor-covenant.org/translations][translations].
85101

102+
[homepage]: https://www.contributor-covenant.org
103+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
104+
[Mozilla CoC]: https://github.com/mozilla/diversity
105+
[FAQ]: https://www.contributor-covenant.org/faq
106+
[translations]: https://www.contributor-covenant.org/translations

content/community/code-of-conduct/enforcement/contents.lr

Lines changed: 63 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ body:
1111
This document provides incident reporting guidelines and an enforcement manual
1212
for the following codes of conduct used by Creative Commons:
1313

14+
- [Terms of Use - Creative Commons][terms-of-use]
1415
- [CC Open Source Code of Conduct][foss-conduct]
1516
- [Slack/Code of Conduct][slack-conduct]
1617

18+
[terms-of-use]: https://creativecommons.org/terms/
1719
[foss-conduct]: /community/code-of-conduct/
1820
[slack-conduct]: https://wiki.creativecommons.org/wiki/Slack/Code_of_Conduct
1921

20-
2122
## Reporting Guidelines
2223

2324
If you believe someone is violating the code of conduct, we ask that you report
@@ -31,7 +32,7 @@ instruct us otherwise.
3132
[conduct-email]: mailto:conduct@creativecommons.org
3233

3334
**If you believe anyone is in physical danger, please notify appropriate
34-
emergency personnel first.** If you are unsure what proper authorities are
35+
emergency personnel first.** If you are unsure what proper authorities are
3536
appropriate, please include this in your report and we will attempt to notify
3637
them.
3738

@@ -53,7 +54,7 @@ In your report please include:
5354
a mailing list archive or a Slack message) please include a link.
5455
- Any extra context for the incident.
5556
- If you believe this incident is ongoing.
56-
- Any other information the committee should have.
57+
- Any other information the committee should have.
5758

5859
### Conflicts of Interest
5960

@@ -81,11 +82,9 @@ of "project maintainers" as described in the Contributor Covenant.
8182

8283
### Current Code of Conduct Committee
8384

84-
- [Eric Steuer][cc-eric]
8585
- [Mari Moreshead][cc-mari]
8686
- [Timid Robot Zehta][cc-timidrobot]
8787

88-
[cc-eric]: https://creativecommons.org/author/ericcreativecommons-org/
8988
[cc-mari]: https://creativecommons.org/author/maricreativecommons-org/
9089
[cc-timidrobot]: https://creativecommons.org/author/timidcreativecommons-org/
9190

@@ -131,36 +130,65 @@ Commons.
131130
In situations where an individual committee member acts unilaterally, they must
132131
report their actions to the committee for review within 1 business day.
133132

134-
### Resolutions
133+
### Enforcement Guidelines
134+
135+
The committee will follow the Community Impact Guidelines, below, in
136+
determining the consequences for any action they deem in violation of this Code
137+
of Conduct.
135138

136139
The committee should strive to agree on a resolution by consensus (i.e. no one
137140
on the committee chooses to veto the course of action). As soon as the
138-
committee determines it is unable to reach consensus or it has been deadlocked
141+
committee determines it is unable to reach consensus or it has been deadlocked
139142
for over 2 business days after acknowledging receipt of the issue, the
140143
committee will turn the matter over to the CC legal team for resolution.
141144

142-
Possible responses may include:
143-
144-
- Taking no further action (if the committee determines no violation
145-
occurred).
146-
- A private reprimand from the committee to the individual(s) involved. In this
147-
case, a committee member will deliver that reprimand to the individual(s)
148-
directly through appropriate means, cc'ing the committee.
149-
- A public reprimand. In this case, a committee member will attempt to deliver
150-
that reprimand in the same venue that the violation occurred (i.e. in Slack
151-
for an Slack violation; email for an email violation, etc.). The committee may
152-
choose to publish this message elsewhere for posterity.
153-
- A temporary or permanent ban from some or all Creative Commons spaces
154-
(mailing lists, Slack, etc.). The committee will maintain records of all such
155-
bans so that they may be reviewed in the future, extended to new Creative
156-
Commons fora, or otherwise maintained.
157-
158145
Once a resolution is agreed upon, but before it is enacted, the committee will
159146
contact the original reporter and any other affected parties and explain the
160147
proposed resolution. The committee will ask if this resolution is acceptable,
161148
and must note feedback for the record. However, the committee is not required
162149
to act on this feedback.
163150

151+
#### 1. Correction
152+
153+
**Community Impact**: Use of inappropriate language or other behavior deemed
154+
unprofessional or unwelcome in the community.
155+
156+
**Consequence**: A private, written warning from community leaders, providing
157+
clarity around the nature of the violation and an explanation of why the
158+
behavior was inappropriate. A public apology may be requested.
159+
160+
#### 2. Warning
161+
162+
**Community Impact**: A violation through a single incident or series of
163+
actions.
164+
165+
**Consequence**: A warning with consequences for continued behavior. No
166+
interaction with the people involved, including unsolicited interaction with
167+
those enforcing the Code of Conduct, for a specified period of time. This
168+
includes avoiding interactions in community spaces as well as external channels
169+
like social media. Violating these terms may lead to a temporary or permanent
170+
ban.
171+
172+
#### 3. Temporary Ban
173+
174+
**Community Impact**: A serious violation of community standards, including
175+
sustained inappropriate behavior.
176+
177+
**Consequence**: A temporary ban from any sort of interaction or public
178+
communication with the community for a specified period of time. No public or
179+
private interaction with the people involved, including unsolicited interaction
180+
with those enforcing the Code of Conduct, is allowed during this period.
181+
Violating these terms may lead to a permanent ban.
182+
183+
#### 4. Permanent Ban
184+
185+
**Community Impact**: Demonstrating a pattern of violation of community
186+
standards, including sustained inappropriate behavior, harassment of an
187+
individual, or aggression toward or disparagement of classes of individuals.
188+
189+
**Consequence**: A permanent ban from any sort of public interaction within the
190+
community.
191+
164192
### Reconsideration
165193

166194
Any of the parties directly involved or affected can request reconsideration of
@@ -176,19 +204,25 @@ comply with the current policy.
176204

177205
### Last Revised
178206

179-
- 2019-03-06
180-
- For a detailed list of changes, see [History for
181-
content/community/code-of-conduct/enforcement/contents.lr -
182-
creativecommons/creativecommons.github.io-source][commits].
207+
- 2021-05-11
208+
- For a detailed list of changes, see [History for content/community/code-of-conduct/enforcement/contents.lr - creativecommons/creativecommons.github.io-source][commits].
183209

184-
[commits]: https://github.com/creativecommons/vocabulary/commits/main/content/community/code-of-conduct/enforcement/contents.lr
210+
[commits]: https://github.com/creativecommons/creativecommons.github.io-source/commits/main/content/community/code-of-conduct/enforcement/contents.lr
185211

186212
## Attribution
187213

188214
This document is adapted from the Django project's Code of Conduct [enforcement
189215
manual][django-enforce] and [reporting guidelines][django-report], licensed
190-
under [CC BY 3.0][cc-by-30].
216+
under [CC BY 3.0][cc-by-30] and the [Contributor Covenant][homepage], version
217+
2.1, available at
218+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
219+
220+
Community Impact Guidelines were inspired by
221+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
191222

192223
[django-enforce]: https://www.djangoproject.com/conduct/enforcement-manual/
193224
[django-report]: https://www.djangoproject.com/conduct/reporting/
194225
[cc-by-30]: https://creativecommons.org/licenses/by/3.0/
226+
[homepage]: https://www.contributor-covenant.org
227+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
228+
[Mozilla CoC]: https://github.com/mozilla/diversity

0 commit comments

Comments
 (0)