diff --git a/CHANGELOG.md b/CHANGELOG.md index a1a164265cdec6..339ad6ac2d0503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1838,7 +1838,7 @@ will be removed at a later point. (Roman Reiss) [#1363](https://github.com/nodej This prevents a situation in which parsing the version number can use exponentially more time and memory to parse, leading to a potential denial of service. Thanks to Adam Baldwin at Lift Security for bringing this to our - attention. ([@isaacs](https://github.com/isaacs)) + attention. ([@isaacs](https://github.com/isaacs)) * [`eab6184`](https://github.com/npm/npm/commit/eab618425c51e3aa4416da28dcd8ca4ba63aec41) [#7766](https://github.com/npm/npm/issues/7766) One last tweak to ensure that GitHub shortcuts work with private repositories. @@ -2215,7 +2215,7 @@ will be removed at a later point. (Roman Reiss) [#1363](https://github.com/nodej [#1999](https://github.com/npm/npm/issues/1999) Only run `stop` and `start` scripts (plus their pre- and post- scripts) when there's no `restart` script defined. This makes it easier to support graceful restarts of services - managed by npm. ([@watilde](https://github.com/watilde) / + managed by npm. ([@watilde](https://github.com/watilde) / [@scien](https://github.com/scien)) * [`448efd0`](https://github.com/npm/npm/commit/448efd0eaa6f97af0889bf47efc543a1ea2f8d7e) [#2853](https://github.com/npm/npm/issues/2853) Add support for `--dev` and @@ -2977,7 +2977,7 @@ https://iojs.org/api/http.html - Added `request.flush` method. - Added `response.getHeader('header')` method that may be used before headers are flushed. - Added `response.statusMessage` property. -- Added Client Keep-Alive behavior. Set `keepAlive:true` in request options to reuse connections indefinitely. +- Added Client Keep-Alive behavior. Set `keepAlive:true` in request options to reuse connections indefinitely. - Added `rawHeaders` and `rawTrailers` members on incoming message. - Removed default chunked encoding on `DELETE` and `OPTIONS`. @@ -6342,7 +6342,7 @@ https://github.com/nodejs/node/commit/f711d5343b29d1e72e87107315708e40951a7826 pipeline * Bugfix: http.Client may be prematurely released back to the - free pool. (Thomas Lee) + free pool. (Thomas Lee) * Upgrade V8 to 2.2.8 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3b3bf08b538707..8da5d14f8ad63d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,21 +45,21 @@ and built upon. The rules for the master branch are less strict; consult the [stability index](./doc/api/documentation.markdown#stability-index) for details. -In a nutshell, modules are at varying levels of API stability. Bug fixes are +In a nutshell, modules are at varying levels of API stability. Bug fixes are always welcome but API or behavioral changes to modules at stability level 3 (Locked) are off-limits. #### Dependencies Node.js has several bundled dependencies in the *deps/* and the *tools/* -directories that are not part of the project proper. Any changes to files +directories that are not part of the project proper. Any changes to files in those directories or its subdirectories should be sent to their respective -projects. Do not send your patch to us, we cannot accept it. +projects. Do not send your patch to us, we cannot accept it. 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). -([IRC](http://webchat.freenode.net/?channels=io.js) is often the best medium.) Especially do so if you plan to work on something big. Nothing is more +([IRC](http://webchat.freenode.net/?channels=io.js) is often the best medium.) Especially do so if you plan to work on something big. Nothing is more frustrating than seeing your hard work go to waste because your vision does not align with the project team. @@ -81,8 +81,8 @@ $ git config --global user.name "J. Random User" $ git config --global user.email "j.random.user@example.com" ``` -Writing good commit logs is important. A commit log should describe what -changed and why. Follow these guidelines when writing one: +Writing good commit logs is important. A commit log should describe what +changed and why. Follow these guidelines when writing one: 1. The first line should be 50 characters or less and contain a short description of the change prefixed with the name of the changed @@ -124,15 +124,15 @@ $ git rebase upstream/master ### Step 5: Test -Bug fixes and features **should come with tests**. Add your tests in the -test/parallel/ directory. Look at other tests to see how they should be +Bug fixes and features **should come with tests**. Add your tests in the +test/parallel/ directory. Look at other tests to see how they should be structured (license boilerplate, common includes, etc.). ```text $ ./configure && make -j8 test ``` -Make sure the linter is happy and that all tests pass. Please, do not submit +Make sure the linter is happy and that all tests pass. Please, do not submit patches that fail either check. If you are updating tests and just want to run a single test to check it, you @@ -160,9 +160,9 @@ $ git push origin my-feature-branch Go to https://github.com/yourusername/node and select your feature branch. Click the 'Pull Request' button and fill out the form. -Pull requests are usually reviewed within a few days. If there are comments +Pull requests are usually reviewed within a few days. If there are comments to address, apply your changes in a separate commit and push that to your -feature branch. Post a comment in the pull request afterwards; GitHub does +feature branch. Post a comment in the pull request afterwards; GitHub does not send out notifications when you add commits. @@ -201,7 +201,7 @@ CoC](http://www.rust-lang.org/conduct.html). * Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works. * We will exclude you from interaction if you insult, demean or harass - anyone. That is not welcome behavior. We interpret the term + anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read @@ -211,11 +211,11 @@ CoC](http://www.rust-lang.org/conduct.html). you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the TC members immediately with a capture (log, photo, email) of - the harassment if possible. Whether you're a regular contributor or + the harassment if possible. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back. * Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. * Avoid the use of personal pronouns in code comments or documentation. There is no need to address persons when explaining - code (e.g. "When the developer") + code (e.g. "When the developer"). diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 3a7237215bad2a..7981c5070acdd1 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -63,7 +63,7 @@ A guide for Collaborators is maintained in ## TC Membership -TC seats are not time-limited. There is no fixed size of the TC. +TC seats are not time-limited. There is no fixed size of the TC. However, the expected target is between 6 and 12, to ensure adequate coverage of important areas of expertise, balanced with the ability to make decisions efficiently. @@ -80,7 +80,7 @@ Changes to TC membership should be posted in the agenda, and may be suggested as any other agenda item (see "TC Meetings" below). No more than 1/3 of the TC members may be affiliated with the same -employer. If removal or resignation of a TC member, or a change of +employer. If removal or resignation of a TC member, or a change of employment by a TC member, creates a situation where more than 1/3 of the TC membership shares an employer, then the situation must be immediately remedied by the resignation or removal of one or more TC diff --git a/README.md b/README.md index 7e7b17470f4513..c6b366223eaf5c 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ enabled by default. #### "small" (English only) support This option will build with "small" (English only) support, but -the full `Intl` (ECMA-402) APIs. With `--download=all` it will +the full `Intl` (ECMA-402) APIs. With `--download=all` it will download the ICU library as needed. Unix / Macintosh: @@ -264,11 +264,11 @@ It is possible to build Node.js with [OpenSSL FIPS module](https://www.openssl.org/docs/fips/fipsnotes.html). **Note** that building in this way does **not** allow you to -claim that the runtime is FIPS 140-2 validated. Instead you -can indicate that the runtime uses a validated module. See +claim that the runtime is FIPS 140-2 validated. Instead you +can indicate that the runtime uses a validated module. See the [security policy] (http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp1747.pdf) -page 60 for more details. In addition, the validation for +page 60 for more details. In addition, the validation for the underlying module is only valid if it is deployed in accordance with its [security policy] (http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp1747.pdf). diff --git a/WORKING_GROUPS.md b/WORKING_GROUPS.md index 60e7d6437d3795..c66bb9d52d5967 100644 --- a/WORKING_GROUPS.md +++ b/WORKING_GROUPS.md @@ -340,7 +340,7 @@ For the current list of Collaborators, see the project ### WG Membership -WG seats are not time-limited. There is no fixed size of the WG. +WG seats are not time-limited. There is no fixed size of the WG. However, the expected target is between 6 and 12, to ensure adequate coverage of important areas of expertise, balanced with the ability to make decisions efficiently. @@ -358,14 +358,14 @@ suggested as any other agenda item (see "WG Meetings" below). If an addition or removal is proposed during a meeting, and the full WG is not in attendance to participate, then the addition or removal -is added to the agenda for the subsequent meeting. This is to ensure +is added to the agenda for the subsequent meeting. This is to ensure that all members are given the opportunity to participate in all -membership decisions. If a WG member is unable to attend a meeting +membership decisions. If a WG member is unable to attend a meeting where a planned membership decision is being made, then their consent is assumed. No more than 1/3 of the WG members may be affiliated with the same -employer. If removal or resignation of a WG member, or a change of +employer. If removal or resignation of a WG member, or a change of employment by a WG member, creates a situation where more than 1/3 of the WG membership shares an employer, then the situation must be immediately remedied by the resignation or removal of one or more WG @@ -416,7 +416,7 @@ either a closing vote or a vote to table the issue to the next meeting. The call for a vote must be seconded by a majority of the WG or else the discussion will continue. Simple majority wins. -Note that changes to WG membership require unanimous consensus. See +Note that changes to WG membership require unanimous consensus. See "WG Membership" above. ### Developer's Certificate of Origin 1.0 @@ -454,7 +454,7 @@ CoC](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct). * Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works. * We will exclude you from interaction if you insult, demean or harass - anyone. That is not welcome behaviour. We interpret the term + anyone. That is not welcome behaviour. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read @@ -464,7 +464,7 @@ CoC](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct). you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the TC members immediately with a capture (log, photo, email) of - the harassment if possible. Whether you're a regular contributor or + the harassment if possible. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back. * Likewise any spamming, trolling, flaming, baiting or other