diff --git a/.github/workflows/ASAN.yml b/.github/workflows/ASAN.yml
new file mode 100644
index 00000000000000..77b8fd530adb52
--- /dev/null
+++ b/.github/workflows/ASAN.yml
@@ -0,0 +1,20 @@
+name: node ASAN
+
+on: [push, pull_request]
+
+jobs:
+ ubuntu-build:
+ runs-on: ubuntu-latest
+ container: gengjiawen/node-build:2020-02-14
+ steps:
+ - uses: actions/checkout@v2
+ - name: Build
+ run: |
+ npx envinfo
+ ./configure --debug --enable-asan --ninja && ninja -C out/Debug
+ - name: Test
+ env:
+ ASAN_OPTIONS: halt_on_error=0
+ continue-on-error: true
+ run: |
+ python3 tools/test.py -J --mode=debug
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61fbc6c8f998a0..cd5600535009ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@ release.
-13.10.0
+13.10.1
+13.10.0
13.9.0
13.8.0
13.7.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9d1f2cef604b9..29700978fb78bf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,13 +5,13 @@
* [Pull Requests](#pull-requests)
* [Developer's Certificate of Origin 1.1](#developers-certificate-of-origin)
-## [Code of Conduct](./doc/guides/contributing/coc.md)
+## [Code of Conduct](./doc/guides/contributing/code-of-conduct.md)
The Node.js project has a
[Code of Conduct](https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md)
to which all contributors must adhere.
-See [details on our policy on Code of Conduct](./doc/guides/contributing/coc.md).
+See [details on our policy on Code of Conduct](./doc/guides/contributing/code-of-conduct.md).
## [Issues](./doc/guides/contributing/issues.md)
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index d7cb6e321e16cb..5048a700340617 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -7,7 +7,7 @@
* [Technical Steering Committee](#technical-steering-committee)
* [TSC Meetings](#tsc-meetings)
* [Collaborator Nominations](#collaborator-nominations)
- * [Onboarding](#onboarding)
+ * [Onboarding](#./onboarding)
* [Consensus Seeking Process](#consensus-seeking-process)
@@ -39,7 +39,7 @@ result in Collaborators removing their opposition.
See:
* [List of Collaborators](./README.md#current-project-team-members)
-* [A guide for Collaborators](./COLLABORATOR_GUIDE.md)
+* [A guide for Collaborators](./doc/guides/collaborator-guide.md)
### Collaborator Activities
@@ -148,7 +148,7 @@ nomination.
### Onboarding
After the nomination passes, a TSC member onboards the new Collaborator. See
-[the onboarding guide](./doc/onboarding.md) for details of the onboarding
+[the onboarding guide](./onboarding.md) for details of the onboarding
process.
## Consensus Seeking Process
diff --git a/Makefile b/Makefile
index d1705fdc49d118..4ebb16cdfd0672 100644
--- a/Makefile
+++ b/Makefile
@@ -924,12 +924,12 @@ endif
.PHONY: release-only
release-only: check-xz
@if [ "$(DISTTYPE)" = "release" ] && `grep -q REPLACEME doc/api/*.md`; then \
- echo 'Please update REPLACEME in Added: tags in doc/api/*.md (See doc/releases.md)' ; \
+ echo 'Please update REPLACEME in Added: tags in doc/api/*.md (See doc/guides/releases.md)' ; \
exit 1 ; \
fi
@if [ "$(DISTTYPE)" = "release" ] && \
`grep -q DEP...X doc/api/deprecations.md`; then \
- echo 'Please update DEP...X in doc/api/deprecations.md (See doc/releases.md)' ; \
+ echo 'Please update DEP...X in doc/api/deprecations.md (See doc/guides/releases.md)' ; \
exit 1 ; \
fi
@if [ "$(shell git status --porcelain | egrep -v '^\?\? ')" = "" ]; then \
@@ -1032,7 +1032,6 @@ $(TARBALL): release-only $(NODE_EXE) doc
$(RM) -r $(TARNAME)/deps/v8/samples
$(RM) -r $(TARNAME)/deps/v8/tools/profviz
$(RM) -r $(TARNAME)/deps/v8/tools/run-tests.py
- $(RM) -r $(TARNAME)/deps/zlib/contrib # too big, unused
$(RM) -r $(TARNAME)/doc/images # too big
$(RM) -r $(TARNAME)/test*.tap
$(RM) -r $(TARNAME)/tools/cpplint.py
@@ -1043,6 +1042,7 @@ $(TARBALL): release-only $(NODE_EXE) doc
$(RM) -r $(TARNAME)/tools/osx-pkg.pmdoc
find $(TARNAME)/deps/v8/test/* -type d ! -regex '.*/test/torque$$' | xargs $(RM) -r
find $(TARNAME)/deps/v8/test -type f ! -regex '.*/test/torque/.*' | xargs $(RM)
+ find $(TARNAME)/deps/zlib/contrib/* -type d ! -regex '.*/contrib/optimizations$$' | xargs $(RM) -r
find $(TARNAME)/ -name ".eslint*" -maxdepth 2 | xargs $(RM)
find $(TARNAME)/ -type l | xargs $(RM) # annoying on windows
tar -cf $(TARNAME).tar $(TARNAME)
diff --git a/README.md b/README.md
index 657fc478a37e5b..0576cd5132e6a8 100644
--- a/README.md
+++ b/README.md
@@ -529,7 +529,7 @@ For information about the governance of the Node.js project, see
* [whitlockjc](https://github.com/whitlockjc) -
**Jeremy Whitlock** <jwhitlock@apache.org>
-Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
+Collaborators follow the [Collaborator Guide](./doc/guides/collaborator-guide.md) in
maintaining the Node.js project.
### Release Keys
diff --git a/benchmark/README.md b/benchmark/README.md
index c5fdad093471b5..cb7c1506eb6235 100644
--- a/benchmark/README.md
+++ b/benchmark/README.md
@@ -5,7 +5,7 @@ of different Node.js implementations and different ways of
writing JavaScript run by the built-in JavaScript engine.
For a detailed guide on how to write and run benchmarks in this
-directory, see [the guide on benchmarks](writing-and-running-benchmarks.md).
+directory, see [the guide on benchmarks](../doc/guides/writing-and-running-benchmarks.md).
## Table of Contents
@@ -76,17 +76,17 @@ writing benchmarks.
### `createBenchmark(fn, configs[, options])`
-See [the guide on writing benchmarks](writing-and-running-benchmarks.md#basics-of-a-benchmark).
+See [the guide on writing benchmarks](../doc/guides/contributing/writing-and-running-benchmarks.md#basics-of-a-benchmark).
### `default_http_benchmarker`
The default benchmarker used to run HTTP benchmarks.
-See [the guide on writing HTTP benchmarks](writing-and-running-benchmarks.md#creating-an-http-benchmark).
+See [the guide on writing HTTP benchmarks](../doc/guides/contributing/writing-and-running-benchmarks.md#creating-an-http-benchmark).
### `PORT`
The default port used to run HTTP benchmarks.
-See [the guide on writing HTTP benchmarks](writing-and-running-benchmarks.md#creating-an-http-benchmark).
+See [the guide on writing HTTP benchmarks](../doc/guides/contributing/writing-and-running-benchmarks.md#creating-an-http-benchmark).
### `sendResult(data)`
diff --git a/doc/api/stream.md b/doc/api/stream.md
index 09713f20746180..762f1565721c4e 100644
--- a/doc/api/stream.md
+++ b/doc/api/stream.md
@@ -1555,7 +1555,7 @@ const cleanup = finished(rs, (err) => {
});
```
-### `stream.pipeline(source, ...transforms, destination, callback)`
+### `stream.pipeline(source[, ...transforms], destination, callback)`
|