From 71f024b869e02795f56d8003edd50eca81779464 Mon Sep 17 00:00:00 2001 From: Mark Owsiak Date: Fri, 19 Oct 2018 10:03:53 -0400 Subject: [PATCH 1/4] docs: improve CONTRIBUTING.md and fix/remove links --- .github/CONTRIBUTING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index dc7b817cca..b4b1564a9c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -42,7 +42,8 @@ Follow these steps to get going. If you are having trouble, don't be afraid to > PRO TIP: Run `npm start` to see a list of commands which can be run with `npm start ` -1. [Install Node.js 4.x or newer](https://nodejs.org/download). +1. [Install Node.js 6.x or newer](https://nodejs.org/en/download/). + - If you're new to installing node a tool like [nvm](https://github.com/creationix/nvm#install-script) can help you manage multiple version installations. 1. Follow [Github's documentation](https://help.github.com/articles/fork-a-repo/) on setting up Git, forking and cloning. 1. Create a new branch in your working copy. Give your branch a descriptive name, such as `issue/12345`: `git checkout -b issue/12345`. 1. Execute `npm install` to install the development dependencies. @@ -69,13 +70,13 @@ Follow these steps to get going. If you are having trouble, don't be afraid to - You don't need to make a new PR to make changes. Instead, commit on top of your changes, and push these to your fork's branch. The PR will be updated, and CI will re-run. - Github will indicate if there's a conflict. If this happens, you will need to [rebase](https://help.github.com/articles/about-git-rebase/) your branch onto the `master` branch of the source repository. *Don't merge.* - It's no longer necessary to "squash" your changes. -1. Be patient while your PR is reviewed. This can take awhile ([why?](https://github.com/orgs/mochajs/projects/4)). We may request changes; don't be afraid to question them. +1. Be patient while your PR is reviewed. We may request changes; don't be afraid to question them. ## :angel: I Just Want To Help *Excellent.* Here's how: -- **Handy with JavaScript?** Please check out the issues labeled [`help-wanted`](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Ahelp-wanted). +- **Handy with JavaScript?** Please check out the issues labeled [`help-wanted`](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). - **Can you write good (and do other stuff good too)?** Help with the documentation. See the [issues for our site](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3Adocumentation). - **Design your thing?** [Our site](https://github.com/mochajs/mocha/tree/master/docs) needs your magic touch. - **Know Mocha's codebase?** We could use your help triaging issues and/or reviewing pull requests. Please contact an [org member](https://github.com/orgs/mochajs/people), and we'll chat. From eb0ae03bf43fd5429dd46091f20e77ac1945a500 Mon Sep 17 00:00:00 2001 From: Mark Owsiak Date: Fri, 19 Oct 2018 10:14:06 -0400 Subject: [PATCH 2/4] docs: link to CONTRIBUTING.md in readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9655920d56..3cb87c8d33 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ - **[Documentation](https://mochajs.org)** - **[Release Notes / History / Changes](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)** - [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) +- [Contributing](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md) - [Gitter Chatroom](https://gitter.im/mochajs/mocha) (ask questions here!) - [Google Group](https://groups.google.com/group/mochajs) - [Issue Tracker](https://github.com/mochajs/mocha/issues) From c371960dffc4d9de5e1272de4c106a79d5564689 Mon Sep 17 00:00:00 2001 From: Mark Owsiak Date: Fri, 19 Oct 2018 16:23:28 -0400 Subject: [PATCH 3/4] docs: address PR comments [skip ci] --- .github/CONTRIBUTING.md | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b4b1564a9c..f926474aa4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -43,7 +43,7 @@ Follow these steps to get going. If you are having trouble, don't be afraid to > PRO TIP: Run `npm start` to see a list of commands which can be run with `npm start ` 1. [Install Node.js 6.x or newer](https://nodejs.org/en/download/). - - If you're new to installing node a tool like [nvm](https://github.com/creationix/nvm#install-script) can help you manage multiple version installations. + - If you're new to installing Node, a tool like [nvm](https://github.com/creationix/nvm#install-script) can help you manage multiple version installations. 1. Follow [Github's documentation](https://help.github.com/articles/fork-a-repo/) on setting up Git, forking and cloning. 1. Create a new branch in your working copy. Give your branch a descriptive name, such as `issue/12345`: `git checkout -b issue/12345`. 1. Execute `npm install` to install the development dependencies. @@ -70,14 +70,14 @@ Follow these steps to get going. If you are having trouble, don't be afraid to - You don't need to make a new PR to make changes. Instead, commit on top of your changes, and push these to your fork's branch. The PR will be updated, and CI will re-run. - Github will indicate if there's a conflict. If this happens, you will need to [rebase](https://help.github.com/articles/about-git-rebase/) your branch onto the `master` branch of the source repository. *Don't merge.* - It's no longer necessary to "squash" your changes. -1. Be patient while your PR is reviewed. We may request changes; don't be afraid to question them. +1. Be patient while your PR is reviewed. This can take a while. We may request changes; don't be afraid to question them. ## :angel: I Just Want To Help *Excellent.* Here's how: - **Handy with JavaScript?** Please check out the issues labeled [`help-wanted`](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). -- **Can you write good (and do other stuff good too)?** Help with the documentation. See the [issues for our site](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3Adocumentation). +- **Can you write well?** Help with the documentation. See the [issues for our site](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3Adocumentation). - **Design your thing?** [Our site](https://github.com/mochajs/mocha/tree/master/docs) needs your magic touch. - **Know Mocha's codebase?** We could use your help triaging issues and/or reviewing pull requests. Please contact an [org member](https://github.com/orgs/mochajs/people), and we'll chat. - **Want to build our community?** Mocha has a *lot* of users. We could use your help bringing everyone together in peace and harmony. Please contact an [org member](https://github.com/mochajs/people). diff --git a/README.md b/README.md index 3cb87c8d33..8128519691 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ## Links -- **[Documentation](https://mochajs.org)** +- **[Documentation](https://mochajs.org/)** - **[Release Notes / History / Changes](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)** - [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) - [Contributing](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md) From 2e8bad31453401aa864316b0b1833a1eaf172427 Mon Sep 17 00:00:00 2001 From: Mark Owsiak Date: Fri, 19 Oct 2018 16:34:25 -0400 Subject: [PATCH 4/4] docs: better wording on PR review wait time [skip ci] --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f926474aa4..8f23330549 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -70,7 +70,7 @@ Follow these steps to get going. If you are having trouble, don't be afraid to - You don't need to make a new PR to make changes. Instead, commit on top of your changes, and push these to your fork's branch. The PR will be updated, and CI will re-run. - Github will indicate if there's a conflict. If this happens, you will need to [rebase](https://help.github.com/articles/about-git-rebase/) your branch onto the `master` branch of the source repository. *Don't merge.* - It's no longer necessary to "squash" your changes. -1. Be patient while your PR is reviewed. This can take a while. We may request changes; don't be afraid to question them. +1. Be patient while your PR is reviewed. This can take a while. We may request changes, but don't be afraid to question them. ## :angel: I Just Want To Help