Skip to content

Commit 8268e40

Browse files
committed
Merge branch 'gregsdennis/id-updates' of github.com:json-schema-org/json-schema-spec into gregsdennis/id-updates
2 parents 86647d1 + 17db555 commit 8268e40

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

jsonschema-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2246,7 +2246,7 @@ determines the canonical nature of the resulting full IRI.[^18]
22462246
and direct you to read the CREF located in {{#embedded}} for further comments.
22472247

22482248
While the following IRIs do correctly indicate specific schemas, per the reasons
2249-
outlined in {{embedded}}, they are to be avoided:
2249+
outlined in {{embedded}}, they are to be avoided as they may not work in all implementations:
22502250

22512251
Document location `/$defs/B`:
22522252
- canonical (and base) `IRI: https://example.com/other.json`

jsonschema-validation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ representation of an IP address as follows:
444444
[RFC3986](#rfc3986).
445445
- *iri:* A string instance is valid against this attribute if it is a valid IRI,
446446
according to [RFC3987](#rfc3987).
447-
- *IRI reference:* A string instance is valid against this attribute if it is a
447+
- *iri-reference:* A string instance is valid against this attribute if it is a
448448
valid IRI Reference (either an IRI or a relative-reference), according to
449449
[RFC3987](#rfc3987).
450450
- *uuid:* A string instance is valid against this attribute if it is a valid
@@ -948,7 +948,7 @@ schema form to the core spec
948948
- Restored "regex" format (removal was unintentional)
949949
- Added "date" and "time" formats, and reserved additional RFC 3339 format
950950
names
951-
- I18N formats: "iri", "IRI reference", "idn-hostname", "idn-email"
951+
- I18N formats: "iri", "iri-reference", "idn-hostname", "idn-email"
952952
- Clarify that "json-pointer" format means string encoding, not URI fragment
953953
- Fixed typo that inverted the meaning of `minimum` and `exclusiveMinimum`
954954
- Move format syntax references into Normative References

0 commit comments

Comments
 (0)