Merge branch 'formatformat' of https://github.com/handrews/json-schema-spec into handrews-formatformat

Author: awwright

hyper-schema.json

@@ -19,7 +19,7 @@
                 "href": {
                     "description": "a URI template, as defined by RFC 6570",
                     "type": "string",
-                    "format": "uritemplate"
+                    "format": "uri-template"
                 },
                 "hrefSchema": {
                     "description": "a schema for validating user input to the URI template, where the input is in the form of a JSON object with property names matching variable names in \"href\"",

jsonschema-validation.xml

@@ -849,7 +849,7 @@
                     </t>
                 </section>
 
-                <section title="uriref">
+                <section title="uri-reference">
                     <t>
                         This attribute applies to string instances.
                     </t>
@@ -859,7 +859,7 @@
                     </t>
                 </section>
 
-                <section title="uritemplate">
+                <section title="uri-template">
                     <t>
                         This attribute applies to string instances.
                     </t>
@@ -869,7 +869,7 @@
                     </t>
                 </section>
 
-                <section title="jsonpointer">
+                <section title="json-pointer">
                     <t>
                         This attribute applies to string instances.
                     </t>
@@ -965,6 +965,7 @@
                 <list style="hanging">
                     <t hangText="draft-wright-json-schema-validation-01">
                         <list style="symbols">
+                            <t>Standardized on hyphenated format names</t>
                             <t>Split apart additionalItems/items</t>
                             <t>Reworked properties/patternProperties/additionalProperties definition</t>
                             <t>Added "examples" keyword</t>

links.json

@@ -8,7 +8,7 @@
         "href": {
             "description": "a URI template, as defined by RFC 6570",
             "type": "string",
-            "format": "uritemplate"
+            "format": "uri-template"
         },
         "hrefSchema": {
             "description": "a schema for validating user input to the URI template, where the input is in the form of a JSON object with property names matching variable names in \"href\"",

schema.json

@@ -40,15 +40,15 @@
     "properties": {
         "$id": {
             "type": "string",
-            "format": "uriref"
+            "format": "uri-reference"
         },
         "$schema": {
             "type": "string",
             "format": "uri"
         },
         "$ref": {
             "type": "string",
-            "format": "uriref"
+            "format": "uri-reference"
         },
         "title": {
             "type": "string"