v4.x backport: test,doc: clarify buf.indexOf(num) input range

.eslintignore

@@ -2,7 +2,7 @@ lib/internal/v8_prof_polyfill.js
 lib/punycode.js
 test/addons/??_*/
 test/fixtures
-test/**/node_modules
 test/disabled
 test/tmp*/
-tools/doc/node_modules
+tools/eslint
+node_modules

.eslintrc

@@ -54,6 +54,7 @@ rules:
 
   # Stylistic Issues
   # http://eslint.org/docs/rules/#stylistic-issues
+  brace-style: [2, "1tbs", {allowSingleLine: true}]
   comma-spacing: 2
   eol-last: 2
   indent: [2, 2, {SwitchCase: 1}]

.gitignore

@@ -42,6 +42,7 @@ ipch/
 *.opensdf
 *.VC.opendb
 .vs/
+.vscode/
 
 /config.mk
 /config.gypi

.remarkrc

@@ -0,0 +1,35 @@
+{
+  "plugins": {
+    "remark-lint": {
+      "code-block-style": false,
+      "definition-case": false,
+      "emphasis-marker": false,
+      "first-heading-level": false,
+      "heading-increment": false,
+      "list-item-content-indent": false,
+      "list-item-bullet-indent": false,
+      "list-item-indent": false,
+      "list-item-spacing": false,
+      "maximum-heading-length": false,
+      "maximum-line-length": false,
+      "no-consecutive-blank-lines": false,
+      "no-duplicate-headings": false,
+      "no-emphasis-as-heading": false,
+      "no-file-name-articles": false,
+      "no-file-name-irregular-characters": false,
+      "no-heading-punctuation": false,
+      "no-html": false,
+      "no-inline-padding": false,
+      "no-shell-dollars": false,
+      "no-shortcut-reference-link": false,
+      "no-literal-urls": false,
+      "no-missing-blank-lines": false,
+      "no-multiple-toplevel-headings": false,
+      "no-undefined-references": false,
+      "ordered-list-marker-style": false,
+      "ordered-list-marker-value": false,
+      "table-pipe-alignment": false,
+      "unordered-list-marker-style": false
+    }
+  }
+}

COLLABORATOR_GUIDE.md

@@ -60,12 +60,20 @@ and work schedules. Trivial changes (e.g. those which fix minor bugs
 or improve performance without affecting API or causing other
 wide-reaching impact) may be landed after a shorter delay.
 
-Where there is no disagreement amongst Collaborators, a pull request
-may be landed given appropriate review. Where there is discussion
+For non-breaking changes, if there is no disagreement amongst Collaborators, a
+pull request may be landed given appropriate review. Where there is discussion
 amongst Collaborators, consensus should be sought if possible. The
 lack of consensus may indicate the need to elevate discussion to the
 CTC for resolution (see below).
 
+Breaking changes (that is, pull requests that require an increase in the
+major version number, known as `semver-major` changes) must be elevated for
+review by the CTC. This does not necessarily mean that the PR must be put onto
+the CTC meeting agenda. If multiple CTC members approve (`LGTM`) the PR and no
+Collaborators oppose the PR, it can be landed. Where there is disagreement among
+CTC members or objections from one or more Collaborators, `semver-major` pull
+requests should be put on the CTC meeting agenda.
+
 All bugfixes require a test case which demonstrates the defect. The
 test should *fail* before the change, and *pass* after the change.
 

CONTRIBUTING.md

@@ -75,10 +75,10 @@ does not align with the project team. Node.js has two IRC channels,
 
 ### Step 2: Branch
 
-Create a feature branch and start hacking:
+Create a branch and start hacking:
 
 ```text
-$ git checkout -b my-feature-branch -t origin/master
+$ git checkout -b my-branch -t origin/master
 ```
 
 ### Step 3: Commit
@@ -136,23 +136,35 @@ $ git fetch upstream
 $ git rebase upstream/master
 ```
 
-
 ### Step 5: Test
 
 Bug fixes and features **should come with tests**. Add your tests in the
 `test/parallel/` directory. For guidance on how to write a test for the Node.js
 project, see this [guide](./doc/guides/writing_tests.md). Looking at other tests
 to see how they should be structured can also help.
 
+To run the tests on Unix / OS X:
+
 ```text
 $ ./configure && make -j8 test
 ```
 
+Windows:
+
+```text
+> vcbuild test
+```
+
+(See the [BUILDING.md](./BUILDING.md) for more details.)
+
 Make sure the linter is happy and that all tests pass. Please, do not submit
 patches that fail either check.
 
-Running `make test` will run the linter as well unless one or more tests fail.
-If you want to run the linter without running tests, use `make lint`.
+Running `make test`/`vcbuild test` will run the linter as well unless one or
+more tests fail.
+
+If you want to run the linter without running tests, use
+`make lint`/`vcbuild jslint`.
 
 If you are updating tests and just want to run a single test to check it, you
 can use this syntax to run it exactly as the test harness would:
@@ -173,15 +185,15 @@ core modules.
 ### Step 6: Push
 
 ```text
-$ git push origin my-feature-branch
+$ git push origin my-branch
 ```
 
-Go to https://github.com/yourusername/node and select your feature branch.
+Go to https://github.com/yourusername/node and select your branch.
 Click the 'Pull Request' button and fill out the form.
 
 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
+branch. Post a comment in the pull request afterwards; GitHub does
 not send out notifications when you add commits.
 
 <a id="developers-certificate-of-origin"></a>

GOVERNANCE.md

@@ -2,8 +2,8 @@
 
 ## Core Technical Committee
 
-The Node.js project is jointly governed by a Core Technical Committee (CTC)
-which is responsible for high-level guidance of the project.
+The Node.js project is governed by a Core Technical Committee (CTC) which is
+responsible for high-level guidance of the project.
 
 The CTC has final authority over this project including:
 
@@ -14,11 +14,6 @@ The CTC has final authority over this project including:
 * Conduct guidelines
 * Maintaining the list of additional Collaborators
 
-Initial membership invitations to the CTC were given to individuals who
-had been active contributors to Node.js, and who have significant
-experience with the management of the Node.js project. Membership is
-expected to evolve over time according to the needs of the project.
-
 For the current list of CTC members, see the project
 [README.md](./README.md#current-project-team-members).
 
@@ -46,8 +41,8 @@ responsibility for the change. In the case of pull requests proposed
 by an existing Collaborator, an additional Collaborator is required
 for sign-off. Consensus should be sought if additional Collaborators
 participate and there is disagreement around a particular
-modification. See [Consensus Seeking Process](#consensus-seeking-process) below for further detail
-on the consensus model used for governance.
+modification. See [Consensus Seeking Process](#consensus-seeking-process) below
+for further detail on the consensus model used for governance.
 
 Collaborators may opt to elevate significant or controversial
 modifications, or modifications that have not found consensus to the
@@ -61,6 +56,20 @@ For the current list of Collaborators, see the project
 A guide for Collaborators is maintained in
 [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md).
 
+### Collaborator Activities
+
+Typical activities of a Collaborator include:
+
+* helping users and novice contributors
+* contributing code and documentation changes that improve the project
+* reviewing and commenting on issues and pull requests
+* participation in working groups
+* merging pull requests
+
+While the above are typical things done by Collaborators, there are no required
+activities to retain Collaborator status. There is currently no process by which
+inactive Collaborators are removed from the project.
+
 ## CTC Membership
 
 CTC seats are not time-limited. There is no fixed size of the CTC. The CTC
@@ -72,11 +81,15 @@ membership beyond these rules.
 
 The CTC may add additional members to the CTC by a standard CTC motion.
 
-A CTC member may be removed from the CTC by voluntary resignation, or by
-a standard CTC motion.
+When a CTC member's participation in [CTC activities](#ctc-activities) has become
+minimal for a sustained period of time, the CTC will request that the member
+either indicate an intention to increase participation or voluntarily resign.
+
+CTC members may only be removed by voluntary resignation or through a standard
+CTC motion.
 
 Changes to CTC membership should be posted in the agenda, and may be
-suggested as any other agenda item (see "CTC Meetings" below).
+suggested as any other agenda item (see [CTC Meetings](#ctc-meetings) below).
 
 No more than 1/3 of the CTC members may be affiliated with the same
 employer.  If removal or resignation of a CTC member, or a change of
@@ -85,11 +98,24 @@ the CTC membership shares an employer, then the situation must be
 immediately remedied by the resignation or removal of one or more CTC
 members affiliated with the over-represented employer(s).
 
-## CTC Meetings
+### CTC Activities
+
+Typical activities of a CTC member include:
+
+* attending the weekly meeting
+* commenting on the weekly CTC meeting issue and issues labeled `ctc-agenda`
+* participating in CTC email threads
+* volunteering for tasks that arise from CTC meetings and related discussions
+* other activities (beyond those typical of Collaborators) that facilitate the
+  smooth day-to-day operation of the Node.js project
+
+Note that CTC members are also Collaborators and therefore typically perform
+Collaborator activities as well.
+
+### CTC Meetings
 
-The CTC meets weekly on a Google Hangout On Air. The meeting is run by
-a designated moderator approved by the CTC. Each meeting should be
-published to YouTube.
+The CTC meets weekly in a voice conference call. The meeting is run by a
+designated moderator approved by the CTC. Each meeting is streamed on YouTube.
 
 Items are added to the CTC agenda which are considered contentious or
 are modifications of governance, contribution policy, CTC membership,
@@ -100,32 +126,33 @@ That should happen continuously on GitHub and be handled by the larger
 group of Collaborators.
 
 Any community member or contributor can ask that something be added to
-the next meeting's agenda by logging a GitHub Issue. Any Collaborator,
+the next meeting's agenda by logging a GitHub issue. Any Collaborator,
 CTC member or the moderator can add the item to the agenda by adding
 the ***ctc-agenda*** tag to the issue.
 
-Prior to each CTC meeting, the moderator will share the Agenda with
-members of the CTC. CTC members can add any items they like to the
-agenda at the beginning of each meeting. The moderator and the CTC
-cannot veto or remove items.
+Prior to each CTC meeting, the moderator will share the agenda with
+members of the CTC. CTC members can also add items to the agenda at the
+beginning of each meeting. The moderator and the CTC cannot veto or remove
+items.
 
 The CTC may invite persons or representatives from certain projects to
 participate in a non-voting capacity.
 
-The moderator is responsible for summarizing the discussion of each
-agenda item and sending it as a pull request after the meeting.
+The moderator is responsible for summarizing the discussion of each agenda item
+and sending it as a pull request after the meeting.
 
 ## Consensus Seeking Process
 
 The CTC follows a
 [Consensus Seeking](http://en.wikipedia.org/wiki/Consensus-seeking_decision-making)
 decision making model.
 
-When an agenda item has appeared to reach a consensus, the moderator
-will ask "Does anyone object?" as a final call for dissent from the
-consensus.
+When an agenda item has appeared to reach a consensus, the moderator will ask
+"Does anyone object?" as a final call for dissent from the consensus.
 
-If an agenda item cannot reach a consensus, a CTC member can call for
-either a closing vote or a vote to table the issue to the next
-meeting. The call for a vote must be approved by a majority of the CTC
-or else the discussion will continue. Simple majority wins.
+If an agenda item cannot reach a consensus, a CTC member can call for either a
+closing vote or a vote to table the issue to the next meeting. All votes
+(including votes to close or table) pass if and only if more than 50% of the CTC
+members (excluding individuals who explicitly abstain) vote in favor. For
+example, if there are 20 CTC members, and 5 of those members indicate that they
+abstain, then 8 votes in favor are required for a resolution to pass.

Makefile

@@ -644,8 +644,8 @@ bench-idle:
 	$(NODE) benchmark/idle_clients.js &
 
 jslint:
-	$(NODE) tools/eslint/bin/eslint.js benchmark lib src test tools/doc \
-	  tools/eslint-rules --rulesdir tools/eslint-rules
+	$(NODE) tools/eslint/bin/eslint.js benchmark lib src test tools \
+	  --rulesdir tools/eslint-rules
 
 CPPLINT_EXCLUDE ?=
 CPPLINT_EXCLUDE += src/node_root_certs.h