Skip to content

Commit 9304f4a

Browse files
authored
Merge branch 'json-schema-org:main' into main
2 parents abf0e60 + 33e67ae commit 9304f4a

File tree

3 files changed

+31
-18
lines changed

3 files changed

+31
-18
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: JSON Schema
2+
on:
3+
- push
4+
jobs:
5+
specs:
6+
runs-on: ubuntu-22.04
7+
steps:
8+
- uses: actions/checkout@v3
9+
- uses: actions/setup-python@v4
10+
with:
11+
python-version: "3.10"
12+
- run: pip install --requirement requirements.txt
13+
- run: xml2rfc --version
14+
- run: make all
15+
- uses: actions/upload-artifact@v3
16+
with:
17+
name: specification-docs
18+
path: |
19+
*.html
20+
*.txt
21+
!requirements.txt

.travis.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

jsonschema-core.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
</t>
188188
<t>
189189
In JSON Schema, the terms "JSON document", "JSON text", and "JSON value" are
190-
interchangeable because of the data model it defines.
190+
interchangeable because of the data model it defines in <xref target="data-model" />.
191191
</t>
192192
<t>
193193
JSON Schema is only defined over JSON documents. However, any document or memory
@@ -210,7 +210,7 @@
210210
media type which defines handling for fragments in the IRI.
211211
</t>
212212

213-
<section title="Instance Data Model">
213+
<section title="Instance Data Model" anchor="data-model">
214214
<t>
215215
JSON Schema interprets documents according to a data model. A JSON value
216216
interpreted according to this data model is called an "instance".
@@ -679,7 +679,7 @@
679679
which processing begins, even if it is not a schema resource root.
680680
The path from this root schema to any particular keyword (that
681681
includes any "$ref" and "$dynamicRef" keywords that may have
682-
been resolved) is considered the keyword's "validation path."
682+
been resolved) is considered the keyword's "evaluation path."
683683
</t>
684684
<t>
685685
Lexical and dynamic scopes align until a reference keyword
@@ -698,7 +698,7 @@
698698
when reporting errors and collected annotations, as it may be possible
699699
to revisit the same lexical scope repeatedly with different dynamic
700700
scopes. In such cases, it is important to inform the user of the
701-
dynamic path that produced the error or annotation.
701+
evaluation path that produced the error or annotation.
702702
</t>
703703
</section>
704704
<section title="Keyword Interactions">
@@ -930,12 +930,12 @@
930930
The instance ___location to which it is attached, as a JSON Pointer
931931
</t>
932932
<t>
933-
The schema ___location path, indicating how reference keywords
933+
The evaluation path, indicating how reference keywords
934934
such as "$ref" were followed to reach the absolute schema ___location.
935935
</t>
936936
<t>
937937
The absolute schema ___location of the attaching keyword, as a IRI.
938-
This MAY be omitted if it is the same as the schema ___location path
938+
This MAY be omitted if it is the same as the evaluation path
939939
from above.
940940
</t>
941941
<t>
@@ -1016,11 +1016,11 @@
10161016
author to write descriptions that work when combined in this way.
10171017
</t>
10181018
<t>
1019-
The application can use the schema ___location path to determine which
1019+
The application can use the evaluation path to determine which
10201020
values are which. The values in the feature's immediate "enabled"
10211021
property schema are more specific, while the values under the re-usable
1022-
schema that is referenced to with "$ref" are more generic. The schema
1023-
___location path will show whether each value was found by crossing a
1022+
schema that is referenced to with "$ref" are more generic. The evaluation
1023+
path will show whether each value was found by crossing a
10241024
"$ref" or not.
10251025
</t>
10261026
<t>
@@ -3605,7 +3605,7 @@ https://example.com/schemas/common#/$defs/count/minimum
36053605
scope before following the reference.
36063606
</t>
36073607
<t>
3608-
At this point, the dynamic path is
3608+
At this point, the evaluation path is
36093609
"#/$ref/properties/children/items/$dynamicRef", with a dynamic scope
36103610
containing (from the outermost scope to the innermost):
36113611
<list style="numbers">

0 commit comments

Comments
 (0)