Skip to content

Commit e133159

Browse files
handrewshandrews
authored
Merge pull request #598 from handrews/administrivia
JSON RFC update, fix draft numbers, update affiliations
2 parents 9f57aa7 + 3a51736 commit e133159

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

‎jsonschema-core.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!ENTITY RFC6839 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6839.xml">
66
<!ENTITY RFC6901 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6901.xml">
77
<!ENTITY RFC7049 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.7049.xml">
8-
<!ENTITY RFC7159 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.7159.xml">
8+
<!ENTITY RFC8259 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.8259.xml">
99
<!ENTITY RFC7231 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.7231.xml">
1010
<!ENTITY RFC8288 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.8288.xml">
1111
<!ENTITY ldp SYSTEM "https://xml2rfc.tools.ietf.org/public/rfc/bibxml4/reference.W3C.REC-ldp-20150226.xml">
@@ -30,7 +30,6 @@
3030
</author>
3131

3232
<author fullname="Henry Andrews" initials="H" surname="Andrews" role="editor">
33-
<organization>Cloudflare, Inc.</organization>
3433
<address>
3534
<postal>
3635
<street></street>
@@ -108,7 +107,7 @@
108107
<t>
109108
The terms "JSON", "JSON text", "JSON value", "member", "element", "object", "array",
110109
"number", "string", "boolean", "true", "false", and "null" in this document are to
111-
be interpreted as defined in <xref target="RFC7159">RFC 7159</xref>.
110+
be interpreted as defined in <xref target="RFC8259">RFC 8259</xref>.
112111
</t>
113112
</section>
114113

@@ -513,7 +512,7 @@
513512

514513
<section title="Range of JSON Values">
515514
<t>
516-
An instance may be any valid JSON value as defined by <xref target="RFC7159">JSON</xref>.
515+
An instance may be any valid JSON value as defined by <xref target="RFC8259">JSON</xref>.
517516
JSON Schema imposes no restrictions on type: JSON Schema can describe any JSON
518517
value, including, for example, null.
519518
</t>
@@ -1457,7 +1456,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
14571456
<section title="Security Considerations" anchor="security">
14581457
<t>
14591458
Both schemas and instances are JSON values. As such, all security considerations
1460-
defined in <xref target="RFC7159">RFC 7159</xref> apply.
1459+
defined in <xref target="RFC8259">RFC 8259</xref> apply.
14611460
</t>
14621461
<t>
14631462
Instances and schemas are both frequently written by untrusted third parties, to be
@@ -1498,7 +1497,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
14981497
<t>
14991498
Encoding considerations: Encoding considerations are
15001499
identical to those specified for the "application/json"
1501-
media type. See <xref target="RFC7159">JSON</xref>.
1500+
media type. See <xref target="RFC8259">JSON</xref>.
15021501
</t>
15031502
<t>
15041503
Security considerations: See Section
@@ -1541,7 +1540,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
15411540
<t>
15421541
Encoding considerations: Encoding considerations are
15431542
identical to those specified for the "application/json"
1544-
media type. See <xref target="RFC7159">JSON</xref>.
1543+
media type. See <xref target="RFC8259">JSON</xref>.
15451544
</t>
15461545
<t>
15471546
Security considerations: See Section
@@ -1569,7 +1568,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
15691568
&RFC3986;
15701569
&RFC6839;
15711570
&RFC6901;
1572-
&RFC7159;
1571+
&RFC8259;
15731572
&ldp;
15741573
</references>
15751574

@@ -1585,7 +1584,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
15851584
<organization/>
15861585
</author>
15871586
<author initials="H." surname="Andrews">
1588-
<organization>Cloudflare, Inc.</organization>
1587+
<organization/>
15891588
</author>
15901589
<author initials="G." surname="Luff">
15911590
<organization/>
@@ -1598,7 +1597,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
15981597
<front>
15991598
<title>JSON Hyper-Schema: A Vocabulary for Hypermedia Annotation of JSON</title>
16001599
<author initials="H." surname="Andrews">
1601-
<organization>Cloudflare, Inc.</organization>
1600+
<organization/>
16021601
</author>
16031602
<author initials="A." surname="Wright">
16041603
<organization/>

‎jsonschema-hyperschema.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</title>
3232

3333
<author fullname="Henry Andrews" initials="H" surname="Andrews" role="editor">
34-
<organization>Cloudflare, Inc.</organization>
3534
<address>
3635
<postal>
3736
<street></street>
@@ -2546,11 +2545,11 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
25462545
<organization/>
25472546
</author>
25482547
<author initials="H." surname="Andrews">
2549-
<organization>Cloudflare, Inc.</organization>
2548+
<organization/>
25502549
</author>
25512550
<date year="2018" month="January"/>
25522551
</front>
2553-
<seriesInfo name="Internet-Draft" value="draft-handrews-relative-json-pointer-01" />
2552+
<seriesInfo name="Internet-Draft" value="draft-handrews-relative-json-pointer-02" />
25542553
</reference>
25552554
<reference anchor="json-schema">
25562555
<front>
@@ -2559,11 +2558,11 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
25592558
<organization/>
25602559
</author>
25612560
<author initials="H." surname="Andrews">
2562-
<organization>Cloudflare, Inc.</organization>
2561+
<organization/>
25632562
</author>
25642563
<date year="2017" month="November"/>
25652564
</front>
2566-
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-00" />
2565+
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-02" />
25672566
</reference>
25682567
<reference anchor="json-schema-validation">
25692568
<front>
@@ -2572,14 +2571,14 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
25722571
<organization/>
25732572
</author>
25742573
<author initials="H." surname="Andrews">
2575-
<organization>Cloudflare, Inc.</organization>
2574+
<organization/>
25762575
</author>
25772576
<author initials="G." surname="Luff">
25782577
<organization/>
25792578
</author>
25802579
<date year="2017" month="November"/>
25812580
</front>
2582-
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-validation-00" />
2581+
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-validation-02" />
25832582
</reference>
25842583
</references>
25852584
<references title="Informative References">

‎jsonschema-validation.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!ENTITY RFC6531 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6531.xml">
1717
<!ENTITY RFC6570 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6570.xml">
1818
<!ENTITY RFC6901 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6901.xml">
19-
<!ENTITY RFC7159 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.7159.xml">
19+
<!ENTITY RFC8259 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.8259.xml">
2020
]>
2121
<?rfc toc="yes"?>
2222
<?rfc symrefs="yes"?>
@@ -39,7 +39,6 @@
3939
</author>
4040

4141
<author fullname="Henry Andrews" initials="H" surname="Andrews" role="editor">
42-
<organization>Cloudflare, Inc.</organization>
4342
<address>
4443
<postal>
4544
<street></street>
@@ -186,7 +185,7 @@
186185

187186
<list>
188187
<t>individual Unicode characters, as defined by the <xref
189-
target="RFC7159">JSON specification</xref>;</t>
188+
target="RFC8259">JSON specification</xref>;</t>
190189
<t>simple character classes ([abc]), range character classes ([a-z]);</t>
191190
<t>complemented character classes ([^abc], [^a-z]);</t>
192191
<t>simple quantifiers: "+" (one or more), "*" (zero or more), "?" (zero or
@@ -334,7 +333,7 @@
334333
</t>
335334
<t>
336335
The length of a string instance is defined as the number of its
337-
characters as defined by <xref target="RFC7159">RFC 7159</xref>.
336+
characters as defined by <xref target="RFC8259">RFC 8259</xref>.
338337
</t>
339338
</section>
340339

@@ -349,7 +348,7 @@
349348

350349
<t>
351350
The length of a string instance is defined as the number of its
352-
characters as defined by <xref target="RFC7159">RFC 7159</xref>.
351+
characters as defined by <xref target="RFC8259">RFC 8259</xref>.
353352
</t>
354353
<t>
355354
Omitting this keyword has the same behavior as a value of 0.
@@ -1023,7 +1022,7 @@
10231022
&RFC6570;
10241023
&RFC6531;
10251024
&RFC6901;
1026-
&RFC7159;
1025+
&RFC8259;
10271026
<reference anchor="ecma262"
10281027
target="http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf">
10291028
<front>
@@ -1052,7 +1051,7 @@
10521051
<organization/>
10531052
</author>
10541053
<author initials="H." surname="Andrews">
1055-
<organization>Cloudflare, Inc.</organization>
1054+
<organization/>
10561055
</author>
10571056
<date year="2017" month="November"/>
10581057
</front>

0 commit comments

Comments
 (0)