Merge branch 'master' into master

Author: handrews

.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+dist: trusty
+sudo: false
+script:
+- bundle exec jekyll build

404.html

@@ -0,0 +1,25 @@
+---
+layout: default
+permalink: /404.html
+---
+
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+Thank you for your interest in contributing to JSON Schema!  Your participation is appreciated!
+
+If your question/request/change concerns the [JSON Schema Website](json-schema.org) you are in the right place.  If your question/request/change concerns the JSON Schema specification drafts or meta-schemas, please go to [the JSON Schema specification repository](https://github.com/json-schema-org/json-schema-spec).

README.md

@@ -1,14 +1,13 @@
-## Repo for the JSON Schema website!
+# JSON Schema Website
 
-This repo is currently undergoing a complete restructuring and removing of content not related to the website.
-It was a copy of the gh-pages branch over on the old org repo.
+This is the repository for the [JSON Schema website](http://json-schema.org).
 
-For current work on JSON Schema, please see https://github.com/json-schema-org/json-schema-spec
-
-The JSON Schema web site is at http://json-schema.org
+For issues, discussion, and changes to the JSON Schema specification, please use the [json-schema-spec](https://github.com/json-schema-org/json-schema-spec) repository.
 
 ## Status
-For the current status of issues and pull requests, please see the following labels
+For the current status of issues and pull requests, please see the following badges
+
+[![Issues](https://img.shields.io/github/issues-raw/json-schema-org/json-schema-org.github.io.svg)](https://github.com/json-schema-org/json-schema-org.github.io/issues)
 
 [![Available](https://img.shields.io/waffle/label/json-schema-org/json-schema-org.github.io/Status:%20Available.svg?style=flat)](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/waffle/label/json-schema-org/json-schema-org.github.io/Status:%20In%20Progress.svg?style=flat)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status:%20In%20Progress) [![Review Needed](https://img.shields.io/waffle/label/json-schema-org/json-schema-org.github.io/Status:%20Review%20Needed.svg?style=flat)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status%3A%20Review%20Needed)
 

_config.yml

@@ -20,11 +20,17 @@ baseurl: "" # the subpath of your site, e.g. /blog
 url: "" # the base hostname & protocol for your site
 #twitter_username: jekyllrb
 github_username:  json-schema-org
+google_analytics: UA-99695987-1
 
 # Build settings
 markdown: kramdown
 theme: minima
 
+header_pages:
+- documentation.md
+- examples.md
+- implementations.md
+
 collections:
   docs:
     output: true

_includes/header.html

@@ -18,6 +18,11 @@ cyan      #2aa198  strings, numbers
 green     #859900  operators, other keywords
 */
 
+.highlight{
+    .highlighter-rouge & {
+        background: #fdf6e3;
+    }
+}
 .highlight { background-color: #fdf6e3; color: #586e75 }
 .highlight .c { color: #93a1a1 } /* Comment */
 .highlight .err { color: #586e75 } /* Error */

_sass/minima.scss

@@ -5,14 +5,15 @@
 
 // Import partials from the `minima` theme.
 @import "minima";
+@import "minima/syntax-highlighting";
 
 // Import navigation partial for Software page
 @import "intra-navigation";
 
 // _base.scss overrides
 pre,
 code {
-  background-color: inherit;
+  background-color: unset;
 }
 
 .wrapper {

_sass/minima/_syntax-highlighting.scss

@@ -3,7 +3,9 @@ layout: page
 title: Specification
 ---
 
-The latest Internet-Drafts at the IETF are the draft-wright-json-schema\*-01 documents, which correspond to the draft-06 meta-schemas. These were published on 2017-04-15. (Due to a change in authorship the I-D numbering was reset with the previous draft). The specification is split into three parts, Core, Validation, and Hyper-Schema:
+The latest Internet-Drafts at the IETF are the draft-wright-json-schema\*-01 documents, which correspond to the draft-06 meta-schemas. These were published on 2017-04-15. (Due to a change in authorship the I-D numbering was reset with the previous draft).  Please see the [release notes](draft-06/README.md) for more information on this release and information on migrating from previous drafts.
+
+The specification is split into three parts, Core, Validation, and Hyper-Schema:
 
 |--------------------------------------------------------------|-------------------------------------------------|
 | [JSON Schema Core](latest/json-schema-core.html)             | defines the basic foundation of JSON Schema     |
@@ -12,7 +14,9 @@ The latest Internet-Drafts at the IETF are the draft-wright-json-schema\*-01 doc
 
 They are also available on the IETF main site: [core (draft-wright-json-schema-01)](http://tools.ietf.org/html/draft-wright-json-schema-01), [validation (draft-wright-json-schema-validation-01)](http://tools.ietf.org/html/draft-wright-json-schema-validation-01) and [hyper-schema (draft-wright-json-schema-hyperschema-01)](http://tools.ietf.org/html/draft-wright-json-schema-hyperschema-01).
 
-For previous versions of the specification, please see the [Specification Links](https://github.com/json-schema-org/json-schema-spec/wiki/Specification-Links) page on our github wiki.
+### Other versions
+
+Please see [Specification Links](specification-links.md) for older drafts and the latest unreleased version of the specification.
 
 Meta-schemas
 ------------

assets/main.scss

@@ -1,3 +1,7 @@
+---
+layout: default
+---
+
 ## Explanation for lack of draft-05 meta-schemas
 
 "Draft-05" in the sequential meta-schema numbering would have

documentation.md

@@ -0,0 +1,37 @@
+---
+layout: default
+---
+
+# Draft 6 Release Notes
+
+- [JSON Schema Release FAQ](json-schema-migration-faq.md)
+- [JSON Hyper-Schema Release FAQ](json-hyper-schema-migration-faq.md)
+- **A note on draft naming and numbering:**
+<!-- This note should be incorporated into **specification-links.md**, but there are outstanding PR changes against that file.  Leaving here to prevent merge conflicts. -->
+
+    IETF Internet-Drafts (I-Ds) are named with the editor's name and a sequential number which resets with each new editor.  Meta-schemas are numbered sequentially.  Additionally, drafts 00-03 used one document for all three current specs.  Most people find it easier to remember the sequential meta-schema numbers, so those are used throughout the site.
+
+    For JSON Schema, the correspondences are:
+
+    Core/Validation IETF Drafts | Meta-Schema URI
+    ---- | ----
+    [draft-zyp-json-schema-00](https://tools.ietf.org/html/draft-zyp-json-schema-00) | [http://json-schema.org/draft-00/schema](http://json-schema.org/draft-00/hyper-schema)
+    [draft-zyp-json-schema-01](https://tools.ietf.org/html/draft-zyp-json-schema-01) | [http://json-schema.org/draft-01/schema](http://json-schema.org/draft-01/hyper-schema)
+    [draft-zyp-json-schema-02](https://tools.ietf.org/html/draft-zyp-json-schema-02) | [http://json-schema.org/draft-02/schema](http://json-schema.org/draft-02/hyper-schema)
+    [draft-zyp-json-schema-03](https://tools.ietf.org/html/draft-zyp-json-schema-03) | [http://json-schema.org/draft-03/schema](http://json-schema.org/draft-03/hyper-schema)
+    [draft-zyp-json-schema-04](https://tools.ietf.org/html/draft-zyp-json-schema-04) and [draft-fge-json-schema-validation-00](https://tools.ietf.org/html/draft-fge-json-schema-validation-00) | [http://json-schema.org/draft-04/hyper-schema](http://json-schema.org/draft-04/schema)
+    [draft-wright-json-schema-00](https://tools.ietf.org/html/draft-wright-json-schema-00) and [draft-wright-json-schema-validation-00](https://tools.ietf.org/html/draft-wright-json-schema-validation-00) | draft-05; [not published](../draft-05/README.md)
+    [draft-wright-json-schema-01](https://tools.ietf.org/html/draft-wright-json-schema-01) and [draft-wright-json-schema-validation-01](https://tools.ietf.org/html/draft-wright-json-schema-validation-01) | [http://json-schema.org/draft-06/schema](http://json-schema.org/draft-06/hyper-schema)
+
+
+    For JSON Hyper-Schema, the correspondences are:
+
+    Hyper-Schema IETF Draft | Hyper-Schema Meta-Schema URI
+    ---- | ----
+    [draft-zyp-json-schema-00](https://tools.ietf.org/html/draft-zyp-json-schema-00) | [http://json-schema.org/draft-00/hyper-schema](http://json-schema.org/draft-00/hyper-schema)
+    [draft-zyp-json-schema-01](https://tools.ietf.org/html/draft-zyp-json-schema-01) | [http://json-schema.org/draft-01/hyper-schema](http://json-schema.org/draft-01/hyper-schema)
+    [draft-zyp-json-schema-02](https://tools.ietf.org/html/draft-zyp-json-schema-02) | [http://json-schema.org/draft-02/hyper-schema](http://json-schema.org/draft-02/hyper-schema)
+    [draft-zyp-json-schema-03](https://tools.ietf.org/html/draft-zyp-json-schema-03) | [http://json-schema.org/draft-03/hyper-schema](http://json-schema.org/draft-03/hyper-schema)
+    [draft-luff-json-hyper-schema-00](https://tools.ietf.org/html/draft-luff-json-hyper-schema-00) | [http://json-schema.org/draft-04/hyper-schema](http://json-schema.org/draft-04/hyper-schema)
+    [draft-wright-json-schema-hyperschema-00](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-00) | draft-05; [not published](../draft-05/README.md)
+    [draft-wright-json-schema-hyperschema-01](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-01) | [http://json-schema.org/draft-06/hyper-schema](http://json-schema.org/draft-06/hyper-schema)