From d008b7d76f98c3c50f0fc7c07dda5dfb0331c20f Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 6 Jan 2023 13:30:21 -0500 Subject: [PATCH 1/6] doc: add text around collaborative expectations - add text discussed by the TSC Signed-off-by: Michael Dawson --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 01fea35069a42e..0faef3b23e3369 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,14 @@ The Node.js project uses an [open governance model](./GOVERNANCE.md). The **This project has a [Code of Conduct][].** +In addition to the code of conduct requirements, contributors to the +Node.js project are expected to act in a collaborative manner to move +the project forward. We encourage the constructive exchange of contrary +opinions and compromise. Contributors who repeatedly act in ways that +discourage, exhaust, or otherwise negatively affect other contributors +will be limited in the roles they are allowed to hold or blocked +from the project completely. + ## Table of contents * [Support](#support) From 51e0afddee629b32c3956185eea0a776070f9712 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Mon, 9 Jan 2023 11:03:39 -0500 Subject: [PATCH 2/6] incorporate suggestions Co-authored-by: Rich Trott --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0faef3b23e3369..004829c10430d1 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ The Node.js project uses an [open governance model](./GOVERNANCE.md). The In addition to the code of conduct requirements, contributors to the Node.js project are expected to act in a collaborative manner to move the project forward. We encourage the constructive exchange of contrary -opinions and compromise. Contributors who repeatedly act in ways that -discourage, exhaust, or otherwise negatively affect other contributors -will be limited in the roles they are allowed to hold or blocked -from the project completely. +opinions and compromise. The +[TSC](https://github.com/nodejs/node/blob/main/GOVERNANCE.md#technical-steering-committee) +reserves the right to limit or block contributors who repeatedly act in +ways that discourage, exhaust, or otherwise negatively affect other participants. ## Table of contents From 66a777f48bd7e7d025d10fddb9462d2b4c0b80df Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Mon, 9 Jan 2023 12:30:31 -0500 Subject: [PATCH 3/6] Update README.md Co-authored-by: Antoine du Hamel --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 004829c10430d1..15fecf102ec0eb 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ Node.js project are expected to act in a collaborative manner to move the project forward. We encourage the constructive exchange of contrary opinions and compromise. The [TSC](https://github.com/nodejs/node/blob/main/GOVERNANCE.md#technical-steering-committee) -reserves the right to limit or block contributors who repeatedly act in -ways that discourage, exhaust, or otherwise negatively affect other participants. +reserves the right to limit or block contributors who repeatedly act in ways +that discourage, exhaust, or otherwise negatively affect other participants. ## Table of contents From 42021186d58a51111245ce62e621f42a4e65b6ff Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Mon, 9 Jan 2023 12:30:41 -0500 Subject: [PATCH 4/6] Update README.md Co-authored-by: Antoine du Hamel --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 15fecf102ec0eb..4e5141cfff57a9 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ The Node.js project uses an [open governance model](./GOVERNANCE.md). The In addition to the code of conduct requirements, contributors to the Node.js project are expected to act in a collaborative manner to move the project forward. We encourage the constructive exchange of contrary -opinions and compromise. The -[TSC](https://github.com/nodejs/node/blob/main/GOVERNANCE.md#technical-steering-committee) +opinions and compromise. The [TSC](./GOVERNANCE.md#technical-steering-committee) reserves the right to limit or block contributors who repeatedly act in ways that discourage, exhaust, or otherwise negatively affect other participants. From cc7fc168272b13081bab5f7eaa1809de797dc69d Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Mon, 9 Jan 2023 14:40:29 -0500 Subject: [PATCH 5/6] incorporate suggestions Co-authored-by: Rich Trott --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e5141cfff57a9..651a9430eb4e5c 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ The Node.js project uses an [open governance model](./GOVERNANCE.md). The **This project has a [Code of Conduct][].** -In addition to the code of conduct requirements, contributors to the -Node.js project are expected to act in a collaborative manner to move +Contributors are expected to act in a collaborative manner to move the project forward. We encourage the constructive exchange of contrary opinions and compromise. The [TSC](./GOVERNANCE.md#technical-steering-committee) reserves the right to limit or block contributors who repeatedly act in ways From febcd9ec19f7a83e5d3b1565ffb5f9834d6b4c75 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Mon, 9 Jan 2023 14:41:01 -0500 Subject: [PATCH 6/6] incorporate suggested changes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 651a9430eb4e5c..d0dd932c72102d 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ For information on using Node.js, see the [Node.js website][]. The Node.js project uses an [open governance model](./GOVERNANCE.md). The [OpenJS Foundation][] provides support for the project. -**This project has a [Code of Conduct][].** - Contributors are expected to act in a collaborative manner to move the project forward. We encourage the constructive exchange of contrary opinions and compromise. The [TSC](./GOVERNANCE.md#technical-steering-committee) reserves the right to limit or block contributors who repeatedly act in ways that discourage, exhaust, or otherwise negatively affect other participants. +**This project has a [Code of Conduct][].** + ## Table of contents * [Support](#support)