Skip to content

Commit 3fc5d1b

Browse files
authored
Merge pull request #496 from handrews/norm
Fix normative vs informative references
2 parents c179ebd + dd6e733 commit 3fc5d1b

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

jsonschema-hyperschema.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<!ENTITY rfc3986 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3986.xml">
66
<!ENTITY rfc4151 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.4151.xml">
77
<!--<!ENTITY rfc4287 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.4287.xml">-->
8-
<!--<!ENTITY rfc5226 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5226.xml">-->
98
<!ENTITY rfc5789 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5789.xml">
109
<!ENTITY rfc6068 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6068.xml">
1110
<!ENTITY rfc6570 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6570.xml">
@@ -2492,9 +2491,10 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
24922491
&rfc3986;
24932492
<!--&rfc4287;-->
24942493
&rfc6570;
2494+
&rfc6573;
24952495
&rfc6901;
2496+
&rfc8288;
24962497
&I-D.luff-relative-json-pointer;
2497-
&I-D.reschke-http-jfv;
24982498
<reference anchor="json-schema">
24992499
<front>
25002500
<title>JSON Schema: A Media Type for Describing JSON Documents</title>
@@ -2518,15 +2518,13 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
25182518
</references>
25192519
<references title="Informative References">
25202520
&rfc2046;
2521-
<!--&rfc5226;-->
25222521
&rfc4151;
25232522
&rfc5789;
25242523
&rfc6068;
2525-
&rfc6573;
25262524
&rfc7230;
25272525
&rfc7231;
25282526
&rfc7807;
2529-
&rfc8288;
2527+
&I-D.reschke-http-jfv;
25302528
</references>
25312529
<section title="Using JSON Hyper-Schema in APIs" anchor="apis">
25322530
<t>

jsonschema-validation.xml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,17 +1381,6 @@
13811381
<!-- References Section -->
13821382
<references title="Normative References">
13831383
&RFC2119;
1384-
<reference anchor="json-schema">
1385-
<front>
1386-
<title>JSON Schema: A Media Type for Describing JSON Documents</title>
1387-
<author/>
1388-
<date year="2016" month="October"/>
1389-
</front>
1390-
<seriesInfo name="Internet-Draft" value="draft-wright-json-schema-00" />
1391-
</reference>
1392-
</references>
1393-
1394-
<references title="Informative References">
13951384
&RFC1034;
13961385
&RFC2045;
13971386
&RFC2046;
@@ -1400,15 +1389,13 @@
14001389
&RFC3986;
14011390
&RFC3987;
14021391
&RFC4291;
1403-
&RFC4329;
1392+
&RFC5322;
14041393
&RFC5890;
14051394
&RFC5891;
14061395
&RFC6570;
14071396
&RFC6531;
14081397
&RFC6901;
14091398
&RFC7159;
1410-
&RFC5322;
1411-
&I-D.luff-relative-json-pointer;
14121399
<reference anchor="ecma262"
14131400
target="http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf">
14141401
<front>
@@ -1417,6 +1404,19 @@
14171404
<date/>
14181405
</front>
14191406
</reference>
1407+
&I-D.luff-relative-json-pointer;
1408+
<reference anchor="json-schema">
1409+
<front>
1410+
<title>JSON Schema: A Media Type for Describing JSON Documents</title>
1411+
<author/>
1412+
<date year="2016" month="October"/>
1413+
</front>
1414+
<seriesInfo name="Internet-Draft" value="draft-wright-json-schema-00" />
1415+
</reference>
1416+
</references>
1417+
1418+
<references title="Informative References">
1419+
&RFC4329;
14201420
</references>
14211421

14221422
<section title="Acknowledgments">
@@ -1462,6 +1462,8 @@
14621462
<t>I18N formats: "iri", "iri-reference", "idn-hostname", "idn-email"</t>
14631463
<t>Clarify that "json-pointer" format means string encoding, not URI fragment</t>
14641464
<t>Fixed typo that inverted the meaning of "minimum" and "exclusiveMinimum"</t>
1465+
<t>Move format syntax references into Normative References</t>
1466+
<t>JSON is a normative requirement</t>
14651467
</list>
14661468
</t>
14671469
<t hangText="draft-wright-json-schema-validation-01">

0 commit comments

Comments
 (0)