From f86f230fabe91519ea4acc744337a69123995dcf Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Fri, 14 Feb 2020 12:54:11 +0000 Subject: [PATCH 01/10] doc: update cpp style guide file naming and fix links Updated cpp style guide file name and location and fixed links to this file. Fixes: https://github.com/nodejs/node/issues/31741 --- doc/guides/contributing/pull-requests.md | 2 +- CPP_STYLE_GUIDE.md => doc/guides/cpp-style-guide.md | 0 src/README.md | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename CPP_STYLE_GUIDE.md => doc/guides/cpp-style-guide.md (100%) diff --git a/doc/guides/contributing/pull-requests.md b/doc/guides/contributing/pull-requests.md index 7f4ab4e83e049b..63af5a055c5756 100644 --- a/doc/guides/contributing/pull-requests.md +++ b/doc/guides/contributing/pull-requests.md @@ -121,7 +121,7 @@ in the API docs will also be checked when running `make lint` (or use `REPLACEME` for the version number in the documentation YAML. For contributing C++ code, you may want to look at the -[C++ Style Guide](../../../CPP_STYLE_GUIDE.md), as well as the +[C++ Style Guide](../../cpp-style-guide.md), as well as the [README of `src/`](../../../src/README.md) for an overview over Node.js C++ internals. diff --git a/CPP_STYLE_GUIDE.md b/doc/guides/cpp-style-guide.md similarity index 100% rename from CPP_STYLE_GUIDE.md rename to doc/guides/cpp-style-guide.md diff --git a/src/README.md b/src/README.md index 40790b278acb65..2e59c51c3c37e9 100644 --- a/src/README.md +++ b/src/README.md @@ -903,7 +903,7 @@ static void GetUserInfo(const FunctionCallbackInfo& args) { [`v8.h` in Node.js master]: https://github.com/nodejs/node/blob/master/deps/v8/include/v8.h [`v8.h` in V8 master]: https://github.com/v8/v8/blob/master/include/v8.h [`vm` module]: https://nodejs.org/api/vm.html -[C++ coding style]: ../CPP_STYLE_GUIDE.md +[C++ coding style]: ../doc/guides/cpp-style-guide.md [Callback scopes]: #callback-scopes [JavaScript value handles]: #js-handles [N-API]: https://nodejs.org/api/n-api.html From 986e399bd9ab62a151ad12ce756cb55d19558a1e Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Fri, 14 Feb 2020 12:56:24 +0000 Subject: [PATCH 02/10] doc: update collaborator guide file name and location Updated collaborator guide file name and location and fixed links to this file. Fixes: https://github.com/nodejs/node/issues/31741 --- GOVERNANCE.md | 2 +- README.md | 2 +- COLLABORATOR_GUIDE.md => doc/guides/collaborator-guide.md | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename COLLABORATOR_GUIDE.md => doc/guides/collaborator-guide.md (100%) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index d7cb6e321e16cb..2160ba440aba17 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -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 diff --git a/README.md b/README.md index f58b49932965e0..aa584bb84c761e 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.md](./doc/guides/collaborator-guide.md) in maintaining the Node.js project. ### Release Keys diff --git a/COLLABORATOR_GUIDE.md b/doc/guides/collaborator-guide.md similarity index 100% rename from COLLABORATOR_GUIDE.md rename to doc/guides/collaborator-guide.md From 86743c366d200e31fb3859daf9e9c8d1021ddf57 Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Fri, 14 Feb 2020 14:10:02 +0000 Subject: [PATCH 03/10] doc: update documentation style guide file name and location Updated documentation style guide file name and location and updated links referencing the file. Fixes: https://github.com/nodejs/node/issues/31741 --- doc/guides/contributing/pull-requests.md | 2 +- doc/{STYLE_GUIDE.md => guides/documentation-style.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename doc/{STYLE_GUIDE.md => guides/documentation-style.md} (100%) diff --git a/doc/guides/contributing/pull-requests.md b/doc/guides/contributing/pull-requests.md index 63af5a055c5756..1a1153e3092ff7 100644 --- a/doc/guides/contributing/pull-requests.md +++ b/doc/guides/contributing/pull-requests.md @@ -115,7 +115,7 @@ If you are modifying code, please be sure to run `make lint` from time to time to ensure that the changes follow the Node.js code style guide. Any documentation you write (including code comments and API documentation) -should follow the [Style Guide](../../STYLE_GUIDE.md). Code samples included +should follow the [Style Guide](../documentation-style.md). Code samples included in the API docs will also be checked when running `make lint` (or `vcbuild.bat lint` on Windows). If you are adding to or deprecating an API, use `REPLACEME` for the version number in the documentation YAML. diff --git a/doc/STYLE_GUIDE.md b/doc/guides/documentation-style.md similarity index 100% rename from doc/STYLE_GUIDE.md rename to doc/guides/documentation-style.md From ae21cd443a50529da1b70c63523d6a37f3523cf6 Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Fri, 14 Feb 2020 14:23:35 +0000 Subject: [PATCH 04/10] fix links to updated markdown files Fixed the links referencing markdown files that have moved location Fixes: https://github.com/nodejs/node/issues/31741 --- CONTRIBUTING.md | 4 ++-- GOVERNANCE.md | 4 ++-- Makefile | 4 ++-- README.md | 2 +- benchmark/README.md | 8 ++++---- doc/guides/contributing/{coc.md => code-of-conduct.md} | 0 doc/guides/{internal/readme.md => internal-api.md} | 0 .../guides}/writing-and-running-benchmarks.md | 0 8 files changed, 11 insertions(+), 11 deletions(-) rename doc/guides/contributing/{coc.md => code-of-conduct.md} (100%) rename doc/guides/{internal/readme.md => internal-api.md} (100%) rename {benchmark => doc/guides}/writing-and-running-benchmarks.md (100%) 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 2160ba440aba17..1d849911a7385a 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](#./doc/guides/onboarding) * [Consensus Seeking Process](#consensus-seeking-process) @@ -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](./doc/guides/onboarding.md) for details of the onboarding process. ## Consensus Seeking Process diff --git a/Makefile b/Makefile index 34cdec7f7767b5..85328e16f59bc1 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 \ diff --git a/README.md b/README.md index aa584bb84c761e..63b4b0ded56879 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](./doc/guides/collaborator-guide.md) in +Collaborators follow the [collaborator-guide.md](./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..7a46ea60237a85 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/contributing/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/guides/contributing/coc.md b/doc/guides/contributing/code-of-conduct.md similarity index 100% rename from doc/guides/contributing/coc.md rename to doc/guides/contributing/code-of-conduct.md diff --git a/doc/guides/internal/readme.md b/doc/guides/internal-api.md similarity index 100% rename from doc/guides/internal/readme.md rename to doc/guides/internal-api.md diff --git a/benchmark/writing-and-running-benchmarks.md b/doc/guides/writing-and-running-benchmarks.md similarity index 100% rename from benchmark/writing-and-running-benchmarks.md rename to doc/guides/writing-and-running-benchmarks.md From 5105790568e909f378dfb229099c1bc26a54932f Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Fri, 14 Feb 2020 14:25:03 +0000 Subject: [PATCH 05/10] doc: update markdown file names and locations Moved files to appropriate location and updated naming style for some of them. Fixes: https://github.com/nodejs/node/issues/31741 --- .../{updating-root-certs.md => maintaining-root-certs.md} | 2 +- doc/{ => guides}/offboarding.md | 0 doc/{ => guides}/onboarding-extras.md | 0 doc/{ => guides}/onboarding.md | 0 doc/{ => guides}/releases.md | 0 ...{security_release_process.md => security-release-process.md} | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename doc/guides/{updating-root-certs.md => maintaining-root-certs.md} (99%) rename doc/{ => guides}/offboarding.md (100%) rename doc/{ => guides}/onboarding-extras.md (100%) rename doc/{ => guides}/onboarding.md (100%) rename doc/{ => guides}/releases.md (100%) rename doc/guides/{security_release_process.md => security-release-process.md} (100%) diff --git a/doc/guides/updating-root-certs.md b/doc/guides/maintaining-root-certs.md similarity index 99% rename from doc/guides/updating-root-certs.md rename to doc/guides/maintaining-root-certs.md index 41c83e5898bd10..d26bdad943a50a 100644 --- a/doc/guides/updating-root-certs.md +++ b/doc/guides/maintaining-root-certs.md @@ -1,4 +1,4 @@ -# Updating the Root Certificates +# Maintaining the Root Certificates Node.js contains a compiled-in set of root certificates used as trust anchors for TLS certificate validation. diff --git a/doc/offboarding.md b/doc/guides/offboarding.md similarity index 100% rename from doc/offboarding.md rename to doc/guides/offboarding.md diff --git a/doc/onboarding-extras.md b/doc/guides/onboarding-extras.md similarity index 100% rename from doc/onboarding-extras.md rename to doc/guides/onboarding-extras.md diff --git a/doc/onboarding.md b/doc/guides/onboarding.md similarity index 100% rename from doc/onboarding.md rename to doc/guides/onboarding.md diff --git a/doc/releases.md b/doc/guides/releases.md similarity index 100% rename from doc/releases.md rename to doc/guides/releases.md diff --git a/doc/guides/security_release_process.md b/doc/guides/security-release-process.md similarity index 100% rename from doc/guides/security_release_process.md rename to doc/guides/security-release-process.md From 19ac8959983d510c137a3ace7375d23c88f99ee7 Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Fri, 14 Feb 2020 14:30:24 +0000 Subject: [PATCH 06/10] doc: reduce line length Reduced line length for linter --- doc/guides/contributing/pull-requests.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/contributing/pull-requests.md b/doc/guides/contributing/pull-requests.md index 1a1153e3092ff7..7b9f3c6fe2960e 100644 --- a/doc/guides/contributing/pull-requests.md +++ b/doc/guides/contributing/pull-requests.md @@ -115,8 +115,8 @@ If you are modifying code, please be sure to run `make lint` from time to time to ensure that the changes follow the Node.js code style guide. Any documentation you write (including code comments and API documentation) -should follow the [Style Guide](../documentation-style.md). Code samples included -in the API docs will also be checked when running `make lint` (or +should follow the [Style Guide](../documentation-style.md). Code samples +included in the API docs will also be checked when running `make lint` (or `vcbuild.bat lint` on Windows). If you are adding to or deprecating an API, use `REPLACEME` for the version number in the documentation YAML. From 56807f478c0689a65008a23e6cd0420875c0b279 Mon Sep 17 00:00:00 2001 From: Conor <43864112+ConorDavenport@users.noreply.github.com> Date: Thu, 27 Feb 2020 15:48:26 +0000 Subject: [PATCH 07/10] Update README.md Co-Authored-By: James M Snell --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 63b4b0ded56879..58def5760ab46c 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](./doc/guides/collaborator-guide.md) in +Collaborators follow the [Collaborator Guide](./doc/guides/collaborator-guide.md) in maintaining the Node.js project. ### Release Keys From 1c3d66f1b394e3da16d89d6cf56d81c259387c54 Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Thu, 27 Feb 2020 16:03:14 +0000 Subject: [PATCH 08/10] doc: update url filepath --- benchmark/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmark/README.md b/benchmark/README.md index 7a46ea60237a85..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](../doc/guides/contributing/writing-and-running-benchmarks.md). +directory, see [the guide on benchmarks](../doc/guides/writing-and-running-benchmarks.md). ## Table of Contents From f54f511a3902e456a2c0a7024bf96df8e86ad1e5 Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Thu, 27 Feb 2020 16:09:12 +0000 Subject: [PATCH 09/10] doc: update file name and url link --- doc/guides/contributing/pull-requests.md | 2 +- doc/guides/{documentation-style.md => doc-style-guide.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename doc/guides/{documentation-style.md => doc-style-guide.md} (100%) diff --git a/doc/guides/contributing/pull-requests.md b/doc/guides/contributing/pull-requests.md index 7b9f3c6fe2960e..39b84bc34f17d5 100644 --- a/doc/guides/contributing/pull-requests.md +++ b/doc/guides/contributing/pull-requests.md @@ -115,7 +115,7 @@ If you are modifying code, please be sure to run `make lint` from time to time to ensure that the changes follow the Node.js code style guide. Any documentation you write (including code comments and API documentation) -should follow the [Style Guide](../documentation-style.md). Code samples +should follow the [Style Guide](../doc-style-guide.md). Code samples included in the API docs will also be checked when running `make lint` (or `vcbuild.bat lint` on Windows). If you are adding to or deprecating an API, use `REPLACEME` for the version number in the documentation YAML. diff --git a/doc/guides/documentation-style.md b/doc/guides/doc-style-guide.md similarity index 100% rename from doc/guides/documentation-style.md rename to doc/guides/doc-style-guide.md From bec8a745022b6a92de6f22a44005c33d08d508ab Mon Sep 17 00:00:00 2001 From: ConorDavenport Date: Thu, 27 Feb 2020 16:14:33 +0000 Subject: [PATCH 10/10] doc: update file location and url --- GOVERNANCE.md | 4 ++-- doc/guides/onboarding.md => onboarding.md | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename doc/guides/onboarding.md => onboarding.md (100%) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 1d849911a7385a..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](#./doc/guides/onboarding) + * [Onboarding](#./onboarding) * [Consensus Seeking Process](#consensus-seeking-process) @@ -148,7 +148,7 @@ nomination. ### Onboarding After the nomination passes, a TSC member onboards the new Collaborator. See -[the onboarding guide](./doc/guides/onboarding.md) for details of the onboarding +[the onboarding guide](./onboarding.md) for details of the onboarding process. ## Consensus Seeking Process diff --git a/doc/guides/onboarding.md b/onboarding.md similarity index 100% rename from doc/guides/onboarding.md rename to onboarding.md