Merge branch 'master' into patch-2

Author: binaryseed

ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE.md

@@ -16,8 +16,8 @@ through a series of *stages* intended to improve *visibility*, allow for
 becomes ever more important as GraphQL's community broadens.
 
 When proposing or weighing-in on any issue or pull request, consider the
-[Code of Conduct](CODE_OF_CONDUCT.md) to better understand expected and
-unacceptable behavior.
+[Code of Conduct](https://github.com/graphql/foundation/blob/master/CODE-OF-CONDUCT.md)
+to better understand expected and unacceptable behavior.
 
 
 ## Contributing to GraphQL Libraries
@@ -125,7 +125,7 @@ All RFCs start as either a *strawman* or *proposal*.
 A RFC at the *strawman* stage captures a described problem or
 partially-considered solutions. A *strawman* does not need to meet any entrance
 criteria. A *strawman's* goal is to prove or disprove a problem and guide
-discussion towards either rejection or a preferred solution. A *strawman* may 
+discussion towards either rejection or a preferred solution. A *strawman* may
 be an issue or a pull request (though an illustrative pull request is preferrable).
 
 *There is no entrance criteria for a Strawman*
@@ -160,8 +160,8 @@ A *proposal* is subject to the same discussion as a *strawman*: ensuring that it
 is well aligned with the *guiding principles*, is a problem worth solving, and
 is the preferred solution to that problem. A *champion* is not expected to have
 confidence in every detail at this stage and should instead focus on identifying
-and resolving issues and edge-cases. To better understand the technical 
-ramifications of the *proposal*, a *champion* is encouraged to implement it in a 
+and resolving issues and edge-cases. To better understand the technical
+ramifications of the *proposal*, a *champion* is encouraged to implement it in a
 GraphQL library.
 
 Most *proposals* are expected to evolve or change and may be rejected. Therefore,
@@ -201,8 +201,8 @@ feature without explicit opt-in when possible.
 ## Stage 3: *Accepted*
 
 An RFC at the *accepted* stage is a completed solution. According to a spec
-editor it is ready to be merged as-is into the spec document. The RFC is 
-ready to be deployed in GraphQL libraries. An *accepted* RFC must be 
+editor it is ready to be merged as-is into the spec document. The RFC is
+ready to be deployed in GraphQL libraries. An *accepted* RFC must be
 implemented in GraphQL.js.
 
 *Entrance criteria:*

PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,14 @@
 # GraphQL
 
 The GraphQL specification is edited in the markdown files found in [`/spec`](./spec)
-the latest release of which is published at https://facebook.github.io/graphql/.
+the latest release of which is published at https://graphql.github.io/graphql-spec/.
 
-The latest draft specification can be found at https://facebook.github.io/graphql/draft/
+The latest draft specification can be found at https://graphql.github.io/graphql-spec/draft/
 which tracks the latest commit to the master branch in this repository.
 
 Previous releases of the GraphQL specification can be found at permalinks that
-match their [release tag](https://github.com/facebook/graphql/releases). For
-example, https://facebook.github.io/graphql/October2016/. If you are linking
+match their [release tag](https://github.com/graphql/graphql-spec/releases). For
+example, https://graphql.github.io/graphql-spec/October2016/. If you are linking
 directly to the GraphQL specification, it's best to link to a tagged permalink
 for the particular referenced version.
 

CODE_OF_CONDUCT.md

@@ -7,13 +7,10 @@
     "Daniel Schafer <dschafer@fb.com>"
   ],
   "license": "OWFa-1.0",
-  "homepage": "https://facebook.github.io/graphql",
-  "bugs": {
-    "url": "https://github.com/facebook/graphql/issues"
-  },
+  "homepage": "https://graphql.github.io/graphql-spec",
   "repository": {
     "type": "git",
-    "url": "http://github.com/facebook/graphql.git"
+    "url": "http://github.com/graphql/graphql-spec.git"
   },
   "scripts": {
     "test": "spec-md spec/GraphQL.md > /dev/null",

CONTRIBUTING.md

@@ -11,7 +11,7 @@ GITTAG=$(git tag --points-at HEAD)
 # Check out gh-pages locally.
 echo "Cloning gh-pages"
 rm -rf gh-pages
-git clone -b gh-pages "https://${GH_TOKEN}@github.com/facebook/graphql.git" gh-pages > /dev/null 2>&1
+git clone -b gh-pages "https://${GH_TOKEN}@github.com/graphql/graphql-spec.git" gh-pages > /dev/null 2>&1
 
 # Replace /draft with this build.
 echo "Publishing to: /draft"
@@ -74,7 +74,7 @@ HTML="$HTML
       <td></td>
     </tr>"
 
-GITHUB_RELEASES="https://github.com/facebook/graphql/releases/tag"
+GITHUB_RELEASES="https://github.com/graphql/graphql-spec/releases/tag"
 for GITTAG in $(git tag -l --sort='-*committerdate') ; do
   VERSIONYEAR=${GITTAG: -4}
   TAGTITLE="${GITTAG%$VERSIONYEAR} $VERSIONYEAR"

README.md

@@ -162,7 +162,7 @@ If a solution places any restrictions on member types, compliance with these res
 
 In addition to containing Input types, member type may also contain Leaf types like `Scalar`s or `Enum`s.
 
-* Objection: Multiple Leaf types serialize the same way, making it impossible to distinguish the type without additional information. For example, a `String`, `ID` and `Enum`.
+* Objection: multiple Leaf types serialize the same way, making it impossible to distinguish the type without additional information. For example, a `String`, `ID` and `Enum`.
   * Potential solution: only allow a single built-in leaf type per input union.
 * Objection: Output polymorphism is restricted to Object types only. Supporting Leaf types in Input polymorphism would create a new inconsistency.
 

package.json

@@ -8,16 +8,19 @@ GraphQL
 This is the specification for GraphQL, a query language and execution engine
 originally created at Facebook in 2012 for describing the capabilities and
 requirements of data models for client-server applications. The development of
-this open standard started in 2015.
+this open standard started in 2015. This specification was licensed under OWFa
+1.0 in 2017. Copyright and trademark was transfered to the GraphQL Foundation
+in 2019.
 
 GraphQL has evolved and may continue to evolve in future editions of this
 specification. Previous editions of the GraphQL specification can be found at
-permalinks that match their [release tag](https://github.com/facebook/graphql/releases).
-The latest working draft release can be found at [facebook.github.io/graphql/draft/](https://facebook.github.io/graphql/draft/).
+permalinks that match their [release tag](https://github.com/graphql/graphql-spec/releases).
+The latest working draft release can be found at [https://graphql.github.io/graphql-spec/draft](https://graphql.github.io/graphql-spec/draft).
 
 **Copyright notice**
 
-Copyright © 2015-present, Facebook, Inc.
+Copyright © 2015-2018, Facebook, Inc.
+Copyright © 2019-present, GraphQL Foundation
 
 As of September 26, 2017, the following persons or entities have made this
 Specification available under the Open Web Foundation Final Specification
@@ -26,7 +29,7 @@ Agreement (OWFa 1.0), which is available at [openwebfoundation.org](http://www.o
 * Facebook, Inc.
 
 You can review the signed copies of the Open Web Foundation Final Specification
-Agreement Version 1.0 for this specification at [github.com/facebook/graphql](https://github.com/facebook/graphql/tree/master/signed-agreements),
+Agreement Version 1.0 for this specification at [github.com/graphql/graphql-spec](https://github.com/graphql/graphql-spec/tree/master/signed-agreements),
 which may also include additional parties to those listed above.
 
 Your use of this Specification may be subject to other third party rights.