json-schema-org · Relequestual · Feb 20, 2021 · Jan 29, 2021 · Jan 29, 2021 · Jan 29, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -26,3 +26,7 @@
 [submodule "_includes/draft/2019-09"]
 	path = _includes/draft/2019-09
 	url = https://github.com/json-schema-org/json-schema-spec.git
+[submodule "_includes/draft/2020-12"]
+	path = _includes/draft/2020-12
+	url = https://github.com/json-schema-org/json-schema-spec.git
+	branch = 2020-12
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -247,4 +247,4 @@ DEPENDENCIES
   github-pages
 
 BUNDLED WITH
-   1.16.1
+   2.2.7
diff --git a/README.md b/README.md
@@ -12,10 +12,36 @@ For the current status of issues and pull requests, please see the following bad
 [![Available](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Available.svg?color=brightgreen)](https://github.com/json-schema-org/json-schema-org.github.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22Status%3A+Available%22) [![In Progress](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20In%20Progress.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status:%20In%20Progress) [![Review Needed](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Review%20Needed.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status%3A%20Review%20Needed)
 
 [![Critical](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Critical.svg?color=critical
-)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low) 
+)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low)
 
 Labels are assigned based on [Sensible Github Labels](https://github.com/Relequestual/sensible-github-labels).
 
+## Compile and run locally
+
+This site runs via github pages, with automatically building PR previews via netlify.
+If you wish to compile and run this site locally, you will need to have ruby installed.
+
+If you're not familiar with ruby, consider using `rvm` (https://rvm.io/).
+Once you have Ruby installed, follow these instructions while in the project directory
+
+> Instructions
+>
+>     1. Install the jekyll and bundler gems.
+>
+>     `gem install jekyll bundler`
+>
+>     2. Create a new Jekyll site at ./myblog.
+>
+>     ...
+>
+>     3. Build the site and make it available on a local server.
+>
+>     `bundle exec jekyll serve`
+>
+>     4. Browse to http://localhost:4000
+
+Adapted from https://jekyllrb.com/docs/
+
 ## License
 
-The source material in this repository is licensed under the AFL or BSD license. 
+The source material in this repository is licensed under the AFL or BSD license.
diff --git a/_includes/draft/2020-12 b/_includes/draft/2020-12
diff --git a/...preview/2020-12-rc-1/jsonschema-core.html → draft/2020-12/json-schema-core.html b/...preview/2020-12-rc-1/jsonschema-core.html → draft/2020-12/json-schema-core.html
diff --git a/...w/2020-12-rc-1/jsonschema-validation.html → draft/2020-12/json-schema-validation.html b/...w/2020-12-rc-1/jsonschema-validation.html → draft/2020-12/json-schema-validation.html
@@ -451,7 +451,7 @@
 
   <meta name="dct.creator" content="Wright, A., Ed., Andrews, H., Ed., and B. Hutton, Ed." />
   <meta name="dct.identifier" content="urn:ietf:id:draft-bhutton-json-schema-validation-00" />
-  <meta name="dct.issued" scheme="ISO8601" content="2020-01" />
+  <meta name="dct.issued" scheme="ISO8601" content="2020-28" />
   <meta name="dct.abstract" content="JSON Schema (application/schema+json) has several purposes, one of which is JSON instance validation.  This document specifies a vocabulary for JSON Schema to describe the meaning of JSON documents, provide hints for user interfaces working with JSON data, and to make assertions about what a valid document must look like.  " />
   <meta name="description" content="JSON Schema (application/schema+json) has several purposes, one of which is JSON instance validation.  This document specifies a vocabulary for JSON Schema to describe the meaning of JSON documents, provide hints for user interfaces working with JSON data, and to make assertions about what a valid document must look like.  " />
 
@@ -475,7 +475,7 @@
 <td class="right">H. Andrews, Ed.</td>
 </tr>
 <tr>
-<td class="left">Expires: June 4, 2021</td>
+<td class="left">Expires: August 1, 2021</td>
 <td class="right"></td>
 </tr>
 <tr>
@@ -484,7 +484,7 @@
 </tr>
 <tr>
 <td class="left"></td>
-<td class="right">December 1, 2020</td>
+<td class="right">January 28, 2020</td>
 </tr>
 
 
@@ -497,15 +497,14 @@
   <h1 id="rfc.abstract"><a href="#rfc.abstract">Abstract</a></h1>
 <p>JSON Schema (application/schema+json) has several purposes, one of which is JSON instance validation.  This document specifies a vocabulary for JSON Schema to describe the meaning of JSON documents, provide hints for user interfaces working with JSON data, and to make assertions about what a valid document must look like.  </p>
 <h1><a>Note to Readers</a></h1>
-<p>This document a pre-release identified as JSON Schema draft 2020-12-rc-1.  </p>
 <p>The issues list for this draft can be found at <span>&lt;</span><a href="https://github.com/json-schema-org/json-schema-spec/issues">https://github.com/json-schema-org/json-schema-spec/issues</a><span>&gt;</span>.  </p>
 <p>For additional information, see <span>&lt;</span><a href="https://json-schema.org/">https://json-schema.org/</a><span>&gt;</span>.  </p>
 <p>To provide feedback, use this issue tracker, the communication methods listed on the homepage, or email the document editors.  </p>
 <h1 id="rfc.status"><a href="#rfc.status">Status of This Memo</a></h1>
 <p>This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.</p>
 <p>Internet-Drafts are working documents of the Internet Engineering Task Force (IETF).  Note that other groups may also distribute working documents as Internet-Drafts.  The list of current Internet-Drafts is at https://datatracker.ietf.org/drafts/current/.</p>
 <p>Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time.  It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."</p>
-<p>This Internet-Draft will expire on June 4, 2021.</p>
+<p>This Internet-Draft will expire on August 1, 2021.</p>
 <h1 id="rfc.copyrightnotice"><a href="#rfc.copyrightnotice">Copyright Notice</a></h1>
 <p>Copyright (c) 2020 IETF Trust and the persons identified as the document authors.  All rights reserved.</p>
 <p>This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info) in effect on the date of publication of this document.  Please review these documents carefully, as they describe your rights and restrictions with respect to this document.  Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License.</p>
@@ -777,12 +776,12 @@ <h1 id="rfc.section.6.4.4">
 <a href="#rfc.section.6.4.4">6.4.4.</a> maxContains</h1>
 <p id="rfc.section.6.4.4.p.1">The value of this keyword MUST be a non-negative integer.  </p>
 <p id="rfc.section.6.4.4.p.2">If "contains" is not present within the same schema object, then this keyword has no effect.  </p>
-<p id="rfc.section.6.4.4.p.3">An array instance is valid against "maxContains" if its value is less than or equal to, the array length of the annotation result from an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword where the annotation is an array, or the length of the instance array where the annotation is "true".  </p>
+<p id="rfc.section.6.4.4.p.3">An instance array is valid against "maxContains" in two ways, depending on the form of the annotation result of an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword. The first way is if the annotation result is an array and the length of that array is less than or equal to the "maxContains" value. The second way is if the annotation result is a boolean "true" and the instance array length is less than or equal to the "maxContains" value.  </p>
 <h1 id="rfc.section.6.4.5">
 <a href="#rfc.section.6.4.5">6.4.5.</a> minContains</h1>
 <p id="rfc.section.6.4.5.p.1">The value of this keyword MUST be a non-negative integer.  </p>
 <p id="rfc.section.6.4.5.p.2">If "contains" is not present within the same schema object, then this keyword has no effect.  </p>
-<p id="rfc.section.6.4.5.p.3">An array instance is valid against "minContains" if its value is greater than or equal to, the array length of the annotation result from an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword where the annotation is an array, or the length of the instance array where the annotation is "true".  </p>
+<p id="rfc.section.6.4.5.p.3">An instance array is valid against "minContains" in two ways, depending on the form of the annotation result of an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword. The first way is if the annotation result is an array and the length of that array is greater than or equal to the "minContains" value. The second way is if the annotation result is a boolean "true" and the instance array length is greater than or equal to the "minContains" value.  </p>
 <p id="rfc.section.6.4.5.p.4">A value of 0 is allowed, but is only useful for setting a range of occurrences from 0 to the value of "maxContains".  A value of 0 with no "maxContains" causes "contains" to always pass validation.  </p>
 <p id="rfc.section.6.4.5.p.5">Omitting this keyword has the same behavior as a value of 1.  </p>
 <h1 id="rfc.section.6.5">
@@ -1228,13 +1227,7 @@ <h1 id="rfc.appendix.C">
 <li>Clarified the set and meaning of "contentEncoding" values</li>
 <li>Reference ECMA-262, 11th edition for regular expression support</li>
 <li>Split "format" into an annotation only vocabulary and an assertion vocabulary</li>
-<li>
-<li>
-<li>
-<li>
-<li>
-<li>
-<li>
+<li>Clarify "deprecated" when applicable to arrays</li>
 </ul>
 <p> </p>
 </dd>

diff --git a/draft/2020-12/meta/applicator b/draft/2020-12/meta/applicator
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/applicator.json
diff --git a/draft/2020-12/meta/content b/draft/2020-12/meta/content
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/content.json
diff --git a/draft/2020-12/meta/core b/draft/2020-12/meta/core
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/core.json
diff --git a/draft/2020-12/meta/format b/draft/2020-12/meta/format
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/format.json
diff --git a/draft/2020-12/meta/format-annotation b/draft/2020-12/meta/format-annotation
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/format-annotaion.json
diff --git a/draft/2020-12/meta/format-assertion b/draft/2020-12/meta/format-assertion
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/format-assertion.json
diff --git a/draft/2020-12/meta/meta-data b/draft/2020-12/meta/meta-data
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/meta-data.json
diff --git a/draft/2020-12/meta/unevaluated b/draft/2020-12/meta/unevaluated
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/unevaluated.json
diff --git a/draft/2020-12/meta/validation b/draft/2020-12/meta/validation
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/meta/validation.json
diff --git a/draft/2020-12/output/schema b/draft/2020-12/output/schema
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/output/schema.json
diff --git a/draft/2020-12/output/verbose-example b/draft/2020-12/output/verbose-example
@@ -0,0 +1 @@
+../../../_includes/draft/2020-12/output/verbose-example.json
diff --git a/...w/2020-12-rc-1/relative-json-pointer.html → draft/2020-12/relative-json-pointer.html b/...w/2020-12-rc-1/relative-json-pointer.html → draft/2020-12/relative-json-pointer.html
@@ -397,7 +397,7 @@
 
   <meta name="dct.creator" content="Luff, G., Andrews, H., Ed., and B. Hutton, Ed." />
   <meta name="dct.identifier" content="urn:ietf:id:draft-bhutton-relative-json-pointer-00" />
-  <meta name="dct.issued" scheme="ISO8601" content="2020-01" />
+  <meta name="dct.issued" scheme="ISO8601" content="2020-28" />
   <meta name="dct.abstract" content="JSON Pointer is a syntax for specifying locations in a JSON document, starting from the document root.  This document defines an extension to the JSON Pointer syntax, allowing relative locations from within the document.  " />
   <meta name="description" content="JSON Pointer is a syntax for specifying locations in a JSON document, starting from the document root.  This document defines an extension to the JSON Pointer syntax, allowing relative locations from within the document.  " />
 
@@ -421,7 +421,7 @@
 <td class="right">H. Andrews, Ed.</td>
 </tr>
 <tr>
-<td class="left">Expires: June 4, 2021</td>
+<td class="left">Expires: August 1, 2021</td>
 <td class="right"></td>
 </tr>
 <tr>
@@ -430,7 +430,7 @@
 </tr>
 <tr>
 <td class="left"></td>
-<td class="right">December 1, 2020</td>
+<td class="right">January 28, 2020</td>
 </tr>
 
 
@@ -446,7 +446,7 @@ <h1 id="rfc.status"><a href="#rfc.status">Status of This Memo</a></h1>
 <p>This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.</p>
 <p>Internet-Drafts are working documents of the Internet Engineering Task Force (IETF).  Note that other groups may also distribute working documents as Internet-Drafts.  The list of current Internet-Drafts is at https://datatracker.ietf.org/drafts/current/.</p>
 <p>Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time.  It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."</p>
-<p>This Internet-Draft will expire on June 4, 2021.</p>
+<p>This Internet-Draft will expire on August 1, 2021.</p>
 <h1 id="rfc.copyrightnotice"><a href="#rfc.copyrightnotice">Copyright Notice</a></h1>
 <p>Copyright (c) 2020 IETF Trust and the persons identified as the document authors.  All rights reserved.</p>
 <p>This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info) in effect on the date of publication of this document.  Please review these documents carefully, as they describe your rights and restrictions with respect to this document.  Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License.</p>
@@ -505,8 +505,9 @@ <h1 id="rfc.section.3">
 <p>The ABNF syntax of a Relative JSON Pointer is: </p>
 <pre>
 
-   relative-json-pointer =  non-negative-integer &lt;json-pointer&gt;
+   relative-json-pointer =  non-negative-integer [index-manipulation] &lt;json-pointer&gt;
    relative-json-pointer =/ non-negative-integer "#"
+   index-manipulation    =  ("+" / "-") non-negative-integer
    non-negative-integer      =  %x30 / %x31-39 *( %x30-39 )
            ; "0", or digits without a leading "0"
 
@@ -566,8 +567,10 @@ <h1 id="rfc.section.5.1">
 
                   "0"                         "baz"
                   "1/0"                       "bar"
+                  "0-1"                       "bar"
                   "2/highly/nested/objects"   true
                   "0#"                        1
+                  "0-1#"                      0
                   "1#"                        "foo"
 
                     </pre>
@@ -629,7 +632,7 @@ <h1 id="rfc.appendix.A">
 <p></p>
 
 <dl>
-<dt>draft-handrews-relative-json-pointer-03</dt>
+<dt>draft-bhutton-relative-json-pointer-00</dt>
 <dd style="margin-left: 8">
 <ul><li>Add array forward and backward index manipulation</li></ul>
 <p> </p>

diff --git a/draft/2020-12/release-notes.md b/draft/2020-12/release-notes.md
@@ -0,0 +1,8 @@
+---
+title: JSON Schema 2020-12 Release Notes
+layout: page
+---
+
+_NOTE: This page is still being written._
+
+You can find a minimal changelog at the end of the specification documents themselves.
diff --git a/draft/2020-12/schema b/draft/2020-12/schema
@@ -0,0 +1 @@
+../../_includes/draft/2020-12/schema.json
diff --git a/draft/2020-12/vocab/applicator.md b/draft/2020-12/vocab/applicator.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-core.html#rfc.section.10
+title: A Vocabulary for Applying Subschemas
+---
diff --git a/draft/2020-12/vocab/content.md b/draft/2020-12/vocab/content.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.8
+title: A Vocabulary for the Contents of String-Encoded Data
+---
diff --git a/draft/2020-12/vocab/core.md b/draft/2020-12/vocab/core.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-core.html#rfc.section.8
+title: The JSON Schema Core Vocabulary
+---
diff --git a/draft/2020-12/vocab/format-annotation.md b/draft/2020-12/vocab/format-annotation.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.7
+title: A Vocabulary for Semantic Content with "format" as annotations
+---
diff --git a/draft/2020-12/vocab/format-assertion.md b/draft/2020-12/vocab/format-assertion.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.7
+title: A Vocabulary for Semantic Content with "format" as assertions
+---
diff --git a/draft/2020-12/vocab/meta-data.md b/draft/2020-12/vocab/meta-data.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.9
+title: A Vocabulary for Basic Meta-Data Annotations
+---
diff --git a/draft/2020-12/vocab/unevaluated.md b/draft/2020-12/vocab/unevaluated.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-core.html#rfc.section.11
+title: A Vocabulary for Unevaluated Locations
+---
diff --git a/draft/2020-12/vocab/validation.md b/draft/2020-12/vocab/validation.md
@@ -0,0 +1,4 @@
+---
+redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.6
+title: A Vocabulary for Structural Validation
+---
diff --git a/hyper-schema.md b/hyper-schema.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -247,4 +247,4 @@ DEPENDENCIES @@
       github-pages
     BUNDLED WITH
-.16.1
+.2.7
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../_includes/draft/2020-12/meta/applicator.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../_includes/draft/2020-12/meta/content.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../_includes/draft/2020-12/meta/format.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../_includes/draft/2020-12/meta/meta-data.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../_includes/draft/2020-12/meta/unevaluated.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../_includes/draft/2020-12/meta/validation.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../_includes/draft/2020-12/output/schema.json