From c93f166626f764d345ff6e87fa63a9a597d90282 Mon Sep 17 00:00:00 2001 From: Henry Andrews Date: Thu, 14 Sep 2017 00:00:25 -0700 Subject: [PATCH 1/5] Internationalized resource identifiers --- jsonschema-validation.xml | 45 ++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/jsonschema-validation.xml b/jsonschema-validation.xml index 5455d7d2..047b7541 100644 --- a/jsonschema-validation.xml +++ b/jsonschema-validation.xml @@ -7,6 +7,7 @@ + @@ -994,24 +995,33 @@ -
+
- This attribute applies to string instances. - - - A string instance is valid against this attribute if it is a valid URI, - according to . - -
- -
- - This attribute applies to string instances. + These attributes apply to string instances. - A string instance is valid against this attribute if it is a valid URI - Reference (either a URI or a relative-reference), - according to . + + + A string instance is valid against this attribute if it is + a valid URI, according to . + + + A string instance is valid against this attribute if it is a valid URI + Reference (either a URI or a relative-reference), + according to . + + + A string instance is valid against this attribute if it is + a valid IRI, according to . + + + A string instance is valid against this attribute if it is a valid IRI + Reference (either an IRI or a relative-reference), + according to . + + + Note that all valid URIs are valid IRIs, and all valid URI References are + also valid IRI References.
@@ -1023,6 +1033,10 @@ A string instance is valid against this attribute if it is a valid URI Template (of any level), according to . + + Note that URI Templates may be used for IRIs; there is no separate + IRI Template specification. +
@@ -1209,6 +1223,7 @@ &RFC2673; &RFC3339; &RFC3986; + &RFC3987; &RFC4291; &RFC6570; &RFC6901; From 7c55c19d2d46210ded32a6f6f9f8b6e0fb9b069a Mon Sep 17 00:00:00 2001 From: Henry Andrews Date: Thu, 14 Sep 2017 19:30:58 -0700 Subject: [PATCH 2/5] Internationalized domain names --- jsonschema-validation.xml | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/jsonschema-validation.xml b/jsonschema-validation.xml index 047b7541..c8073497 100644 --- a/jsonschema-validation.xml +++ b/jsonschema-validation.xml @@ -10,6 +10,8 @@ + + @@ -961,14 +963,25 @@ section 3.4.1.
-
+
- This attribute applies to string instances. + These attributes apply to string instances. - A string instance is valid against this attribute if it is a valid - representation for an Internet host name, as defined by RFC 1034, section 3.1. + A string instance is valid against these attributes if it is a valid + representation for an Internet host name as follows: + + + As defined by RFC 1034, section 3.1, + including host names produced using the Punycode algorithm + specified in RFC 5891, section 4.4. + + + As defined by either RFC 1034 as for hostname, or an + internationalized domain name as defined by + RFC 5890, section 2.3.2.3. + +
@@ -1225,6 +1238,8 @@ &RFC3986; &RFC3987; &RFC4291; + &RFC5890; + &RFC5891; &RFC6570; &RFC6901; &RFC7159; From f41559f36d612a1d1e1edcc1b7b18c77a0429fa0 Mon Sep 17 00:00:00 2001 From: Henry Andrews Date: Wed, 13 Sep 2017 22:08:18 -0700 Subject: [PATCH 3/5] Internationalized email addresses --- jsonschema-validation.xml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/jsonschema-validation.xml b/jsonschema-validation.xml index c8073497..c284fab9 100644 --- a/jsonschema-validation.xml +++ b/jsonschema-validation.xml @@ -12,6 +12,7 @@ + @@ -953,14 +954,23 @@
-
+
- This attribute applies to string instances. + These attributes apply to string instances. - A string instance is valid against this attribute if it is a valid - Internet email address as defined by RFC 5322, - section 3.4.1. + A string instance is valid against these attributes if it is a valid + Internet email address as follows: + + + As defined by RFC 5322, section 3.4.1. + + + As defined by RFC 6531 + + + Note that all strings valid against the "email" attribute are also + valid against the "idn-email" attribute.
@@ -1241,6 +1251,7 @@ &RFC5890; &RFC5891; &RFC6570; + &RFC6531; &RFC6901; &RFC7159; &RFC5322; From 7d7c2935f0afe9ce9fa3b9c8a27ff61081d5ecbd Mon Sep 17 00:00:00 2001 From: Henry Andrews Date: Thu, 14 Sep 2017 19:36:20 -0700 Subject: [PATCH 4/5] Put ipv4 and ipv6 under "IP addresses" --- jsonschema-validation.xml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/jsonschema-validation.xml b/jsonschema-validation.xml index c284fab9..20165936 100644 --- a/jsonschema-validation.xml +++ b/jsonschema-validation.xml @@ -995,26 +995,24 @@
-
+
- This attribute applies to string instances. - - - A string instance is valid against this attribute if it is a valid - representation of an IPv4 address according to the "dotted-quad" ABNF - syntax as defined in RFC 2673, section - 3.2. - -
- -
- - This attribute applies to string instances. + These attributes apply to string instances. - A string instance is valid against this attribute if it is a valid - representation of an IPv6 address as defined in - RFC 4291, section 2.2. + A string instance is valid against these attributes if it is a valid + representation of an IP address as follows: + + + An IPv4 address according to the "dotted-quad" ABNF + syntax as defined in + RFC 2673, section 3.2. + + + An IPv6 address as defined in + RFC 4291, section 2.2. + +
From 211ab4d235ce519598440182581cde2dfdf7b278 Mon Sep 17 00:00:00 2001 From: Henry Andrews Date: Sat, 23 Sep 2017 09:53:20 -0700 Subject: [PATCH 5/5] Always use "hostname" for formats. Use "idn-hostname" instead of "idn", and since "hostname" did not talk about domain names, remove discussion of domain names from the updated description. --- jsonschema-validation.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jsonschema-validation.xml b/jsonschema-validation.xml index 20165936..780dd7d8 100644 --- a/jsonschema-validation.xml +++ b/jsonschema-validation.xml @@ -973,25 +973,27 @@ valid against the "idn-email" attribute.
-
+
These attributes apply to string instances. A string instance is valid against these attributes if it is a valid - representation for an Internet host name as follows: + representation for an Internet hostname as follows: As defined by RFC 1034, section 3.1, including host names produced using the Punycode algorithm specified in RFC 5891, section 4.4. - + As defined by either RFC 1034 as for hostname, or an - internationalized domain name as defined by + internationalized hostname as defined by RFC 5890, section 2.3.2.3. + Note that all strings valid against the "hostname" attribute are also + valid against the "idn-hostname" attribute.