From 0e3189d6c934ea1a9bc01254306766fff35e7039 Mon Sep 17 00:00:00 2001
From: Henry Andrews <henry@cloudflare.com>
Date: Fri, 4 Nov 2016 11:28:01 -0700
Subject: [PATCH] Update meta-schemas for changes in the last draft.

These changes were made for draft 05 but we did not update the
meta-schemas for that draft.  For the next draft we will definitely
need an update, so add these in.
---
 hyper-schema.json | 16 ++++++----------
 schema.json       |  7 +++++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/hyper-schema.json b/hyper-schema.json
index 1a22776b..ec9c1441 100644
--- a/hyper-schema.json
+++ b/hyper-schema.json
@@ -46,13 +46,14 @@
         "oneOf": {"$ref": "#/definitions/schemaArray"},
         "not": { "$ref": "#" },
 
+        "base": {
+            "description": "URI Template resolved as for the 'href' keyword in the Link Description Object.  The resulting URI Reference is resolved against the current URI base and sets the new URI base for URI references within the instance.",
+            "type": "string"
+        },
         "links": {
             "type": "array",
             "items": {"$ref": "#/definitions/linkDescription"}
         },
-        "fragmentResolution": {
-            "type": "string"
-        },
         "media": {
             "type": "object",
             "properties": {
@@ -65,11 +66,6 @@
                     "type": "string"
                 }
             }
-        },
-        "pathStart": {
-            "description": "Instances' URIs must start with this value for this schema to apply to them",
-            "type": "string",
-            "format": "uri"
         }
     },
     "definitions": {
@@ -80,7 +76,7 @@
         "linkDescription": {
             "title": "Link Description Object",
             "type": "object",
-            "required": ["href", "rel"],
+            "required": ["href"],
             "properties": {
                 "href": {
                     "description": "a URI template, as defined by RFC 6570, with the addition of the $, ( and ) characters for pre-processing",
@@ -103,7 +99,7 @@
                     "type": "string"
                 },
                 "method": {
-                    "description": "method for requesting the target of the link (e.g. for HTTP this might be \"GET\" or \"DELETE\")",
+                    "description": "specifies that the client can construct a templated query (\"get\") or non-idempotent request (\"post\") to a resource.",
                     "type": "string"
                 },
                 "encType": {
diff --git a/schema.json b/schema.json
index a013b2ce..b31dc7ae 100644
--- a/schema.json
+++ b/schema.json
@@ -13,7 +13,10 @@
             "minimum": 0
         },
         "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+            "allOf": [
+                { "$ref": "#/definitions/positiveInteger" },
+                { "default": 0 }
+            ]
         },
         "simpleTypes": {
             "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
@@ -28,7 +31,7 @@
     "properties": {
         "id": {
             "type": "string",
-            "format": "uri"
+            "format": "uriref"
         },
         "$schema": {
             "type": "string",