Sync to nodejs/master (08-15-2016)

.eslintrc

@@ -58,7 +58,7 @@ rules:
   brace-style: [2, 1tbs, {allowSingleLine: true}]
   comma-spacing: 2
   eol-last: 2
-  indent: [2, 2, {SwitchCase: 1}]
+  indent: [2, 2, {SwitchCase: 1, MemberExpression: 1}]
   key-spacing: [2, {mode: minimum}]
   keyword-spacing: 2
   linebreak-style: [1, unix]
@@ -87,6 +87,7 @@ rules:
   no-new-symbol: 2
   no-this-before-super: 2
   prefer-const: 2
+  rest-spread-spacing: 2
   template-curly-spacing: 2
 
   # Custom rules in tools/eslint-rules

.gitignore

@@ -43,6 +43,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
+    }
+  }
+}

BUILDING.md

@@ -28,7 +28,7 @@ On FreeBSD and OpenBSD, you may also need:
 * libexecinfo (FreeBSD and OpenBSD only)
 
 
-```text
+```console
 $ ./configure
 $ make
 $ [sudo] make install
@@ -37,7 +37,7 @@ $ [sudo] make install
 If your Python binary is in a non-standard location or has a
 non-standard name, run the following instead:
 
-```text
+```console
 $ export PYTHON=/path/to/python
 $ $PYTHON ./configure
 $ make
@@ -46,13 +46,13 @@ $ [sudo] make install
 
 To run the tests:
 
-```text
+```console
 $ make test
 ```
 
 To run the native module tests:
 
-```text
+```console
 $ make test-addons
 ```
 
@@ -61,35 +61,35 @@ To run the npm test suite:
 *note: to run the suite on node v4 or earlier you must first*
 *run `make install`*
 
-```
+```console
 $ make test-npm
 ```
 
 To build the documentation:
 
 This will build Node.js first (if necessary) and then use it to build the docs:
 
-```text
+```console
 $ make doc
 ```
 
 If you have an existing Node.js you can build just the docs with:
 
-```text
+```console
 $ NODE=node make doc-only
 ```
 
 (Where `node` is the path to your executable.)
 
 To read the documentation:
 
-```text
+```console
 $ man doc/node.1
 ```
 
 To test if Node.js was built correctly:
 
-```
+```console
 $ node -e "console.log('Hello from Node.js ' + process.version)"
 ```
 
@@ -101,25 +101,25 @@ Prerequisites:
 * [Python 2.6 or 2.7](https://www.python.org/downloads/)
 * One of:
   * [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools)
-  * [Visual Studio](https://www.visualstudio.com/) 2013 / 2015, all editions including the Community edition
-  * [Visual Studio](https://www.visualstudio.com/) Express 2013 / 2015 for Desktop
+  * [Visual Studio 2015 Update 3](https://www.visualstudio.com/), all editions
+    including the Community edition.
 * Basic Unix tools required for some tests,
   [Git for Windows](http://git-scm.com/download/win) includes Git Bash
   and tools which can be included in the global `PATH`.
 
-```text
+```console
 > vcbuild nosign
 ```
 
 To run the tests:
 
-```text
+```console
 > vcbuild test
 ```
 
 To test if Node.js was built correctly:
 
-```text
+```console
 > Release\node -e "console.log('Hello from Node.js', process.version)"
 ```
 
@@ -136,7 +136,7 @@ Be sure you have downloaded and extracted [Android NDK]
 (https://developer.android.com/tools/sdk/ndk/index.html)
 before in a folder. Then run:
 
-```
+```console
 $ ./android-configure /path/to/your/android-ndk
 $ make
 ```
@@ -165,13 +165,13 @@ Node.js source does not include all locales.)
 
 ##### Unix / OS X:
 
-```text
+```console
 $ ./configure --with-intl=full-icu --download=all
 ```
 
 ##### Windows:
 
-```text
+```console
 > vcbuild full-icu download-all
 ```
 
@@ -182,19 +182,19 @@ The `Intl` object will not be available, nor some other APIs such as
 
 ##### Unix / OS X:
 
-```text
+```console
 $ ./configure --without-intl
 ```
 
 ##### Windows:
 
-```text
+```console
 > vcbuild without-intl
 ```
 
 #### Use existing installed ICU (Unix / OS X only):
 
-```text
+```console
 $ pkg-config --modversion icu-i18n && ./configure --with-intl=system-icu
 ```
 
@@ -210,14 +210,18 @@ Download the file named something like `icu4c-**##.#**-src.tgz` (or
 
 ##### Unix / OS X
 
-```text
-# from an already-unpacked ICU:
+From an already-unpacked ICU:
+```console
 $ ./configure --with-intl=[small-icu,full-icu] --with-icu-source=/path/to/icu
+```
 
-# from a local ICU tarball
+From a local ICU tarball:
+```console
 $ ./configure --with-intl=[small-icu,full-icu] --with-icu-source=/path/to/icu.tgz
+```
 
-# from a tarball URL
+From a tarball URL:
+```console
 $ ./configure --with-intl=full-icu --with-icu-source=http://url/to/icu.tgz
 ```
 
@@ -227,7 +231,7 @@ First unpack latest ICU to `deps/icu`
 [icu4c-**##.#**-src.tgz](http://icu-project.org/download) (or `.zip`)
 as `deps/icu` (You'll have: `deps/icu/source/...`)
 
-```text
+```console
 > vcbuild full-icu
 ```
 

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

@@ -100,7 +100,7 @@ changed and why. Follow these guidelines when writing one:
 
 A good commit log can look something like this:
 
-```
+```txt
 subsystem: explaining the commit in one line
 
 Body of commit message is a few lines of text, explaining things
@@ -122,7 +122,7 @@ what subsystem (or subsystems) your changes touch.
 If your patch fixes an open issue, you can add a reference to it at the end
 of the log. Use the `Fixes:` prefix and the full issue URL. For example:
 
-```
+```txt
 Fixes: https://github.com/nodejs/node/issues/1337
 ```
 
@@ -135,23 +135,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: