mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CoC: Update word-wrapping to match upstream

Browse Source 
When the CoC document was added in 5cdf2301d4 (add a Code of Conduct
document, 2019-09-24) it was added from some 1.4 version of the
document whose word wrapping doesn't match what's currently at [1],
which matches content/version/1/4/code-of-conduct.md in the CoC
repository[2].

Let's update our version to match that, to make reading subsequent
diffs easier. There are no non-whitespace changes here.

1. https://www.contributor-covenant.org/version/1/4/code-of-conduct/
2. https://github.com/ContributorCovenant/contributor_covenant

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2020-12-28 18:17:33 +01:00
committed by Junio C Hamano
parent 71ca53e812
commit cb50786f49
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
CODE_OF_CONDUCT.md
View File

@ -10,11 +10,10 @@ this code of conduct may be banned from the community.
In the interest of fostering an open and welcoming environment, we as In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to make participation in our project and contributors and maintainers pledge to make participation in our project and
our community a harassment-free experience for everyone, regardless of age, our community a harassment-free experience for everyone, regardless of age, body
body size, disability, ethnicity, sex characteristics, gender identity and size, disability, ethnicity, sex characteristics, gender identity and expression,
expression, level of experience, education, socio-economic status, level of experience, education, socio-economic status, nationality, personal
nationality, personal appearance, race, religion, or sexual identity and appearance, race, religion, or sexual identity and orientation.
orientation.
## Our Standards ## Our Standards
@ -52,23 +51,21 @@ threatening, offensive, or harmful.
## Scope ## Scope
This Code of Conduct applies within all project spaces, and it also applies This Code of Conduct applies within all project spaces, and it also applies when
when an individual is representing the project or its community in public an individual is representing the project or its community in public spaces.
spaces. Examples of representing a project or community include using an Examples of representing a project or community include using an official
official project e-mail address, posting via an official social media account, project e-mail address, posting via an official social media account, or acting
or acting as an appointed representative at an online or offline event. as an appointed representative at an online or offline event. Representation of
Representation of a project may be further defined and clarified by project a project may be further defined and clarified by project maintainers.
maintainers.
## Enforcement ## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at git@sfconservancy.org. All reported by contacting the project team at git@sfconservancy.org. All
complaints will be reviewed and investigated and will result in a response complaints will be reviewed and investigated and will result in a response that
that is deemed necessary and appropriate to the circumstances. The project is deemed necessary and appropriate to the circumstances. The project team is
team is obligated to maintain confidentiality with regard to the reporter of obligated to maintain confidentiality with regard to the reporter of an incident.
an incident. Further details of specific enforcement policies may be posted Further details of specific enforcement policies may be posted separately.
separately.
Project maintainers who do not follow or enforce the Code of Conduct in good 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 faith may face temporary or permanent repercussions as determined by other
@ -84,8 +81,8 @@ git@sfconservancy.org, or individually:
## Attribution ## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
[homepage]: https://www.contributor-covenant.org [homepage]: https://www.contributor-covenant.org