Skip to content

Commit dabf8c0

Browse files
committed
Standardize on hyphenated format names
When we had ore formats in earlier drafts, all compound names (such as "date-time") were hyphenated. Draft 05 added "uriref" without a hyphen, which started looking weird when we added "uritemplate" and "jsonpointer" without hyphens to match it. This makes everything hyphenated (note "hostname" was deemed to be a single word in this context). "uriref" became "uri-reference" as that is the form that is most common in other RFCs.
1 parent 0a60dd9 commit dabf8c0

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

hyper-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"href": {
2020
"description": "a URI template, as defined by RFC 6570",
2121
"type": "string",
22-
"format": "uritemplate"
22+
"format": "uri-template"
2323
},
2424
"hrefSchema": {
2525
"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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@
849849
</t>
850850
</section>
851851

852-
<section title="uriref">
852+
<section title="uri-reference">
853853
<t>
854854
This attribute applies to string instances.
855855
</t>
@@ -859,7 +859,7 @@
859859
</t>
860860
</section>
861861

862-
<section title="uritemplate">
862+
<section title="uri-template">
863863
<t>
864864
This attribute applies to string instances.
865865
</t>
@@ -869,7 +869,7 @@
869869
</t>
870870
</section>
871871

872-
<section title="jsonpointer">
872+
<section title="json-pointer">
873873
<t>
874874
This attribute applies to string instances.
875875
</t>
@@ -965,6 +965,7 @@
965965
<list style="hanging">
966966
<t hangText="draft-wright-json-schema-validation-01">
967967
<list style="symbols">
968+
<t>Standardized on hyphenated format names</t>
968969
<t>Split apart additionalItems/items</t>
969970
<t>Reworked properties/patternProperties/additionalProperties definition</t>
970971
<t>Added "examples" keyword</t>

links.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"href": {
99
"description": "a URI template, as defined by RFC 6570",
1010
"type": "string",
11-
"format": "uritemplate"
11+
"format": "uri-template"
1212
},
1313
"hrefSchema": {
1414
"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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
"properties": {
4141
"$id": {
4242
"type": "string",
43-
"format": "uriref"
43+
"format": "uri-reference"
4444
},
4545
"$schema": {
4646
"type": "string",
4747
"format": "uri"
4848
},
4949
"$ref": {
5050
"type": "string",
51-
"format": "uriref"
51+
"format": "uri-reference"
5252
},
5353
"title": {
5454
"type": "string"

0 commit comments

Comments
 (0)