Merge branch 'nodejs/master' into xplat

Sync to nodejs/master (2016-10-04) at
7420835

.eslintrc

@@ -30,13 +30,18 @@ rules:
 
   # Best Practices
   # http://eslint.org/docs/rules/#best-practices
+  dot-location: [2, property]
   no-fallthrough: 2
   no-global-assign: 2
   no-multi-spaces: 2
   no-octal: 2
   no-redeclare: 2
   no-self-assign: 2
   no-unused-labels: 2
+  no-useless-call: 2
+  no-useless-escape: 2
+  no-void: 2
+  no-with: 2
 
   # Strict Mode
   # http://eslint.org/docs/rules/#strict-mode
@@ -54,11 +59,18 @@ rules:
   no-new-require: 2
   no-path-concat: 2
   no-restricted-modules: [2, sys, _linklist]
+  no-restricted-properties: [2, {
+    object: assert,
+    property: deepEqual,
+    message: Please use assert.deepStrictEqual().
+  }]
 
   # Stylistic Issues
   # http://eslint.org/docs/rules/#stylistic-issues
   brace-style: [2, 1tbs, {allowSingleLine: true}]
   comma-spacing: 2
+  comma-style: 2
+  computed-property-spacing: 2
   eol-last: 2
   func-call-spacing: 2
   indent: [2, 2, {SwitchCase: 1, MemberExpression: 1}]
@@ -69,9 +81,11 @@ rules:
   new-parens: 2
   no-mixed-spaces-and-tabs: 2
   no-multiple-empty-lines: [2, {max: 2}]
+  no-tabs: 2
   no-trailing-spaces: 2
   quotes: [2, single, avoid-escape]
   semi: 2
+  semi-spacing: 2
   space-before-blocks: [2, always]
   space-before-function-paren: [2, never]
   space-in-parens: [2, never]
@@ -89,7 +103,7 @@ rules:
   no-dupe-class-members: 2
   no-new-symbol: 2
   no-this-before-super: 2
-  prefer-const: 2
+  prefer-const: [2, {ignoreReadBeforeAssign: true}]
   rest-spread-spacing: 2
   template-curly-spacing: 2
 
@@ -98,7 +112,6 @@ rules:
   align-multiline-assignment: 2
   assert-fail-single-argument: 2
   new-with-error: [2, Error, RangeError, TypeError, SyntaxError, ReferenceError]
-  no-deepEqual: 2
   no-definegetter-definesetter: 2
 
 # Global scoped method and vars

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
 ##### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 
-- [ ] `make -j4 test` (UNIX), or `vcbuild test nosign` (Windows) passes
+- [ ] `make -j8 test` (UNIX), or `vcbuild test nosign` (Windows) passes
 - [ ] tests and/or benchmarks are included
 - [ ] documentation is changed or added
 - [ ] commit message follows commit guidelines

.remarkrc

@@ -1,34 +1,62 @@
 {
   "plugins": {
-    "remark-lint": {
-      "code-block-style": false,
+    "remark-lint/": {
+      "blockquote-indentation": 2,
+      "checkbox-character-style": { "checked": "x", "unchecked": " " },
+      "checkbox-content-indent": true,
+      "code-block-style": "fenced",
       "definition-case": false,
+      "definition-spacing": true,
       "emphasis-marker": false,
-      "first-heading-level": false,
+      "fenced-code-flag": true,
+      "fenced-code-marker": "`",
+      "file-extension": "md",
+      "final-definition": true,
+      "final-newline": true,
+      "first-heading-level": 1,
+      "hard-break-spaces": true,
       "heading-increment": false,
-      "list-item-content-indent": false,
+      "heading-style": "atx",
+      "link-title-style": false,
       "list-item-bullet-indent": false,
+      "list-item-content-indent": false,
       "list-item-indent": false,
       "list-item-spacing": false,
       "maximum-heading-length": false,
       "maximum-line-length": false,
+      "no-auto-link-without-protocol": true,
+      "no-blockquote-without-caret": true,
       "no-consecutive-blank-lines": false,
+      "no-duplicate-definitions": true,
       "no-duplicate-headings": false,
       "no-emphasis-as-heading": false,
-      "no-file-name-articles": false,
+      "no-file-name-articles": true,
+      "no-file-name-consecutive-dashes": true,
       "no-file-name-irregular-characters": false,
+      "no-file-name-mixed-case": false,
+      "no-file-name-outer-dashes": true,
+      "no-heading-content-indent": true,
+      "no-heading-indent": true,
       "no-heading-punctuation": false,
       "no-html": false,
-      "no-inline-padding": false,
-      "no-shell-dollars": false,
-      "no-shortcut-reference-link": false,
+      "no-inline-padding": true,
       "no-literal-urls": false,
       "no-missing-blank-lines": false,
-      "no-multiple-toplevel-headings": false,
+      "no-multiple-toplevel-headings": true,
+      "no-shell-dollars": true,
+      "no-shortcut-reference-image": true,
+      "no-shortcut-reference-link": false,
+      "no-table-indentation": true,
+      "no-tabs": true,
       "no-undefined-references": false,
+      "no-unused-definitions": true,
       "ordered-list-marker-style": false,
       "ordered-list-marker-value": false,
+      "rule-style": true,
+      "strong-marker": "*",
+      "table-cell-padding": "padded",
       "table-pipe-alignment": false,
+      "table-pipes": true,
       "unordered-list-marker-style": false
     }
   }

BUILDING.md

@@ -1,6 +1,6 @@
-## Building Node.js
+# Building Node.js
 
-Depending on what platform or features you require the build process may
+Depending on what platform or features you require, the build process may
 differ slightly. After you've successfully built a binary, running the
 test suite to validate that the binary works as intended is a good next step.
 
@@ -25,37 +25,23 @@ On OS X, you will also need:
   * This step will install `gcc` and the related toolchain containing `make`
 
 On FreeBSD and OpenBSD, you may also need:
-* libexecinfo (FreeBSD and OpenBSD only)
+* libexecinfo
 
+To build Node.js:
 
 ```console
 $ ./configure
 $ make
-$ [sudo] make install
 ```
 
-If your Python binary is in a non-standard location or has a
-non-standard name, run the following instead:
-
-```console
-$ export PYTHON=/path/to/python
-$ $PYTHON ./configure
-$ make
-$ [sudo] make install
-```
+Note that the above requires that `python` resolve to Python 2.6 or 2.7 and not a newer version.
 
 To run the tests:
 
 ```console
 $ make test
 ```
 
-To run the native module tests:
-
-```console
-$ make test-addons
-```
-
 To run the npm test suite:
 
 *note: to run the suite on node v4 or earlier you must first*
@@ -76,11 +62,9 @@ $ make doc
 If you have an existing Node.js you can build just the docs with:
 
 ```console
-$ NODE=node make doc-only
+$ NODE=/path/to/node make doc-only
 ```
 
-(Where `node` is the path to your executable.)
-
 To read the documentation:
 
 ```console
@@ -90,7 +74,13 @@ $ man doc/node.1
 To test if Node.js was built correctly:
 
 ```console
-$ node -e "console.log('Hello from Node.js ' + process.version)"
+$ ./node -e "console.log('Hello from Node.js ' + process.version)"
+```
+
+To install this version of Node.js into a system directory:
+
+```console
+$ [sudo] make install
 ```
 
 
@@ -108,13 +98,13 @@ Prerequisites:
   and tools which can be included in the global `PATH`.
 
 ```console
-> vcbuild nosign
+> .\vcbuild nosign
 ```
 
 To run the tests:
 
 ```console
-> vcbuild test
+> .\vcbuild test
 ```
 
 To test if Node.js was built correctly:
@@ -172,7 +162,7 @@ $ ./configure --with-intl=full-icu --download=all
 ##### Windows:
 
 ```console
-> vcbuild full-icu download-all
+> .\vcbuild full-icu download-all
 ```
 
 #### Building without Intl support
@@ -189,7 +179,7 @@ $ ./configure --without-intl
 ##### Windows:
 
 ```console
-> vcbuild without-intl
+> .\vcbuild without-intl
 ```
 
 #### Use existing installed ICU (Unix / OS X only):
@@ -232,7 +222,7 @@ First unpack latest ICU to `deps/icu`
 as `deps/icu` (You'll have: `deps/icu/source/...`)
 
 ```console
-> vcbuild full-icu
+> .\vcbuild full-icu
 ```
 
 ## Building Node.js with FIPS-compliant OpenSSL

CHANGELOG.md

@@ -26,7 +26,9 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V6.md#6.5.0">6.5.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V6.md#6.7.0">6.7.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.6.0">6.6.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.5.0">6.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.4.0">6.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.3.1">6.3.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.3.0">6.3.0</a><br/>
@@ -57,7 +59,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V5.md#5.0.0">5.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V4.md#4.5.0">4.5.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V4.md#4.6.0">4.6.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.5.0">4.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.7">4.4.7</a></b>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.6">4.4.6</a></b>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.5">4.4.5</a></b>
@@ -82,7 +85,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V4.md#4.0.0">4.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.15">0.12.15</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.16">0.12.16</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V012.md#0.12.15">0.12.15</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.14">0.12.14</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.13">0.12.13</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.12">0.12.12</a><br/>
@@ -100,7 +104,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.0">0.12.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V010.md#0.10.46">0.10.46</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V010.md#0.10.47">0.10.47</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V010.md#0.10.46">0.10.46</a><br/>
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.45">0.10.45</a><br/>
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.44">0.10.44</a><br/>
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.43">0.10.43</a><br/>

CODE_OF_CONDUCT.md

@@ -1,6 +1,6 @@
-## Code of Conduct
+# Code of Conduct
 
-### Conduct
+## Conduct
 
 * We are committed to providing a friendly, safe and welcoming
   environment for all, regardless of level of experience, gender
@@ -38,17 +38,17 @@
   documentation. There is no need to address persons when explaining
   code (e.g. "When the developer").
 
-### Contact
+## Contact
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by:
 
 * Emailing [[email protected]](mailto:[email protected]) (this will email all TSC members)
 * Contacting [individual TSC members](https://nodejs.org/en/foundation/tsc/#current-members-of-the-technical-steering-committee).
 
-### Moderation
+## Moderation
 See the TSC's [moderation policy](https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md) for details about moderation.
 
-### Attribution
+## Attribution
 
 This Code of Conduct is adapted from [Rust's wonderful
 CoC](http://www.rust-lang.org/conduct.html) as well as the

CONTRIBUTING.md

@@ -93,15 +93,19 @@ 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
-   subsystem (e.g. "net: add localAddress and localPort to Socket").
+   description of the change. All words in the description should be in
+   lowercase with the exception of proper nouns, acronyms, and the ones that
+   refer to code, like function/variable names. The description should
+   be prefixed with the name of the changed subsystem and start with an
+   imperative verb, for example, "net: add localAddress and localPort
+   to Socket".
 2. Keep the second line blank.
 3. Wrap all other lines at 72 columns.
 
 A good commit log can look something like this:
 
 ```txt
-subsystem: explaining the commit in one line
+subsystem: explain the commit in one line
 
 Body of commit message is a few lines of text, explaining things
 in more detail, possibly giving some background about the issue