CoC: Update word-wrapping to match upstream
When the CoC document was added in 5cdf2301d4a (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>
Ævar Arnfjörð Bjarmason committed
Dec 28, 2020 at 18:17 UTC
cb50786f495ed5e3af51cc8fece6e4605ded51ee
1 file changed
+16
-19
CODE_OF_CONDUCT.md
+16
-19
@@ -10,11 +10,10 @@ this code of conduct may be banned from the community.
10
11
In the interest of fostering an open and welcoming environment, we as
12
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.
17
18
## Our Standards
19
@@ -52,23 +51,21 @@ threatening, offensive, or harmful.
51
52
## Scope
53
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.
60
61
## Enforcement
62
63
Instances of abusive, harassing, or otherwise unacceptable behavior may be
64
reported by contacting the project team at git@sfconservancy.org. 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.
69
70
Project maintainers who do not follow or enforce the Code of Conduct in good
71
faith may face temporary or permanent repercussions as determined by other
@@ -84,8 +81,8 @@ git@sfconservancy.org, or individually:
81
82
## Attribution
83
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
86
87
[homepage]: https://www.contributor-covenant.org
88