resolve conflict

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+[![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 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 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)
+
+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.

PULL_REQUEST_TEMPLATE.md

@@ -1,2 +1,2 @@
-- There is reasonable content on the page (see: [No Content](https://github.com/js-org/js.org/wiki/No-Content))
-- I have read and accepted the [Terms and Conditions](http://js.org/terms.html)
+- [x] There is reasonable content on the page (see: [No Content](https://github.com/js-org/js.org/wiki/No-Content))
+- [x] I have read and accepted the [Terms and Conditions](http://js.org/terms.html)

README.md

@@ -1,11 +1,13 @@
 [![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)
+[![PRs](https://img.shields.io/github/issues-pr-closed-raw/js-org/js.org.svg?style=flat-square&colorB=31a88b&label=Pull%20Requests)](https://github.com/js-org/js.org/pulls?q=is%3Apr+is%3Aclosed+label%3Aadd)
+[![Donate](https://img.shields.io/badge/Donate-for_registrar_fees-blue.svg?style=flat-square&logo=paypal)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=RPBWBDBKW62AC)
 
-**To get a short and sleek subdomain for your own GitHub Page follow these 4 Steps:**
+**To get a short and sleek subdomain for your own GitHub Pages site follow these 4 Steps:**
 
 ### Step 1
-If you haven't already, now it's time to log in to your GitHub account and set up your GitHub Page following the instructions [here](https://pages.github.com/). To get a head start you can simply use the generator with one of the provided themes and **add some reasonable content to your new page**.
+If you haven't already, now it's time to log in to your GitHub account and set up your GitHub Pages site following the instructions [here](https://pages.github.com/). To get a head start you can simply use the generator with one of the provided themes and **add some reasonable content to your new page**.
 
 ### Step 2
 Now determine your js.org subdomain: either choose your username or the name of your repo according to the existing GitHub Pages URL (for ```http://foo.github.io/bar```, either ```foo.js.org``` or ```bar.js.org``` would be possible). More details in the [wiki](https://github.com/js-org/js.org/wiki).
@@ -15,5 +17,8 @@ Add a file named ```CNAME``` to your repo (in the ```gh-pages``` branch for proj
 
 ### Step 4
 To finish the procedure, make a pull request in this GitHub repository that adds your subdomain to the [list](https://github.com/js-org/js.org/blob/master/cnames_active.js) of existing JS.ORG domains. Your new URL should go live within 24 hours (keep an eye on your pull request in case of a naming conflict).
+ 
+# 
 
-
+### Thanks
+... to **[Cloudflare](https://www.cloudflare.com)** for their superb DNS service that makes this possible. While JS.ORG is using their free plan - to a shameless extent - they helped us more than once with some flexible solutions and extended quotas. Many thanks!

ns_active.js

@@ -0,0 +1,18 @@
+/*
+ ***** ACTIVE SUBDOMAINS (NS records)
+ * ***********************
+ *
+ * This list contains NS records in extension to the list of active CNAMEs in this repository.
+ *
+ * Second level NS records makes it possible for subdomain owners to redirect to another DNS provider.
+ * This option has potential security issues (e.g. if you use another DNS provider to add MX records to route your email traffic)
+ * and is only meant for advanced users. 
+ *
+ * You should avoid this option if you only want a JS.ORG subdomain!!!
+ * FYI: https://github.com/js-org/js.org/issues/2890
+ */
+ 
+ var ns_active = {
+  "engine262": ["ns5.he.net", "ns4.he.net", "ns3.he.net", "ns2.he.net"],
+  "shebang": ["dns1.p01.nsone.net", "dns2.p01.nsone.net", "dns3.p01.nsone.net", "dns4.p01.nsone.net"]
+ }

records_restricted.js

@@ -11,11 +11,12 @@
  * 
  *      Some of these subdomains are reserved for JS.ORG itself (e.g.: mail.js.org, admin.js.org).
  *      Others are so generic that they should be used for community driven pages only (e.g.: blog.js.org, docs.js.org).
- *      If you are willing to use one of the restricted subdomains in a way the community can benfit and participate, you can always file an issue and start a discussion.
+ *      If you are willing to use one of the restricted subdomains in a way the community can benefit and participate, you can always file an issue and start a discussion.
  * 
  */
 
 var cnames_restricted = [
+    "(1/2/3/...)"
     "about",
     "account(s)",
     "ad(s)",
@@ -31,6 +32,7 @@ var cnames_restricted = [
     "bar",
     "base",
     "basic(s)",
+    "bbs",
     "become",
     "bible",
     "blog(s)",
@@ -84,6 +86,7 @@ var cnames_restricted = [
     "es2015",
     "es6",
     "event(s)",
+    "exchange",
     "faq(s)",
     "file(s)",
     "find",
@@ -132,7 +135,8 @@ var cnames_restricted = [
     "logout",
     "loop(s)",
     "love",
-    "mail",
+    "m",
+    "mail(1/2)",
     "main",
     "map(s)",
     "market(s)",
@@ -142,6 +146,7 @@ var cnames_restricted = [
     "member(s)",
     "mobile",
     "module(s)",
+    "mx",
     "my",
     "native",
     "net",
@@ -151,13 +156,13 @@ var cnames_restricted = [
     "newsletter(s)",
     "ninja(s)",
     "now",
-    "ns1",
-    "ns2",
+    "ns(1/2)",
     "object(s)",
     "online",
     "open",
     "orig",
     "origin",
+    "owa",
     "package(s)",
     "page(s)",
     "password(s)",
@@ -188,6 +193,7 @@ var cnames_restricted = [
     "serv",
     "server(s)",
     "service(s)",
+    "shop(s)"
     "site(s)",
     "smtp",
     "socket(s)",
@@ -198,6 +204,7 @@ var cnames_restricted = [
     "sub(s)",
     "subdomain(s)",
     "subscribe",
+    "support",
     "sync",
     "system(s)",
     "tag(s)",
@@ -226,11 +233,15 @@ var cnames_restricted = [
     "validate",
     "var(s)",
     "virtual",
+    "vpn",
+    "vps",
     "wasm",
     "watch",
     "web",
+    "webmail",
     "webmaster",
     "world",
-    "www",
+    "ww(1/2/3/42)",
+    "www(1/2/3/42)",
     "xml"
 ]