nodejs · ZYSzys · Sep 22, 2018 · Oct 12, 2018 · Oct 12, 2018 · Oct 12, 2018
diff --git a/.gitignore b/.gitignore
@@ -133,3 +133,5 @@ deps/uv/docs/src/guide/
 deps/v8/gypfiles/Debug/
 deps/v8/gypfiles/Release/
 deps/v8/third_party/eu-strip/
+
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,4 @@
 language: cpp
-compiler:
-  - clang
 sudo: false
 cache: ccache
 os: linux
@@ -13,14 +11,17 @@ matrix:
       script:
         - make lint
         # Lint the first commit in the PR.
-        - git log $TRAVIS_COMMIT_RANGE --pretty=format:'%h' --no-merges | tail -1 | xargs npx core-validate-commit --no-validate-metadata
+        - \[ -z "$TRAVIS_COMMIT_RANGE" \] || (echo -e '\nLinting the commit message according to the guidelines at https://goo.gl/p2fr5Q\n' && git log $TRAVIS_COMMIT_RANGE --pretty=format:'%h' --no-merges | tail -1 | xargs npx -q core-validate-commit --no-validate-metadata)
     - name: "Test Suite"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
       install:
+        - export CC='ccache gcc-4.9' CXX='ccache g++-4.9' JOBS=2
         - ./configure
         - make -j2 V=
       script:
-        - make -j2 test
-      before_install:
-        - export CXX="ccache clang++ -Qunused-arguments"
-        - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option"
-        - export JOBS=2
+        - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test
diff --git a/BUILDING.md b/BUILDING.md
@@ -48,30 +48,28 @@ file a new issue.
 ## Supported platforms
 
 This list of supported platforms is current as of the branch/release to
-which it is attached.
+which it belongs.
 
 ### Input
 
-Node.js relies on V8 and libuv. Therefore, we adopt a subset of their
-supported platforms.
+Node.js relies on V8 and libuv. We adopt a subset of their supported platforms.
 
 ### Strategy
 
-Support is divided into three tiers:
+There are three support tiers:
 
 * **Tier 1**: Full test coverage and maintenance by the Node.js core team and
   the broader community.
-* **Tier 2**: Full test coverage but more limited maintenance,
-  often provided by the vendor of the platform.
-* **Experimental**: May not compile reliably or test suite may not pass.
-  These are often working to be promoted to Tier 2 but are not quite ready.
-  There is at least one individual actively providing maintenance and the team
-  is striving to broaden quality and reliability of support.
+* **Tier 2**: Full test coverage. Limited maintenance, often provided by the
+  vendor of the platform.
+* **Experimental**: May not compile or test suite may not pass.
+  These are often approaching Tier 2 support but are not quite ready.
+  There is at least one individual providing maintenance.
 
 ### Supported platforms
 
 The community does not build or test against end-of-life distributions (EoL).
-Thus, we do not recommend that you use Node on end-of-life or unsupported
+Thus, we do not recommend that you use Node.js on end-of-life or unsupported
 platforms in production.
 
 |  System      | Support type | Version                          | Architectures        | Notes            |
@@ -97,8 +95,8 @@ platforms in production.
   by Joyent. SmartOS images >= 16.4 are not supported because
   GCC 4.8 runtime libraries are not available in their pkgsrc repository
 
-<em id="fn2">2</em>: Tier 1 support for building on Windows is only on 64 bit
-  hosts. Support is experimental for 32 bit hosts.
+<em id="fn2">2</em>: Tier 1 support for building on Windows is only on 64-bit
+  hosts. Support is experimental for 32-bit hosts.
 
 <em id="fn3">3</em>: On Windows, running Node.js in Windows terminal emulators
   like `mintty` requires the usage of [winpty](https://github.com/rprichard/winpty)
@@ -111,12 +109,12 @@ platforms in production.
   community will only address issues that reproduce on native GNU/Linux
   systems. Issues that only reproduce on WSL should be reported in the
   [WSL issue tracker](https://github.com/Microsoft/WSL/issues). Running the
-  Windows binary (`node.exe`) in WSL is not recommended, and will not work
-  without adjustment (such as stdio redirection).
+  Windows binary (`node.exe`) in WSL is not recommended. It will not work
+  without workarounds such as stdio redirection.
 
 ### Supported toolchains
 
-Depending on host platform, the selection of toolchains may vary.
+Depending on the host platform, the selection of toolchains may vary.
 
 #### Unix
 
@@ -128,11 +126,11 @@ Depending on host platform, the selection of toolchains may vary.
 
 #### Windows
 
-* Visual Studio 2017 with the Windows 10 SDK on a 64 bit host.
+* Visual Studio 2017 with the Windows 10 SDK on a 64-bit host.
 
 #### OpenSSL asm support
 
-OpenSSL-1.1.0 requires the following asssembler version for use of asm
+OpenSSL-1.1.0 requires the following assembler version for use of asm
 support on x86_64 and ia32.
 
 * gas (GNU assembler) version 2.23 or higher
@@ -144,10 +142,8 @@ Otherwise `configure` will fail with an error. This can be avoided by
 either providing a newer assembler as per the list above or by
 using the `--openssl-no-asm` flag.
 
-*Note:* The forthcoming OpenSSL-1.1.1 will require higher
- version. Please refer
- https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_ia32cap.html for
- details.
+The forthcoming OpenSSL-1.1.1 will have different requirements. Please refer to
+ https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_ia32cap.html for details.
 
 ## Building Node.js on supported platforms
 
@@ -216,7 +212,7 @@ $ make test-only
 
 At this point, you are ready to make code changes and re-run the tests.
 
-If you are running tests prior to submitting a Pull Request, the recommended
+If you are running tests before submitting a Pull Request, the recommended
 command is:
 
 ```console
@@ -318,7 +314,7 @@ These core dumps are useful for debugging when provided with the
 corresponding original debug binary and system information.
 
 Reading the core dump requires `gdb` built on the same platform the core dump
-was captured on (i.e. 64 bit `gdb` for `node` built on a 64 bit system, Linux
+was captured on (i.e. 64-bit `gdb` for `node` built on a 64-bit system, Linux
 `gdb` for `node` built on Linux) otherwise you will get errors like
 `not in executable format: File format not recognized`.
 
@@ -344,7 +340,7 @@ Prerequisites:
   and tools which can be included in the global `PATH`.
 * The [NetWide Assembler](http://www.nasm.us/), for OpenSSL assembler modules.
   If not installed in the default location, it needs to be manually added
-  to `PATH`. Build with `openssl-no-asm` option does not require this.
+  to `PATH`. A build with the `openssl-no-asm` option does not need this.
 * **Optional** (to build the MSI): the [WiX Toolset v3.11](http://wixtoolset.org/releases/)
   and the [Wix Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension).
 
@@ -369,12 +365,10 @@ To test if Node.js was built correctly:
 
 ### Android/Android-based devices (e.g. Firefox OS)
 
-Although these instructions for building on Android are provided, please note
-that Android is not an officially supported platform at this time. Patches to
-improve the Android build are accepted. However, there is no testing on Android
-in the current continuous integration environment. The participation of people
-dedicated and determined to improve Android building, testing, and support is
-encouraged.
+Android is not a supported platform. Patches to improve the Android build are
+welcome. There is no testing on Android in the current continuous integration
+environment. The participation of people dedicated and determined to improve
+Android building, testing, and support is encouraged.
 
 Be sure you have downloaded and extracted
 [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html) before in
@@ -439,7 +433,7 @@ $ ./configure --without-intl
 $ pkg-config --modversion icu-i18n && ./configure --with-intl=system-icu
 ```
 
-If you are cross compiling, your `pkg-config` must be able to supply a path
+If you are cross-compiling, your `pkg-config` must be able to supply a path
 that works for both your host and target environments.
 
 #### Build with a specific ICU:
@@ -449,6 +443,10 @@ You can find other ICU releases at
 Download the file named something like `icu4c-**##.#**-src.tgz` (or
 `.zip`).
 
+To check the minimum recommended ICU, run `./configure --help` and see
+the help for the `--with-icu-source` option. A warning will be printed
+during configuration if the ICU version is too old.
+
 ##### Unix/macOS
 
 From an already-unpacked ICU:
@@ -483,7 +481,7 @@ This version of Node.js does not support FIPS.
 ## Building Node.js with external core modules
 
 It is possible to specify one or more JavaScript text files to be bundled in
-the binary as builtin modules when building Node.js.
+the binary as built-in modules when building Node.js.
 
 ### Unix/macOS
 
@@ -503,3 +501,14 @@ To make `./myModule.js` available via `require('myModule')` and
 ```console
 > .\vcbuild link-module './myModule.js' link-module './myModule2.js'
 ```
+
+## Note for downstream distributors of Node.js
+
+The Node.js ecosystem is reliant on ABI compatibility within a major
+release. To maintain ABI compatibility it is required that production
+builds of Node.js will be built against the same version of dependencies as the
+project vendors. If Node.js is to be built against a different version of a
+dependency please create a custom `NODE_MODULE_VERSION` to ensure ecosystem
+compatibility. Please consult with the TSC by opening an issue at
+https://github.com/nodejs/tsc/issues if you decide to create a custom
+`NODE_MODULE_VERSION` so we can avoid duplication in the ecosystem.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,5 @@
 # Node.js Changelog
 
-<!--lint disable maximum-line-length-->
-
-To make the changelog easier to both use and manage, it has been split into
-multiple files organized according to significant major and minor Node.js
-release lines.
-
 Select a Node.js version below to view the changelog history:
 
 * [Node.js 10](doc/changelogs/CHANGELOG_V10.md) — **Long Term Support**
@@ -117,10 +111,9 @@ release.
 
 ### Notes
 
-* Release streams marked with `LTS` are currently covered by the
-  [Node.js Long Term Support plan](https://github.com/nodejs/Release).
-* Release versions displayed in **bold** text represent the most
-  recent actively supported release.
+* The [Node.js Long Term Support plan](https://github.com/nodejs/Release) covers
+  LTS releases.
+* Release versions in **bold** text are the most recent supported releases.
 
 ----
 ----

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,8 +1,4 @@
 # Code of Conduct
 
-The Node.js Code of Conduct document has moved to
-https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md. Please update
-links to this document accordingly.
-
-The Node.js Moderation policy can be found at
-https://github.com/nodejs/admin/blob/master/Moderation-Policy.md
+* [Node.js Code of Conduct](https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md)
+* [Node.js Moderation Policy](https://github.com/nodejs/admin/blob/master/Moderation-Policy.md)