Skip to content

Commit 11ecbe2

Browse files
authored
Merge branch 'master' into issue-1019-known-vocabs-are-always-processed
2 parents fd40243 + 4a8cf4f commit 11ecbe2

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

jsonschema-core.xml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,8 @@
4545

4646
<author fullname="Greg Dennis" initials="G" surname="Dennis">
4747
<address>
48-
<postal>
49-
<street></street>
50-
<city>Auckland</city>
51-
<region></region>
52-
<country>NZ</country>
53-
</postal>
5448
<email>[email protected]</email>
49+
<uri>https://github.com/gregsdennis</uri>
5550
</address>
5651
</author>
5752

@@ -103,7 +98,8 @@
10398
This specification defines JSON Schema core terminology and mechanisms, including
10499
pointing to another JSON Schema by reference,
105100
dereferencing a JSON Schema reference,
106-
specifying the vocabulary being used,
101+
specifying the dialect being used,
102+
specifying a dialect's vocabulary requirements,
107103
and defining the expected output.
108104
</t>
109105
<t>
@@ -146,9 +142,10 @@
146142
some sort of condition.
147143
</t>
148144
<t>
149-
To facilitate re-use, keywords can be organized into vocabularies. A vocabulary
145+
To facilitate re-use, keywords can be organized into vocabularies. A vocabulary
150146
consists of a list of keywords, together with their syntax and semantics.
151-
A set of vocabularies identified by a meta-schema is known as a dialect.
147+
A dialect is defined as a set of vocabularies and their required support
148+
identified in a meta-schema.
152149
</t>
153150
<t>
154151
JSON Schema can be extended either by defining additional vocabularies,
@@ -1198,9 +1195,10 @@
11981195
vocabularies available for use in schemas described by that meta-schema.
11991196
It is also used to indicate whether each vocabulary is required or optional,
12001197
in the sense that an implementation MUST understand the required vocabularies
1201-
in order to successfully process the schema. Any vocabulary that is
1202-
understood by the implementation MUST be processed in a manner consistent
1203-
with the semantic definitions contained within the vocabulary.
1198+
in order to successfully process the schema. Together, this information forms
1199+
a dialect. Any vocabulary that is understood by the implementation MUST be
1200+
processed in a manner consistent with the semantic definitions contained
1201+
within the vocabulary.
12041202
</t>
12051203
<t>
12061204
The value of this keyword MUST be an object. The property names in the

jsonschema-validation.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,6 +1350,9 @@
13501350
<author initials="B." surname="Hutton">
13511351
<organization/>
13521352
</author>
1353+
<author initials="G." surname="Dennis">
1354+
<organization/>
1355+
</author>
13531356
<date year="2020" month="November"/>
13541357
</front>
13551358
<seriesInfo name="Internet-Draft" value="draft-bhutton-json-schema-00" />

0 commit comments

Comments
 (0)