Skip to content

Commit

Permalink
Merge pull request #978 from EthicalSource/update-version-on-home-page
Browse files Browse the repository at this point in the history
Update version links
  • Loading branch information
CoralineAda committed Jul 29, 2021
2 parents 996b39e + b83c7b2 commit 619ea7f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
5 changes: 4 additions & 1 deletion changelog
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ inappropriate conduct that falls outside of the scope of the CoC
- Adds provisions against personal and political attacks
- Notes that maintainers are responsible for clarification of questions of acceptable behavior

2.0.0
2.0
- Emphasizes 'community' over 'project' scope, effectively merging the Community Covenant into the Contributor Covenant
- Adds expectation about accepting responsibility and apologizing to those affected by mistakes, and learning from the experience to the list
- Adds sexual attention and advances of any kind as unacceptable behavior example
- Moves enforcement responsibilities from project maintainers to community leaders
- Adds responsibility to communicate reasons for moderation decisions when removing, editing, or rejecting contributions not aligned to the Code of Conduct
- Requires community leaders to respect privacy and security of the reporter of any incident, not just confidentiality
- Provides a template for code of conduct enforcement

2.1
- Adds 'caste' and 'color' to the preamble
22 changes: 11 additions & 11 deletions content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Participating in open source is often a highly collaborative experience. We're e

Some open source projects attract enough contributors that a community forms. A healthy open source community centers the shared values and norms of its members. While not all of these values are the exactly the same from community to community, there is a set of _core values and norms_ that are essential in a just and equitable software commons.

Contributor Covenant is a code of conduct that you can adapt to express both these fundamental shared values, and the special norms and values that distinguish your own community.
Contributor Covenant is a code of conduct that you can adapt to express both these fundamental shared values, and the special norms and values that distinguish your own community.

Adopting Contributor Covenant helps makes your community's values explicit, and signals your commitment to creating a welcoming and safe environment for everyone.

Expand All @@ -28,13 +28,13 @@ These resources may be helpful in preparing for enforcement discussions:
- [jQuery Foundation Code of Conduct Enforcement Manual](https://js.foundation/community/code-of-conduct/enforcement)
- [How Mozilla is Making Code of Conduct Enforcement Real - and Scaling It](https://medium.com/mozilla-open-innovation/how-were-making-code-of-conduct-enforcement-real-and-scaling-it-3e382cf94415)

## Contributor Covenant v2.0
## Contributor Covenant v2.1

You can access the latest version of Contributor Covenant (2.0) here:
You can access the latest version of Contributor Covenant (2.1) here:

- [English (Markdown version)]({{< ref "/version/2/0/code_of_conduct.md" "markdown" >}})
- [English (HTML version)]({{< ref "/version/2/0/code_of_conduct.md" >}})
- [English (text version)]({{< ref "/version/2/0/code_of_conduct.md" "plaintext" >}})
- [English (Markdown version)]({{< ref "/version/2/1/code_of_conduct.md" "markdown" >}})
- [English (HTML version)]({{< ref "/version/2/1/code_of_conduct.md" >}})
- [English (text version)]({{< ref "/version/2/1/code_of_conduct.md" "plaintext" >}})

If you are not a native English speaker, you may find a volunteer-created translation of Contributor Covenant in your native language on the [translations page]({{< ref "translations.md" >}}).

Expand All @@ -43,20 +43,20 @@ Contributor Covenant uses semantic versioning for its revisions, so all URLs are

## How to Adopt Contributor Covenant

Your code of conduct should be easy to locate, whether as page on your community's website or a CODE_OF_CONDUCT.md file in the root directory of your project's repository.
Your code of conduct should be easy to locate, whether as page on your community's website or a CODE_OF_CONDUCT.md file in the root directory of your project's repository.

*You must add a contact method to the placeholder in the document* so that people know how to report violations.
*You must add a contact method to the placeholder in the document* so that people know how to report violations.

If you are using a README file in your source code repository, you can display a badge like this one ![Contributor Covenant Badge](https://img.shields.io/badge/Contributor%20Covenant-2.0-4baaaa.svg).
If you are using a README file in your source code repository, you can display a badge like this one ![Contributor Covenant Badge](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg).

For markdown files, use this code:
```
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.0-4baaaa.svg)](code_of_conduct.md)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
```
For reStructuredText files, place `|Contributor Covenant|` where you would like the badge and add this to the bottom of the file:
```
.. |Contributor Covenant| image:: https://img.shields.io/badge/Contributor%20Covenant-2.0-4baaaa.svg
.. |Contributor Covenant| image:: https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg
:target: code_of_conduct.md
```

Expand Down
3 changes: 2 additions & 1 deletion layouts/shortcodes/previous-versions.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<a href="{{ ref $.Page "/version/1/1/0/code-of-conduct.md" }}">1.1</a>,
<a href="{{ ref $.Page "/version/1/2/0/code-of-conduct.md" }}">1.2</a>,
<a href="{{ ref $.Page "/version/1/3/0/code-of-conduct.md" }}">1.3</a>,
and <a href="{{ ref $.Page "/version/1/4/code-of-conduct.md" }}">1.4</a>.
<a href="{{ ref $.Page "/version/1/4/code-of-conduct.md" }}">1.4</a>, and
<a href="{{ ref $.Page "/version/2/0/code_of_conduct.md" }}">2.0</a>.

0 comments on commit 619ea7f

Please sign in to comment.