Skip to content

Commit f3f6171

Browse files
committed
Merge branch 'master' of github.com:json-schema-org/json-schema-spec into aaa-uri-fix
2 parents 851daec + 0ad7320 commit f3f6171

File tree

3 files changed

+60
-61
lines changed

3 files changed

+60
-61
lines changed

jsonschema-core.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -382,23 +382,22 @@
382382
<t>
383383
JSON Schema uses <xref target="json-reference">JSON Reference</xref> as a
384384
mechanism for schema addressing. It extends this specification in two ways:
385-
385+
386386
<list>
387387
<t>JSON Schema offers facilities to alter the base URI against which a
388388
URI reference must resolve by the means of the "id" keyword;</t>
389389
<t>it offers schemas a mechanism to declare their own URIs, placing no limits on the structure of the URI</t>
390390
</list>
391391

392392
</t>
393-
393+
394394
<t>
395395
<!-- TODO: RFC3986 defines exactly how to do this -->
396396
The initial base URI of a schema is the URI of the schema itself, or a suitable substitute URI if none is known.
397397
</t>
398398
</section>
399399

400400
<section title='Base URI alteration with the "id" keyword'>
401-
402401
<section title="Valid values">
403402
<t>
404403
The value for this keyword MUST be a string, and MUST be a valid URI-reference [RFC3986].
@@ -458,7 +457,7 @@
458457
<t hangText="#/schema3">urn:uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f</t>
459458
</list>
460459
</t>
461-
460+
462461
</section>
463462

464463
<section title="Methods for dereferencing">
@@ -467,7 +466,7 @@
467466
This is known as "canonical referencing".
468467
</t>
469468
<t>
470-
Tools MAY also take note of the URIs schemas provide for themselves using "id", and use these values for schema dereferencing as well.
469+
Tools MAY also take note of the URIs schemas provide for themselves using "id", and use these values for schema dereferencing as well.
471470
This is known as "inline referencing".
472471
</t>
473472

@@ -509,13 +508,13 @@
509508
schema, and choose to use the appropriate subschema.</t>
510509
</list>
511510
</t>
512-
511+
513512
</section>
514513

515514
<section title="Inline dereferencing and fragments">
516515
<t>
517516
When using inline dereferencing, a base URI may lead to a URI which
518-
has a non empty fragment part which is not a JSON Pointer, as in this
517+
has a non-empty fragment part which is not a JSON Pointer, as in this
519518
example:
520519
</t>
521520

@@ -540,7 +539,7 @@
540539
An implementation choosing to support inline dereferencing SHOULD be able to use this kind of reference.
541540
</t>
542541
</section>
543-
542+
544543
</section>
545544

546545
<section title="Interoperability considerations">
@@ -587,7 +586,7 @@ Link: <http://example.com/my-hyper-schema#>; rel="describedBy"
587586
</figure>
588587

589588
</section>
590-
589+
591590
<section title='Correlation by means of the "Content-Type" header'>
592591
<t>
593592
Instances may also specify a schema using the "profile" MIME type parameter in the Content-Type header, when the MIME type MUST be "application/json", or any other subtype.
@@ -602,7 +601,7 @@ Link: <http://example.com/my-hyper-schema#>; rel="describedBy"
602601
<artwork>
603602
<![CDATA[
604603
Content-Type: application/my-media-type+json;
605-
profile=http://example.com/my-hyper-schema#
604+
profile="http://example.com/my-hyper-schema#"
606605
]]>
607606
</artwork>
608607
</figure>

0 commit comments

Comments
 (0)