Merge upstream changes into markdownify

Author: adamvoss

documentation.md

@@ -5,14 +5,14 @@ layout: page
 Specification
 -------------
 
-The latest Internet-Draft at the IETF is v5, published 2016-10-13. (Due to a change in authorship the I-D numbering has been reset). The specification is split into three parts, Core, Validation, and Hyper-Schema:
+The latest Internet-Drafts at the IETF are the draft-wright-json-schema\*-01 documents, which correspond to the draft-06 meta-schemas. These were published on 2017-04-15. (Due to a change in authorship the I-D numbering was reset with the previous draft). The specification is split into three parts, Core, Validation, and Hyper-Schema:
 
 |--------------------------------------------------------------|-------------------------------------------------|
 | [JSON Schema Core](latest/json-schema-core.html)             | defines the basic foundation of JSON Schema     |
 | [JSON Schema Validation](latest/json-schema-validation.html) | defines the validation keywords of JSON Schema  |
 | [JSON Hyper-Schema](latest/json-schema-hypermedia.html)      | defines the hyper-media keywords of JSON Schema |
 
-They are also available on the IETF main site: [core (draft-wright-json-schema-00)](http://tools.ietf.org/html/draft-wright-json-schema-00), [validation (draft-wright-json-schema-validation-00)](http://tools.ietf.org/html/draft-wright-json-schema-validation-00) and [hyper-schema (draft-wright-json-schema-hyperschema-00)](http://tools.ietf.org/html/draft-wright-json-schema-hyperschema-00).
+They are also available on the IETF main site: [core (draft-wright-json-schema-01)](http://tools.ietf.org/html/draft-wright-json-schema-01), [validation (draft-wright-json-schema-validation-01)](http://tools.ietf.org/html/draft-wright-json-schema-validation-01) and [hyper-schema (draft-wright-json-schema-hyperschema-01)](http://tools.ietf.org/html/draft-wright-json-schema-hyperschema-01).
 
 For previous versions of the specification, please see the [Specification Links](https://github.com/json-schema-org/json-schema-spec/wiki/Specification-Links) page on our github wiki.
 
@@ -21,7 +21,7 @@ Meta-schemas
 
 The meta-schemas are the schemas which define the JSON Schema and Hyper-Schema formats.
 
-The latest meta-schema is draft-04. A future release with additional keywords will be published in the near future.
+The latest meta-schema is draft-06.
 
 |--------------------------------------------------------------|------------------------------------------------------------|
 | [Core/Validation Meta-Schema](http://json-schema.org/schema) | Used for schemas written for pure validation.              |

draft-06/hyper-schema

@@ -41,16 +41,12 @@
                     "description": "media type (as defined by RFC 2046) describing the link target",
                     "type": "string"
                 },
-                "method": {
-                    "description": "specifies that the client can construct a templated query (\"get\") or non-idempotent request (\"post\") to a resource.",
-                    "type": "string"
-                },
-                "encType": {
+                "submissionEncType": {
                     "description": "The media type in which to submit data along with the request",
                     "type": "string",
                     "default": "application/json"
                 },
-                "schema": {
+                "submissionSchema": {
                     "description": "Schema describing the data to submit along with the request",
                     "allOf": [ { "$ref": "#" } ]
                 }

draft-06/links

@@ -30,16 +30,12 @@
             "description": "media type (as defined by RFC 2046) describing the link target",
             "type": "string"
         },
-        "method": {
-                    "description": "specifies that the client can construct a templated query (\"get\") or non-idempotent request (\"post\") to a resource.",
-            "type": "string"
-        },
-        "encType": {
+        "submissionEncType": {
             "description": "The media type in which to submit data along with the request",
             "type": "string",
             "default": "application/json"
         },
-        "schema": {
+        "submissionSchema": {
             "description": "Schema describing the data to submit along with the request",
             "allOf": [ { "$ref": "hyper-schema#" } ]
         }

implementations.md

@@ -150,6 +150,7 @@ UI generation
     -   <a href="http://jsonary.com/" id="link-impl-jsonary">Jsonary</a> - *supports version 4* (MIT)
     -   <a href="http://metawidget.org/" id="link-impl-metawidget">Metawidget</a> (LGPL)
     -   <a href="https://github.com/Limenius/liform-react" id="link-impl-liform-react">Liform-react</a> (MIT)
+    -   <a href="http://jsonforms.io" id="link-impl-jsonforms">JSON Forms</a> (MIT)
 
 Editors
 -------
@@ -191,4 +192,4 @@ Other
     -   <a href="http://www.dojotoolkit.org/" id="link-impl-dojo">Dojo</a> (AFL or BSD) - supports some aspects of JSON Schema
     -   <a href="http://schematic-ipsum.herokuapp.com/" id="link-impl-schematic-ipsum">Schematic Ipsum</a> (MIT)
     -   <a href="https://github.com/tomarad/JSON-Schema-Instantiator" id="link-impl-json-schema-instantiator">JSON-Schema-Instantiator</a> (MIT)
-    -   <a href="https://github.com/andreineculau/json-schema-random" id="link-impl-json-schema-random">JSON Schema Random</a> (Apache 2.0)
+    -   <a href="https://github.com/andreineculau/json-schema-random" id="link-impl-json-schema-random">JSON Schema Random</a> (Apache 2.0)