From a03aaba99678c41c6e06b6dd27c5ddfca1b01c86 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 16 Mar 2023 11:00:31 -0700 Subject: [PATCH] doc: update collaborator guide to reflect TSC changes Ref: https://github.com/nodejs/TSC/pull/1350 PR-URL: https://github.com/nodejs/node/pull/47126 Refs: https://github.com/nodejs/TSC/pull/1350 Reviewed-By: Antoine du Hamel Reviewed-By: Darshan Sen --- doc/contributing/collaborator-guide.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/contributing/collaborator-guide.md b/doc/contributing/collaborator-guide.md index 2670915c7abd79..84c5ea7396ce21 100644 --- a/doc/contributing/collaborator-guide.md +++ b/doc/contributing/collaborator-guide.md @@ -340,8 +340,8 @@ For undocumented APIs that are public, open a pull request documenting the API. ### Breaking changes -At least two TSC members must approve backward-incompatible changes to the -`main` branch. +At least two TSC voting members must approve backward-incompatible changes to +the `main` branch. Examples of breaking changes include: @@ -411,7 +411,7 @@ possible to avoid confusion and typosquatting attacks. For pull requests introducing new core modules: * Allow at least one week for review. -* Land only after sign-off from at least two TSC members. +* Land only after sign-off from at least two TSC voting members. * Land with a [Stability Index][] of Experimental. The module must remain Experimental until a semver-major release. @@ -742,7 +742,7 @@ git push upstream main ### I made a mistake -* Ping a TSC member. +* Ping a TSC voting member. * With `git`, there's a way to override remote trees by force pushing (`git push -f`). This is generally forbidden as it creates conflicts in other people's forks. It is permissible for simpler slip-ups such as typos in commit