From 6393112f803609ba60263d58edad1efcd58067c6 Mon Sep 17 00:00:00 2001 From: "Matt (IPv4)" Date: Tue, 23 Oct 2018 10:22:06 +0100 Subject: [PATCH 1/4] Add contributing guidelines --- CONTRIBUTING.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..97bf8823 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,14 @@ +[![JS.ORG Logo](http://logo.js.org/png/github_header.png)](http://js.org) + +[![JS.ORG](https://img.shields.io/badge/js.org-+-FFE70B.svg?style=flat-square)](http://js.org) + +**Claiming a subdomain for your project** + +Please read over [README.md](https://github.com/js-org/js.org/blob/master/README.md) for general instrucitons on claiming a `js.org` subdomain. + +Before creating your pull request please review the following wiki articles and ensure you are in the clear with your request: +* What subdomian should you use: [Subdomain Determination](https://github.com/js-org/js.org/wiki/Subdomain-Determination) +* Is your site ready for a `js.org` subdomain: [No Content](https://github.com/js-org/js.org/wiki/No-Content) + +When creating your pull request, ensure that you are merging your forked and edited `master` branch into the `master` branch of the base `js.org` repository. +Please see the wiki article [Branch Error](https://github.com/js-org/js.org/wiki/Branch-Error) for further information regarding this. From 115423d2232d842f6a3cd530701f9c49f70dbc73 Mon Sep 17 00:00:00 2001 From: "Matt (IPv4)" Date: Tue, 23 Oct 2018 10:23:08 +0100 Subject: [PATCH 2/4] and t&cs --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 97bf8823..47959556 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,7 @@ Please read over [README.md](https://github.com/js-org/js.org/blob/master/README Before creating your pull request please review the following wiki articles and ensure you are in the clear with your request: * What subdomian should you use: [Subdomain Determination](https://github.com/js-org/js.org/wiki/Subdomain-Determination) * Is your site ready for a `js.org` subdomain: [No Content](https://github.com/js-org/js.org/wiki/No-Content) +* You are happy with the Terms and Conditions of `js.org`: [Terms and Conditions](http://js.org/terms.html) When creating your pull request, ensure that you are merging your forked and edited `master` branch into the `master` branch of the base `js.org` repository. Please see the wiki article [Branch Error](https://github.com/js-org/js.org/wiki/Branch-Error) for further information regarding this. From 5e58dac88503eb50a898b9819997a5aeb5653627 Mon Sep 17 00:00:00 2001 From: "Matt (IPv4)" Date: Tue, 23 Oct 2018 10:26:32 +0100 Subject: [PATCH 3/4] wording --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47959556..9d5f3181 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,12 +4,12 @@ **Claiming a subdomain for your project** -Please read over [README.md](https://github.com/js-org/js.org/blob/master/README.md) for general instrucitons on claiming a `js.org` subdomain. +Please read over [README.md](https://github.com/js-org/js.org/blob/master/README.md) for general instructions on claiming a `js.org` subdomain. -Before creating your pull request please review the following wiki articles and ensure you are in the clear with your request: -* What subdomian should you use: [Subdomain Determination](https://github.com/js-org/js.org/wiki/Subdomain-Determination) +Before creating your pull request please review the following items and ensure you are in the clear with your request: +* What subdomian should you request: [Subdomain Determination](https://github.com/js-org/js.org/wiki/Subdomain-Determination) * Is your site ready for a `js.org` subdomain: [No Content](https://github.com/js-org/js.org/wiki/No-Content) -* You are happy with the Terms and Conditions of `js.org`: [Terms and Conditions](http://js.org/terms.html) +* Are you happy with the Terms and Conditions of `js.org`: [Terms and Conditions](http://js.org/terms.html) When creating your pull request, ensure that you are merging your forked and edited `master` branch into the `master` branch of the base `js.org` repository. Please see the wiki article [Branch Error](https://github.com/js-org/js.org/wiki/Branch-Error) for further information regarding this. From 71d951637967d25ac4bc261aab39a1609c66d0f3 Mon Sep 17 00:00:00 2001 From: Stefan Keim Date: Tue, 23 Oct 2018 11:56:58 +0200 Subject: [PATCH 4/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d5f3181..9cd460c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ Please read over [README.md](https://github.com/js-org/js.org/blob/master/README.md) for general instructions on claiming a `js.org` subdomain. Before creating your pull request please review the following items and ensure you are in the clear with your request: -* What subdomian should you request: [Subdomain Determination](https://github.com/js-org/js.org/wiki/Subdomain-Determination) +* What subdomain should you request: [Subdomain Determination](https://github.com/js-org/js.org/wiki/Subdomain-Determination) * Is your site ready for a `js.org` subdomain: [No Content](https://github.com/js-org/js.org/wiki/No-Content) * Are you happy with the Terms and Conditions of `js.org`: [Terms and Conditions](http://js.org/terms.html)