Skip to content

Commit cb50786

Browse files
avargitster
authored andcommitted
CoC: Update word-wrapping to match upstream
When the CoC document was added in 5cdf230 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 71ca53e commit cb50786

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

CODE_OF_CONDUCT.md

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ this code of conduct may be banned from the community.
1010

1111
In the interest of fostering an open and welcoming environment, we as
1212
contributors and maintainers pledge to make participation in our project and
13-
our community a harassment-free experience for everyone, regardless of age,
14-
body size, disability, ethnicity, sex characteristics, gender identity and
15-
expression, level of experience, education, socio-economic status,
16-
nationality, personal appearance, race, religion, or sexual identity and
17-
orientation.
13+
our community a harassment-free experience for everyone, regardless of age, body
14+
size, disability, ethnicity, sex characteristics, gender identity and expression,
15+
level of experience, education, socio-economic status, nationality, personal
16+
appearance, race, religion, or sexual identity and orientation.
1817

1918
## Our Standards
2019

@@ -52,23 +51,21 @@ threatening, offensive, or harmful.
5251

5352
## Scope
5453

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

6361
## Enforcement
6462

6563
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6664
reported by contacting the project team at [email protected]. All
67-
complaints will be reviewed and investigated and will result in a response
68-
that is deemed necessary and appropriate to the circumstances. The project
69-
team is obligated to maintain confidentiality with regard to the reporter of
70-
an incident. Further details of specific enforcement policies may be posted
71-
separately.
65+
complaints will be reviewed and investigated and will result in a response that
66+
is deemed necessary and appropriate to the circumstances. The project team is
67+
obligated to maintain confidentiality with regard to the reporter of an incident.
68+
Further details of specific enforcement policies may be posted separately.
7269

7370
Project maintainers who do not follow or enforce the Code of Conduct in good
7471
faith may face temporary or permanent repercussions as determined by other
@@ -84,8 +81,8 @@ [email protected], or individually:
8481

8582
## Attribution
8683

87-
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
88-
version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
84+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
85+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
8986

9087
[homepage]: https://www.contributor-covenant.org
9188

0 commit comments

Comments
 (0)