vs-code06
diff --git a/‎content/community/code-of-conduct/contents.lr
Lines changed: 68 additions & 47 deletions b/‎content/community/code-of-conduct/contents.lr
Lines changed: 68 additions & 47 deletions
diff --git a/‎content/community/code-of-conduct/enforcement/contents.lr
Lines changed: 63 additions & 29 deletions b/‎content/community/code-of-conduct/enforcement/contents.lr
Lines changed: 63 additions & 29 deletions
@@ -10,76 +10,97 @@ body:
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at **[conduct@creativecommons.org]((mailto:conduct@creativecommons.org)**. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies: [Codes of Conduct Enforcement](/community/code-of-conduct/enforcement/).
+reported to the community leaders responsible for enforcement at
+**[conduct@creativecommons.org](mailto:conduct@creativecommons.org)**.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+Further details of specific enforcement policies: [Codes of Conduct
+Enforcement](/community/code-of-conduct/enforcement/).
+
+## Last Revised
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+- 2022-05-11
+- For a detailed list of changes, see [History for
+  content/community/code-of-conduct/contents.lr -
+  creativecommons/creativecommons.github.io-source][commits].
+
+[commits]: https://github.com/creativecommons/creativecommons.github.io-source/commits/main/content/community/code-of-conduct/contents.lr
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html.
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq.
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
 
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
@@ -11,13 +11,14 @@ body:
 This document provides incident reporting guidelines and an enforcement manual
 for the following codes of conduct used by Creative Commons:
 
+- [Terms of Use - Creative Commons][terms-of-use]
 - [CC Open Source Code of Conduct][foss-conduct]
 - [Slack/Code of Conduct][slack-conduct]
 
+[terms-of-use]: https://creativecommons.org/terms/
 [foss-conduct]: /community/code-of-conduct/
 [slack-conduct]: https://wiki.creativecommons.org/wiki/Slack/Code_of_Conduct
 
-
 ## Reporting Guidelines
 
 If you believe someone is violating the code of conduct, we ask that you report
@@ -31,7 +32,7 @@ instruct us otherwise.
 [conduct-email]: mailto:conduct@creativecommons.org
 
 **If you believe anyone is in physical danger, please notify appropriate
-emergency personnel first.** If you are unsure what proper authorities  are
+emergency personnel first.** If you are unsure what proper authorities are
 appropriate, please include this in your report and we will attempt to notify
 them.
 
@@ -53,7 +54,7 @@ In your report please include:
   a mailing list archive or a Slack message) please include a link.
 - Any extra context for the incident.
 - If you believe this incident is ongoing.
-- Any other information the committee  should have.
+- Any other information the committee should have.
 
 ### Conflicts of Interest
 
@@ -81,11 +82,9 @@ of "project maintainers" as described in the Contributor Covenant.
 
 ### Current Code of Conduct Committee
 
-- [Eric Steuer][cc-eric]
 - [Mari Moreshead][cc-mari]
 - [Timid Robot Zehta][cc-timidrobot]
 
-[cc-eric]: https://creativecommons.org/author/ericcreativecommons-org/
 [cc-mari]: https://creativecommons.org/author/maricreativecommons-org/
 [cc-timidrobot]: https://creativecommons.org/author/timidcreativecommons-org/
 
@@ -131,36 +130,65 @@ Commons.
 In situations where an individual committee member acts unilaterally, they must
 report their actions to the committee for review within 1 business day.
 
-### Resolutions
+### Enforcement Guidelines
+
+The committee will follow the Community Impact Guidelines, below, in
+determining the consequences for any action they deem in violation of this Code
+of Conduct.
 
 The committee should strive to agree on a resolution by consensus (i.e. no one
 on the committee chooses to veto the course of action). As soon as the
-committee determines it is unable to reach consensus or  it has been deadlocked
+committee determines it is unable to reach consensus or it has been deadlocked
 for over 2 business days after acknowledging receipt of the issue, the
 committee will turn the matter over to the CC legal team for resolution.
 
-Possible responses may include:
-
-- Taking no further action (if the committee determines no violation
-  occurred).
-- A private reprimand from the committee to the individual(s) involved. In this
-  case, a committee member will deliver that reprimand to the individual(s)
-  directly through appropriate means, cc'ing the committee.
-- A public reprimand. In this case, a committee member will attempt to deliver
-  that reprimand in the same venue that the violation occurred (i.e. in Slack
-  for an Slack violation; email for an email violation, etc.). The committee may
-  choose to publish this message elsewhere for posterity.
-- A temporary or permanent ban from some or all Creative Commons spaces
-  (mailing lists, Slack, etc.). The committee will maintain records of all such
-  bans so that they may be reviewed in the future, extended to new Creative
-  Commons fora, or otherwise maintained.
-
 Once a resolution is agreed upon, but before it is enacted, the committee will
 contact the original reporter and any other affected parties and explain the
 proposed resolution. The committee will ask if this resolution is acceptable,
 and must note feedback for the record. However, the committee is not required
 to act on this feedback.
 
+#### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+#### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+#### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+#### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
 ### Reconsideration
 
 Any of the parties directly involved or affected can request reconsideration of
@@ -176,19 +204,25 @@ comply with the current policy.
 
 ### Last Revised
 
-- 2019-03-06
-- For a detailed list of changes, see [History for
-  content/community/code-of-conduct/enforcement/contents.lr -
-  creativecommons/creativecommons.github.io-source][commits].
+- 2021-05-11
+- For a detailed list of changes, see [History for content/community/code-of-conduct/enforcement/contents.lr - creativecommons/creativecommons.github.io-source][commits].
 
-[commits]: https://github.com/creativecommons/vocabulary/commits/main/content/community/code-of-conduct/enforcement/contents.lr
+[commits]: https://github.com/creativecommons/creativecommons.github.io-source/commits/main/content/community/code-of-conduct/enforcement/contents.lr
 
 ## Attribution
 
 This document is adapted from the Django project's Code of Conduct [enforcement
 manual][django-enforce] and [reporting guidelines][django-report], licensed
 under [CC BY 3.0][cc-by-30].
+under [CC BY 3.0][cc-by-30] and  the [Contributor Covenant][homepage], version
+2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 [django-enforce]: https://www.djangoproject.com/conduct/enforcement-manual/
 [django-report]: https://www.djangoproject.com/conduct/reporting/
 [cc-by-30]: https://creativecommons.org/licenses/by/3.0/
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity