Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Apply suggestions from code review
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
  • Loading branch information
lpinca and aduh95 authored Jun 15, 2022
commit 31f38f6b15384ab7c2a4458a154bf90e72476b81
2 changes: 1 addition & 1 deletion doc/contributing/backporting-to-release-lines.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For the active staging branches see the [Release Schedule][].

## What needs to be backported?

If a cherry-pick from main does not land cleanly on a staging branch, the
If a cherry-pick from `main` does not land cleanly on a staging branch, the
releaser will mark the pull request with a particular label for that release
line (e.g. `backport-requested-vN.x`), specifying to our tooling that this
pull request should not be included. The releaser will then add a comment
Expand Down
12 changes: 6 additions & 6 deletions doc/contributing/collaborator-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ in the form:
For pull requests, it will look like `refs/pull/PR_NUMBER/head`
(e.g. for pull request #42 -> `refs/pull/42/head`).
* `REBASE_ONTO`: Change that to `origin/main` so the pull request gets rebased
onto main. This can especially be important for pull requests that have been
onto `main`. This can especially be important for pull requests that have been
open a while.

Look at the list of jobs on the left hand side under "Build History" and copy
Expand Down Expand Up @@ -337,7 +337,7 @@ 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.
`main` branch.

Examples of breaking changes include:

Expand Down Expand Up @@ -373,7 +373,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 main branch, a collaborator can revert
change. If such a change lands on the `main` 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 @@ -462,7 +462,7 @@ duration.

Communicate pending deprecations and associated mitigations with the ecosystem
as soon as possible. If possible, do it before the pull request adding the
deprecation lands on the main branch.
deprecation lands on the `main` branch.

Use the `notable-change` label on pull requests that add or change the
deprecation level of an API.
Expand Down Expand Up @@ -670,7 +670,7 @@ for that commit. This is an opportunity to fix commit messages.
pull request.
* Protects against the assumption that GitHub will be around forever.

Other changes might have landed on main since the successful CI run. As a
Other changes might have landed on `main` since the successful CI run. As a
precaution, run tests (`make -j4 test` or `vcbuild test`).

Confirm that the commit message format is correct using
Expand Down Expand Up @@ -755,7 +755,7 @@ the branch.
Each LTS release has a corresponding branch (v10.x, v8.x, etc.). Each also has a
corresponding staging branch (v10.x-staging, v8.x-staging, etc.).

Commits that land on main are cherry-picked to each staging branch as
Commits that land on `main` are cherry-picked to each staging branch as
appropriate. If a change applies only to the LTS branch, open the pull request
against the _staging_ branch. Commits from the staging branch land on the LTS
branch only when a release is being prepared. They might land on the LTS branch
Expand Down
2 changes: 1 addition & 1 deletion doc/contributing/commit-queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Commit Queue is an experimental feature for the project which simplifies the
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 main.
the Action will rebase it and push to `main`.

This document gives an overview of how the Commit Queue works, as well as
implementation details, reasoning for design choices, and current limitations.
Expand Down
2 changes: 1 addition & 1 deletion doc/contributing/diagnostic-tooling-support-tiers.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ the following tiers.
suite for the tool/API is not green. To be considered for inclusion
in this tier it must have a good test suite and that test suite and a job
must exist in the Node.js CI so that it can be run as part of the release
process. Tests on main will be run nightly when possible to provide
process. Tests on `main` will be run nightly when possible to provide
early warning of potential issues. No commit to the current and LTS
release branches should break this tool/API if the next major release
is within 1 month. In addition:
Expand Down
6 changes: 3 additions & 3 deletions doc/contributing/maintaining-V8.md
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,13 @@ to apply a minor update.

### Major updates

We upgrade the version of V8 in Node.js main whenever a V8 release goes stable
We upgrade the version of V8 in Node.js `main` whenever a V8 release goes stable
upstream, that is, whenever a new release of Chrome comes out.

Upgrading major versions would be much harder to do with the patch mechanism
above. A better strategy is to

1. Audit the current main branch and look at the patches that have been
1. Audit the current `main` branch and look at the patches that have been
floated since the last major V8 update.
2. Replace the copy of V8 in Node.js with a fresh checkout of the latest stable
V8 branch. Special care must be taken to recursively update the DEPS that V8
Expand Down Expand Up @@ -394,7 +394,7 @@ branches. This has several benefits:
* The history of the V8 branch in `nodejs/v8` becomes purer and it would make it
easier to pull in the V8 team for help with reviewing.
* It would make it simpler to setup an automated build that tracks Node.js
main + V8 lkgr integration build.
`main` + V8 lkgr integration build.

This would require some tooling to:

Expand Down
2 changes: 1 addition & 1 deletion doc/contributing/maintaining-openssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This document describes how to update `deps/openssl/`.
If you need to provide updates across all active release lines you will
currently need to generate four PRs as follows:

* a PR for main which is generated following the instructions
* a PR for `main` which is generated following the instructions
below for OpenSSL 3.x.x.
* a PR for 16.x following the instructions in the v16.x-staging version
of this guide.
Expand Down
2 changes: 1 addition & 1 deletion doc/contributing/writing-and-running-benchmarks.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ As an example on how to check for a possible performance improvement, the
an example. This pull request _claims_ to improve the performance of the
`node:string_decoder` module.

First build two versions of Node.js, one from the main branch (here called
First build two versions of Node.js, one from the `main` branch (here called
`./node-main`) and another with the pull request applied (here called
`./node-pr-5134`).

Expand Down
2 changes: 1 addition & 1 deletion doc/contributing/writing-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ will depend on what is being tested if this is required or not.
To generate a test coverage report, see the
[Test Coverage section of the Building guide][].

Nightly coverage reports for the Node.js main branch are available at
Nightly coverage reports for the Node.js `main` branch are available at
<https://coverage.nodejs.org/>.

[ASCII]: https://man7.org/linux/man-pages/man7/ascii.7.html
Expand Down