Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
259d091
test: mark test-domain-error-types flaky
jasnell Jul 12, 2021
efe7474
stream: fixup property definition to avoid prototype polution
jasnell Jul 12, 2021
bbff5a9
doc: edit guide on pull requests
Trott Jul 11, 2021
d0fb02c
test: put common lint exceptions into config file
Trott Jul 11, 2021
a747257
build: add `library_files` to gyp variables
himself65 Jul 7, 2021
e5d6447
tools: use Node.js 16.x for GitHub workflow
Trott Jul 12, 2021
0f1d515
tools: change commit fetch limiting in find-inactive-collaborators
Trott Jul 12, 2021
39e6536
doc: move jdalton to emeritus
Trott Jul 14, 2021
fc13837
src: remove unused guards around node-api reference
legendecas Apr 21, 2021
e91053a
stream: implement TextEncoderStream and TextDecoderStream
jasnell Jul 11, 2021
25f45d5
build: update to setup-node@v2
Trott Jul 12, 2021
e44ccd9
doc: update AUTHORS
Trott Jul 12, 2021
cdf7251
process: add api to enable source-maps programmatically
legendecas Jun 19, 2021
9b15e5c
doc: update mailmap and deduplicate AUTHORS entry
Trott Jul 14, 2021
93eff3f
esm: refine ERR_REQUIRE_ESM errors
guybedford Jun 27, 2021
26ada49
stream: import internal/util/types instead
jasnell Jul 13, 2021
8b58e57
fs: fix FileHandle::ClosePromise to return persisted Promise
jasnell Jul 13, 2021
3751b92
debugger: rename internal module
Trott Jul 13, 2021
353a8bb
doc: standardize on not capitalizing _collaborator_
Trott Jul 13, 2021
c535956
doc: add instructions for core vuln files
danbev Jul 1, 2021
11482f0
doc: add docker-node and build-wg issue contents
danbev Jul 1, 2021
20124cc
doc: make minor edits to pull request text
Trott Jul 14, 2021
2cf52f8
src: set SSL_OP_ALLOW_CLIENT_RENEGOTIATION
danbev May 20, 2021
626eb07
deps: extract gtest source files to deps/googletest
legendecas Jul 14, 2021
6979313
doc: standardize on _pull request_
Trott Jul 14, 2021
a082a70
repl: enable --experimental-repl-await /w opt-out
hemanth Jul 8, 2021
eccc9a6
punycode: add pending deprecation
aduh95 Sep 7, 2020
20bb3f6
doc: add strategic initiatives from TSC repo
Trott Jul 15, 2021
9dd232c
deps: update to cjs-module-lexer@1.2.2
guybedford Jul 15, 2021
68fd6d5
url: prevent pathname setter from erasing path of path-only URLs
RaisinTen Jul 10, 2021
04355af
test: add NumberFormat resolvedOptions test
richardlau Jul 15, 2021
75130c9
doc: use _pull request_ instead of _PR_ in onboarding doc
Trott Jul 16, 2021
ac43e33
doc: update commit-queue.md to indicate GitHub Actions are checked
Trott Jul 16, 2021
c6a7c3d
tools: fix broken link hash
Trott Jul 18, 2021
95db544
debugger: validate sec-websocket-accept response header
copperwall Oct 20, 2020
a30d021
test: add test for WebSocket secret verification in debugger
Trott Jul 11, 2021
6d63965
doc: use a details tag for completed initiatves
Trott Jul 17, 2021
6b055f1
build: run workflows when a PR is ready for review
targos Jul 16, 2021
2b92b4e
doc: update mailmap and AUTHORS
Trott Jul 14, 2021
9932e35
doc: remove typo (extra ' character)
angrymouse Jul 17, 2021
94706c7
doc: revise strategic initiatives text
Trott Jul 17, 2021
5fdfcc0
doc: remove outdated step in onboarding exercise
Trott Jul 16, 2021
ade2eed
doc: fix broken internal link in http.md
Trott Jul 18, 2021
d059ed9
meta: add .mailmap entry for new email for existing contributor
Trott Jul 18, 2021
cefd2fb
doc: simplify .mailmap file
Trott Jul 17, 2021
19e9acc
inspector: mark as stable
gireeshpunathil Mar 14, 2021
4c32aa0
tools: added remark-frontmatter
benhalverson Mar 9, 2021
ce2011b
build: update coverage Makefile target comments
richardlau Jul 12, 2021
4fd8db6
doc: remove _Addenda_ from headers
Trott Jul 18, 2021
ae69656
doc: update checkbox label in backporting guide
RaisinTen Jul 17, 2021
9d950a0
http2: on receiving rst_stream with cancel code add it to pending list
kumarak Jul 17, 2021
5c11a02
tools: make internal link checker more robust
Trott Jul 18, 2021
7570f99
tools: email matchin is case insensitive for .mailmap
Trott Jul 18, 2021
aa1dfb3
doc: simplify unnecessarily specific .mailmap entries
Trott Jul 18, 2021
0a46e66
tools: use mailmap for find-inactive-collaborators
Trott Jul 19, 2021
902ef9a
doc,meta: update email addresses for misterdjules
Trott Jul 19, 2021
db4f802
Revert "test: skip tests for openssl-3.0.0-alpha15"
danbev Jul 19, 2021
b1d38dd
test: update OpenSSL3 error messages for beta-1
danbev Jul 19, 2021
e552b1a
doc: improve node.js+fips instructions
mayrbenjamin92 Jul 14, 2021
72ad6d3
fs: check closing_ in FileHandle::Close
jasnell Jul 20, 2021
89796d0
deps: bump HdrHistogram_C to 0.11.2
mcollina Jul 20, 2021
f0287e5
src: close HandleWraps instead of deleting them in OnGCCollect()
addaleax Jul 19, 2021
febeb0d
meta: update AUTHORS
Trott Jul 20, 2021
e18778d
async_hooks: eliminate native PromiseHook
Jun 24, 2021
b5248d4
async_hooks: emit promise trace events from JS
Jul 5, 2021
e2fd015
domain: do not add domain to promise from other context
Jul 5, 2021
e4331cd
lib: comment explaining special-case handling of promises
Jul 21, 2021
42ff6d9
src: print native module id on native module not found
legendecas Jul 20, 2021
cc7b617
doc,tools: remove `checkLinks.mjs`
aduh95 Jun 30, 2021
d16d36f
crypto: support Big(U)Int64Array in getRandomValues
targos Jul 19, 2021
e58cf4e
tools: flag README/mailmap mismatches in find-inactive-collaborators
Trott Jul 19, 2021
dc9c6aa
meta: align collaborator email in .mailmap/AUTHORS with README
Trott Jul 21, 2021
f6fbb38
meta: alphabetize .mailmap file
Trott Jul 21, 2021
9fbe3f6
meta: revise .mailmap for README consistency
Trott Jul 19, 2021
5f9b218
meta: align email address in README/.mailmap/AUTHORS
Trott Jul 24, 2021
d3f58cb
meta: align collaborator name in .mailmap/AUTHORS with README
Trott Jul 22, 2021
1d27ae1
doc: update strategic initiative champion
Trott Jul 22, 2021
5f84f47
doc: update AUTHORS
Trott Jul 22, 2021
487c45f
doc: move lball@redhat.com to emeritus
lance Jul 23, 2021
6f2989c
events: allow the options argument to be null
lpinca Jul 22, 2021
1fb0954
events: allow an event to be dispatched multiple times
lpinca Jul 15, 2021
039f64f
test: fix WASI link test
richardlau Jul 22, 2021
e1910ef
build: fix `host_arch_cc()` for AIX/IBM i
richardlau Jul 22, 2021
6114198
deps: update V8 to 9.2.230.21
targos Jul 20, 2021
5182e26
build: reset embedder string to "-node.0"
targos Jul 20, 2021
9082ece
deps: V8: un-cherry-pick bd019bd
refack Mar 27, 2019
38cb655
deps: V8: patch register-arm64.h
refack May 22, 2019
785b899
deps: V8: forward declaration of `Rtl*FunctionTable`
refack May 22, 2019
3f3e167
deps: make v8.h compatible with VS2015
joaocgreis Nov 1, 2019
98150e2
deps: fix V8 build issue with inline methods
gengjiawen Oct 14, 2020
16cbd8c
deps: silence irrelevant V8 warnings
targos Jan 30, 2021
7f7cb8b
deps: silence irrelevant V8 warning
targos May 1, 2021
5fe74aa
tools: update V8 gypfiles for 9.2
targos Apr 11, 2021
929205e
src: use non-deprecated Symbol::Description
targos Apr 14, 2021
b230ac1
src: stop using deprecated v8::ApiObject
targos Apr 26, 2021
bbcd651
test: update trace events test expectations
targos Apr 21, 2021
86ca9a8
test: remove test-debug-args
targos Apr 26, 2021
4709da0
test: ensure microtask queues are not automatically drained
jeisinger Apr 29, 2021
53cc6c8
deps: V8: cherry-pick 3d24b3ab8af0
targos Jun 10, 2021
794ad2e
deps: V8: backport 71e8f8bb3c26
targos Jun 16, 2021
201da87
deps: V8: cherry-pick 986299250e6d
richardlau Jun 16, 2021
c3efc70
deps: V8: cherry-pick a5cea1bfc38c
targos Jun 20, 2021
65062b3
deps: V8: cherry-pick 7ff6609a5385
targos Jun 20, 2021
c8e7d80
deps: V8: cherry-pick 53784bdb8f01
targos Jul 10, 2021
2393fae
deps: V8: cherry-pick 2b77ca200c56
targos Jul 10, 2021
e6b84df
deps: V8: cherry-pick 56fe020eec0c
targos Jul 10, 2021
c6ec2b4
deps: V8: cherry-pick 3805a698f7b6
targos Jul 10, 2021
d612544
deps: V8: cherry-pick 359d44df4cdd
targos Jul 10, 2021
a93e6ef
deps: V8: backport 5c76da8ddcf8
targos Jul 10, 2021
5517769
tools: fetch googletest dependency for V8 CI
targos Jul 14, 2021
e8da1f2
deps: make V8 9.2 abi-compatible with 9.0
targos Jul 20, 2021
0e5eb8b
deps: restore minimum ICU version to 68
targos Jul 20, 2021
864ef11
meta: update email address for collaborator
Trott Jul 25, 2021
6502011
meta: remove unneeded .mailmap entry
Trott Jul 25, 2021
0a47f5f
meta: update collaborator email in README
Trott Jul 24, 2021
90b9bb1
build: use Node.js 14 in commit-lint.yml
Trott Jul 24, 2021
8d2e66c
2021-07-29, Version 16.6.0 (Current)
BethGriggs Jul 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
doc: standardize on not capitalizing _collaborator_
Sometimes we capitalize _collaborator_ and sometimes not. After
consulting the Microsoft Style Guide and The Chicago Manual of Style,
I've concluded it is best to not capitalize it. For consistency, apply
that to our various .md files.

Refs: https://docs.microsoft.com/en-us/style-guide/capitalization

PR-URL: #39379
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Trott authored and BethGriggs committed Jul 29, 2021
commit 353a8bb27b699b53dec6deaca6a809b4f9291b92
50 changes: 25 additions & 25 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@ See:

## Collaborators

Node.js Core Collaborators maintain the [nodejs/node][] GitHub repository.
The GitHub team for Node.js Core Collaborators is @nodejs/collaborators.
Node.js core collaborators maintain the [nodejs/node][] GitHub repository.
The GitHub team for Node.js core collaborators is @nodejs/collaborators.
Collaborators have:

* Commit access to the [nodejs/node][] repository
* Access to the Node.js continuous integration (CI) jobs

Both Collaborators and non-Collaborators may propose changes to the Node.js
Both collaborators and non-collaborators may propose changes to the Node.js
source code. The mechanism to propose such a change is a GitHub pull request.
Collaborators review and merge (_land_) pull requests.

Two Collaborators must approve a pull request before the pull request can land.
(One Collaborator approval is enough if the pull request has been open for more
than 7 days.) Approving a pull request indicates that the Collaborator accepts
responsibility for the change. Approval must be from Collaborators who are not
Two collaborators must approve a pull request before the pull request can land.
(One collaborator approval is enough if the pull request has been open for more
than 7 days.) Approving a pull request indicates that the collaborator accepts
responsibility for the change. Approval must be from collaborators who are not
authors of the change.

If a Collaborator opposes a proposed change, then the change cannot land. The
If a collaborator opposes a proposed change, then the change cannot land. The
exception is if the TSC votes to approve the change despite the opposition.
Usually, involving the TSC is unnecessary. Often, discussions or further changes
result in Collaborators removing their opposition.
result in collaborators removing their opposition.

See:

* [List of Collaborators](./README.md#current-project-team-members)
* [A guide for Collaborators](./doc/guides/collaborator-guide.md)
* [List of collaborators](./README.md#current-project-team-members)
* [A guide for collaborators](./doc/guides/collaborator-guide.md)

### Collaborator activities

Expand All @@ -63,20 +63,20 @@ See:
* Participation in working groups
* Merging pull requests

The TSC can remove inactive Collaborators or provide them with _Emeritus_
The TSC can remove inactive collaborators or provide them with _Emeritus_
status. Emeriti may request that the TSC restore them to active status.

## Technical Steering Committee

A subset of the Collaborators forms the Technical Steering Committee (TSC).
A subset of the collaborators forms the Technical Steering Committee (TSC).
The TSC has final authority over this project, including:

* Technical direction
* Project governance and process (including this policy)
* Contribution policy
* GitHub repository hosting
* Conduct guidelines
* Maintaining the list of Collaborators
* Maintaining the list of collaborators

The current list of TSC members is in
[the project README](./README.md#current-project-team-members).
Expand All @@ -95,7 +95,7 @@ agenda is not to review or approve all patches. Collaborators review and approve
patches on GitHub.

Any community member can create a GitHub issue asking that the TSC review
something. If consensus-seeking fails for an issue, a Collaborator may apply the
something. If consensus-seeking fails for an issue, a collaborator may apply the
`tsc-agenda` label. That will add it to the TSC meeting agenda.

Before each TSC meeting, the meeting chair will share the agenda with members of
Expand All @@ -120,11 +120,11 @@ the issue tracker is:

## Collaborator nominations

Existing Collaborators can nominate someone to become a Collaborator. Nominees
Existing collaborators can nominate someone to become a collaborator. Nominees
should have significant and valuable contributions across the Node.js
organization.

To nominate a new Collaborator, open an issue in the [nodejs/node][] repository.
To nominate a new collaborator, open an issue in the [nodejs/node][] repository.
Provide a summary of the nominee's contributions. For example:

* Commits in the [nodejs/node][] repository.
Expand All @@ -144,25 +144,25 @@ Provide a summary of the nominee's contributions. For example:
organization
* Other participation in the wider Node.js community

Mention @nodejs/collaborators in the issue to notify other Collaborators about
Mention @nodejs/collaborators in the issue to notify other collaborators about
the nomination.

The nomination passes if no Collaborators oppose it after one week. Otherwise,
The nomination passes if no collaborators oppose it after one week. Otherwise,
the nomination fails.

There are steps a nominator can take in advance to make a nomination as
frictionless as possible. To request feedback from other Collaborators in
private, use the [Collaborators discussion page][]
(which only Collaborators may view). A nominator may also work with the
frictionless as possible. To request feedback from other collaborators in
private, use the [collaborators discussion page][]
(which only collaborators may view). A nominator may also work with the
nominee to improve their contribution profile.

Collaborators might overlook someone with valuable contributions. In that case,
the contributor may open an issue or contact a Collaborator to request a
the contributor may open an issue or contact a collaborator to request a
nomination.

### Onboarding

After the nomination passes, a TSC member onboards the new Collaborator. See
After the nomination passes, a TSC member onboards the new collaborator. See
[the onboarding guide](./onboarding.md) for details of the onboarding
process.

Expand All @@ -171,7 +171,7 @@ process.
The TSC follows a [Consensus Seeking][] decision-making model per the
[TSC Charter][].

[Collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
[Consensus Seeking]: https://en.wikipedia.org/wiki/Consensus-seeking_decision-making
[TSC Charter]: https://github.com/nodejs/TSC/blob/HEAD/TSC-Charter.md
[collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
[nodejs/node]: https://github.com/nodejs/node
40 changes: 20 additions & 20 deletions doc/guides/collaborator-guide.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Node.js Collaborator Guide
# Node.js collaborator guide

## Contents

Expand Down Expand Up @@ -36,14 +36,14 @@
* [How can I help?](#how-can-i-help)
* [Who to CC in the issue tracker](#who-to-cc-in-the-issue-tracker)

This document explains how Collaborators manage the Node.js project.
This document explains how collaborators manage the Node.js project.
Collaborators should understand the
[guidelines for new contributors](../../CONTRIBUTING.md) and the
[project governance model](../../GOVERNANCE.md).

## Issues and pull requests

Mind these guidelines, the opinions of other Collaborators, and guidance of the
Mind these guidelines, the opinions of other collaborators, and guidance of the
[TSC][]. Notify other qualified parties for more input on an issue or a pull
request. See [Who to CC in the issue tracker](#who-to-cc-in-the-issue-tracker).

Expand Down Expand Up @@ -71,7 +71,7 @@ issues and pull requests can always be re-opened if necessary.
A pull request is _author ready_ when:

* There is a CI run in progress or completed.
* There is at least one Collaborator approval.
* There is at least one collaborator approval.
* There are no outstanding review comments.

Please always add the `author ready` label to the pull request in that case.
Expand All @@ -83,7 +83,7 @@ When you open a pull request, [start a CI](#testing-and-ci) right away. Later,
after new code changes or rebasing, start a new CI.

As soon as the pull request is ready to land, please do so. This allows other
Collaborators to focus on other pull requests. If your pull request is not ready
collaborators to focus on other pull requests. If your pull request is not ready
to land but is [author ready](#author-ready-pull-requests), add the
`author ready` label. If you wish to land the pull request yourself, use the
"assign yourself" link to self-assign it.
Expand Down Expand Up @@ -113,25 +113,25 @@ issues. If a user opens a security issue in the public repository:
## Accepting modifications

Contributors propose modifications to Node.js using GitHub pull requests. This
includes modifications proposed by TSC members and other Collaborators. A pull
includes modifications proposed by TSC members and other collaborators. A pull
request must pass code review and CI before landing into the codebase.

### Code reviews

At least two Collaborators must approve a pull request before the pull request
lands. One Collaborator approval is enough if the pull request has been open
At least two collaborators must approve a pull request before the pull request
lands. One collaborator approval is enough if the pull request has been open
for more than seven days.

Approving a pull request indicates that the Collaborator accepts responsibility
Approving a pull request indicates that the collaborator accepts responsibility
for the change.

Approval must be from Collaborators who are not authors of the change.
Approval must be from collaborators who are not authors of the change.

In some cases, it might be necessary to summon a GitHub team to a pull request
for review by @-mention.
See [Who to CC in the issue tracker](#who-to-cc-in-the-issue-tracker).

If you are the first Collaborator to approve a pull request that has no CI yet,
If you are the first collaborator to approve a pull request that has no CI yet,
please [start one](#testing-and-ci). Please also start a new CI if the
pull request creator pushed new code since the last CI run.

Expand Down Expand Up @@ -173,7 +173,7 @@ adding the `tsc-agenda` label to the issue.

### Waiting for approvals

Before landing pull requests, allow 48 hours for input from other Collaborators.
Before landing pull requests, allow 48 hours for input from other collaborators.
Certain types of pull requests can be fast-tracked and can land after a shorter
delay. For example:

Expand All @@ -185,14 +185,14 @@ delay. For example:
* Regressions that happen right before a release, or reported soon after.

To propose fast-tracking a pull request, apply the `fast-track` label. Then add
a comment that Collaborators can upvote.
a comment that collaborators can upvote.

If someone disagrees with the fast-tracking request, remove the label. Do not
fast-track the pull request in that case.

The pull request can be fast-tracked if two Collaborators approve the
The pull request can be fast-tracked if two collaborators approve the
fast-tracking request. To land, the pull request itself still needs two
Collaborator approvals and a passing CI.
collaborator approvals and a passing CI.

Collaborators can request fast-tracking of pull requests they did not author.
In that case only, the request itself is also one fast-track approval. Upvote
Expand Down Expand Up @@ -372,7 +372,7 @@ providing a Public API in such cases.
#### Unintended breaking changes

Sometimes, a change intended to be non-breaking turns out to be a breaking
change. If such a change lands on the master branch, a Collaborator can revert
change. If such a change lands on the master branch, a collaborator can revert
it. As an alternative to reverting, the TSC can apply the semver-major label
after-the-fact.

Expand Down Expand Up @@ -474,7 +474,7 @@ Do this if a pull request or issue:
* Is labeled `semver-major`, or
* Has a significant impact on the codebase, or
* Is controversial, or
* Is at an impasse among Collaborators who are participating in the discussion.
* Is at an impasse among collaborators who are participating in the discussion.

@-mention the `@nodejs/tsc` GitHub team if you want to elevate an issue to the
[TSC][]. Do not use the GitHub UI on the right-hand side to assign to
Expand Down Expand Up @@ -659,7 +659,7 @@ for that commit. This is an opportunity to fix commit messages.
issue. A commit message can include more than one `Fixes:` lines.
* Optional: One or more `Refs:` lines referencing a URL for any relevant
background.
* Required: A `Reviewed-By: Name <email>` line for each Collaborator who
* Required: A `Reviewed-By: Name <email>` line for each collaborator who
reviewed the change.
* Useful for @mentions / contact list if something goes wrong in the
pull request.
Expand Down Expand Up @@ -775,7 +775,7 @@ There are several LTS-related labels:
release. For example, `land-on-v10.x` would be for a change to land in Node.js
10.x.

Any Collaborator can attach these labels to any pull request/issue. As commits
Any collaborator can attach these labels to any pull request/issue. As commits
land on the staging branches, the backporter removes the `lts-watch-` label.
Likewise, as commits land in an LTS release, the releaser removes the `land-on-`
label.
Expand Down Expand Up @@ -847,7 +847,7 @@ If you cannot find who to cc for a file, `git shortlog -n -s <file>` can help.

* `author-ready` - A pull request is _author ready_ when:
* There is a CI run in progress or completed.
* There is at least one Collaborator approval (or two TSC approvals for
* There is at least one collaborator approval (or two TSC approvals for
semver-major pull requests).
* There are no outstanding review comments.

Expand Down
6 changes: 3 additions & 3 deletions doc/guides/commit-queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*tl;dr: You can land Pull Requests by adding the `commit-queue` label to it.*

Commit Queue is an experimental feature for the project which simplifies the
landing process by automating it via GitHub Actions. With it, Collaborators can
landing process by automating it via GitHub Actions. With it, collaborators can
land Pull Requests by adding the `commit-queue` label to a PR. All
checks will run via node-core-utils, and if the Pull Request is ready to land,
the Action will rebase it and push to master.
Expand Down Expand Up @@ -48,7 +48,7 @@ of the commit queue:
commit that will be correctly handled by the [`--autosquash`](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash)
option
2. A CI must've ran and succeeded since the last change on the PR
3. A Collaborator must have approved the PR since the last change
3. A collaborator must have approved the PR since the last change
4. Only Jenkins CI is checked (Actions, V8 CI and CITGM are ignored)

## Implementation
Expand Down Expand Up @@ -108,7 +108,7 @@ until all PRs have done the steps above.

## Reverting broken commits

Reverting broken commits is done manually by Collaborators, just like when
Reverting broken commits is done manually by collaborators, just like when
commits are landed manually via `git node land`. An easy way to revert is a
good feature for the project, but is not explicitly required for the Commit
Queue to work because the Action lands PRs just like collaborators do today. If
Expand Down
20 changes: 10 additions & 10 deletions doc/guides/contributing/pull-requests.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Node.js. We cannot accept such patches.

In case of doubt, open an issue in the
[issue tracker](https://github.com/nodejs/node/issues/) or contact one of the
[project Collaborators](https://github.com/nodejs/node/#current-project-team-members).
[project collaborators](https://github.com/nodejs/node/#current-project-team-members).

Node.js has many channels on the
[OpenJS Foundation Slack](https://slack-invite.openjsf.org/). Interesting
Expand Down Expand Up @@ -335,7 +335,7 @@ unhelpful is likely safe to ignore.
### Step 10: Landing

In order to land, a Pull Request needs to be reviewed and [approved][] by
at least two Node.js Collaborators (one Collaborator approval is enough if the
at least two Node.js collaborators (one collaborator approval is enough if the
pull request has been open for more than 7 days) and pass a
[CI (Continuous Integration) test run][]. After that, as long as there are no
objections from other contributors, the Pull Request can be merged. If you find
Expand Down Expand Up @@ -391,7 +391,7 @@ change over time. The first impression you give to a new contributor never does.

Nits (requests for small changes that are not essential) are fine, but try to
avoid stalling the Pull Request. Most nits can typically be fixed by the
Node.js Collaborator landing the Pull Request but they can also be an
Node.js collaborator landing the Pull Request but they can also be an
opportunity for the contributor to learn a bit more about the project.

It is always good to clearly indicate nits when you comment: e.g.
Expand Down Expand Up @@ -434,7 +434,7 @@ commit.

### Approving a change

Any Node.js core Collaborator (any GitHub user with commit rights in the
Any Node.js core collaborator (any GitHub user with commit rights in the
`nodejs/node` repository) is authorized to approve any other contributor's
work. Collaborators are not permitted to approve their own Pull Requests.

Expand Down Expand Up @@ -503,9 +503,9 @@ feedback.
All Pull Requests that contain changes to code must be run through
continuous integration (CI) testing at [https://ci.nodejs.org/][].

Only Node.js core Collaborators with commit rights to the `nodejs/node`
Only Node.js core collaborators with commit rights to the `nodejs/node`
repository may start a CI testing run. The specific details of how to do
this are included in the new Collaborator [Onboarding guide][].
this are included in the new collaborator [Onboarding guide][].

Ideally, the code change will pass ("be green") on all platform configurations
supported by Node.js (there are over 30 platform configurations currently).
Expand Down Expand Up @@ -551,9 +551,9 @@ Every Pull Request needs to be tested
to make sure that it works on the platforms that Node.js
supports. This is done by running the code through the CI system.

Only a Collaborator can start a CI run. Usually one of them will do it
Only a collaborator can start a CI run. Usually one of them will do it
for you as approvals for the Pull Request come in.
If not, you can ask a Collaborator to start a CI run.
If not, you can ask a collaborator to start a CI run.

### Waiting until the pull request gets landed

Expand All @@ -567,7 +567,7 @@ widely used, so don't be discouraged!
### Check out the collaborator guide

If you want to know more about the code review and the landing process, see the
[Collaborator Guide][].
[collaborator guide][].

### Appendix: subsystems

Expand All @@ -583,10 +583,10 @@ More than one subsystem may be valid for any particular issue or pull request.
[Building guide]: ../../../BUILDING.md
[CI (Continuous Integration) test run]: #ci-testing
[Code of Conduct]: https://github.com/nodejs/admin/blob/HEAD/CODE_OF_CONDUCT.md
[Collaborator Guide]: ../collaborator-guide.md
[Onboarding guide]: ../../../onboarding.md
[approved]: #getting-approvals-for-your-pull-request
[benchmark results]: ../writing-and-running-benchmarks.md
[collaborator guide]: ../collaborator-guide.md
[guide for writing tests in Node.js]: ../writing-tests.md
[hiding-a-comment]: https://help.github.com/articles/managing-disruptive-comments/#hiding-a-comment
[https://ci.nodejs.org/]: https://ci.nodejs.org/
Expand Down
Loading