Minimise diff between our CoC & upstream by adjusting titles & newlines

[eemeli]

As identified in far too many discussions, our upstream CoC is not stable. This PR does not apply any changes to the textual content of our CoC, but adjusts the line wrapping and title levels to minimise the difference between our text and the latest upstream text, v2.1.

After this is merged, it becomes somewhat easier to consider each of the four remaining parts of the diff separately:

1. Embedding the doc to within our CODE_OF_CONDUCT.md

Skipping here all the text before the --- separator.

--- /tmp/upstream-coc.md	2023-02-08 14:22:10
+++ /tmp/openjsf-coc.md	2023-02-08 14:41:36
@@ -1,17 +1,12 @@
-+++
-version = "2.1"
-aliases = ["/version/2/1"]
-+++
-
-# Contributor Covenant Code of Conduct
+_Contributor Covenant Code of Conduct v2.0, from [commit 8001bf8](https://github.com/EthicalSource/contributor_covenant/blob/8001bf8c6e7cd2606657e2816710770d8a79b7dc/content/version/2/0/code_of_conduct.md)_

 ## Our Pledge

2. Adding our contact methods

--- /tmp/upstream-coc.md	2023-02-08 14:22:10
+++ /tmp/openjsf-coc.md	2023-02-08 14:41:36
@@ -65,7 +60,9 @@

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+the email addresses listed above in the
+[Reporting](#report-an-issue-in-a-project) and
+[Escalation](#escalate-an-issue) sections.
 All complaints will be reviewed and investigated promptly and fairly.

 All community leaders are obligated to respect the privacy and security of the

3. Differences between the v2.0 and v2.1 versions of the upstream

The terms "caste" and "color" were added in v2.1.

--- /tmp/upstream-coc.md	2023-02-08 14:22:10
+++ /tmp/openjsf-coc.md	2023-02-08 14:41:36
@@ -10,17 +5,12 @@
 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
+nationality, personal appearance, race, religion, or sexual
 identity and orientation.

 We pledge to act and interact in ways that contribute to an open, welcoming,
@@ -120,13 +117,13 @@
 ## Attribution

 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].
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].

 Community Impact Guidelines were inspired by
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
@@ -131,7 +128,7 @@
 [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
+[v2.0]: https://www.contributor-covenant.org/version/2/0/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

4. Retaining the "project" specifier for perma-bans

This was dropped from the upstream after our copy was taken as an apparently missed part of the v1.4 -> v2.0 updates.

--- /tmp/upstream-coc.md	2023-02-08 14:22:10
+++ /tmp/openjsf-coc.md	2023-02-08 14:41:36
@@ -115,13 +112,13 @@
 individual, or aggression toward or disparagement of classes of individuals.

 **Consequence**: A permanent ban from any sort of public interaction within the
-community.
+project community.

 ## Attribution

[eemeli]

Requesting fast-tracking for this, as its a purely stylistic change which makes comparisons to the upstream much easier.

[ljharb]

The soft wrapping was an intentional decision - hard wrapping is horrific for editing and diff churn - but i agree that creating an excessive diff from upstream isn't worth the benefit.

[tobie]

<3 <3 <3

[eemeli]

@ljharb:
The soft wrapping was an intentional decision - hard wrapping is horrific for editing and diff churn - but i agree that creating an excessive diff from upstream isn't worth the benefit.

Actually, we never changed the wrapping from how it was when we copied it. It's the upstream that has subsequently applied hard wrapping to the text. This change aligns our wrapping with the current state of the upstream v2.1 text, effectively backporting stylistic updates to our copy.

[ljharb]

@eemeli ah, i'd remembered it wrong. then it's just a really unfortunate upstream decision.

[bnb]

I believe we agreed to ship this today because it's supposed to minimize the diff prior to landing #972