json-schema-org · handrews · Aug 24, 2017 · May 19, 2017 · May 26, 2017 · May 26, 2017
diff --git a/documentation.md b/documentation.md
@@ -14,10 +14,6 @@ The specification is split into three parts, Core, Validation, and Hyper-Schema:
 
 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).
 
-### Other versions
-
-Please see [Specification Links](specification-links.md) for older drafts and the latest unreleased version of the specification.
-
 Meta-schemas
 ------------
 
@@ -28,4 +24,9 @@ The latest meta-schema is draft-06.
 | [Core/Validation meta-schema](http://json-schema.org/schema) | Used for schemas written for pure validation.              |
 | [Hyper meta-schema](http://json-schema.org/hyper-schema)     | Used for schemas written for validation and hyper-linking. |
 
-**If you are accessing the above meta-schema links from a web browser, you will need to save the file then open it as a JSON file.**
+**If you are accessing the above meta-schema links from a web browser, you will need to save the file then open it as a JSON file.**
+
+Other versions
+--------------
+
+Please see [Specification Links](specification-links.md) for older drafts and the latest unreleased version of the specification.
diff --git a/draft-06/README.md b/draft-06/README.md
@@ -5,33 +5,4 @@ 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)
+- [JSON Hyper-Schema Release FAQ](json-hyper-schema-migration-faq.md)
diff --git a/specification-links.md b/specification-links.md
@@ -7,6 +7,9 @@ layout: page
 
 You can find the latest released draft on the [Specification](/documentation.md) page.  Older drafts are expired, but may be of historical interest.
 
+**A note on draft naming and numbering:**  
+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.
+
 * TOC
 {:toc}
 
@@ -17,45 +20,39 @@ The next unreleased draft is a work in progress.  You can [give feedback and get
  - Core: [jsonschema-core.xml](https://github.com/json-schema-org/json-schema-spec/blob/master/jsonschema-core.xml)
  - Validation: [jsonschema-validation.xml](https://github.com/json-schema-org/json-schema-spec/blob/master/jsonschema-validation.xml)
  - Hyper-Schema: [jsonschema-hyperschema.xml](https://github.com/json-schema-org/json-schema-spec/blob/master/jsonschema-hyperschema.xml)
-
+- [JSON Schema meta-schema](https://github.com/json-schema-org/json-schema-spec/blob/master/schema.json)
+- [JSON Hyper-Schema meta-schema](https://github.com/json-schema-org/json-schema-spec/blob/master/hyper-schema.json)
 
 ## Draft 6
 
-Core:
-* specification: [draft-wright-json-schema-01](https://tools.ietf.org/html/draft-wright-json-schema-01)
-* changes: [Appendix B](https://tools.ietf.org/html/draft-wright-json-schema-01#appendix-B)
-* meta-schema: [draft-06/schema#](http://json-schema.org/draft-06/schema#)
-
-Validation:
-* specification: [draft-wright-json-schema-validation-01](https://tools.ietf.org/html/draft-wright-json-schema-validation-01)
-* changes: [Appendix B](https://tools.ietf.org/html/draft-wright-json-schema-validation-01#appendix-B)
-* meta-schema: [draft-06/schema#](http://json-schema.org/draft-06/schema#)
-
-Hyper-Schema:
-* specification: [draft-wright-json-schema-hyperschema-01](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-01)
-* changes: [Appendix B](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-01#appendix-B)
-* meta-schema: [draft-06/hyper-schema#](http://json-schema.org/draft-06/hyper-schema#)
-* See also the [hyper-schema migration FAQ](https://github.com/json-schema-org/json-schema-spec/wiki/FAQ:-draft-wright-json-schema-hyperschema-01)
+- Core: [draft-wright-json-schema-01](https://tools.ietf.org/html/draft-wright-json-schema-01) ([changes](https://tools.ietf.org/html/draft-wright-json-schema-01#appendix-B))
+- Validation: [draft-wright-json-schema-validation-01](https://tools.ietf.org/html/draft-wright-json-schema-validation-01) ([changes](https://tools.ietf.org/html/draft-wright-json-schema-validation-01#appendix-B)) ([schema migration FAQ](draft-06/json-schema-migration-faq.html))
+- Hyper-Schema: [draft-wright-json-schema-hyperschema-01](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-01) ([changes](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-01#appendix-B)) ([hyper-schema migration FAQ](draft-06/json-hyper-schema-migration-faq.html))
+- [JSON Schema meta-schema](http://json-schema.org/draft-06/schema)
+- [JSON Hyper-Schema meta-schema](http://json-schema.org/draft-06/hyper-schema)
 
 ## Draft 5
 
-**Note:** Draft 5 was primarily a cleanup of Draft 4 and therefore does not have its own meta-schema.  The Draft 4 meta-schema should continue to be used until Draft 6, which will have a new meta-schema, is available.
-
  - Core: [draft-wright-json-schema-00](https://tools.ietf.org/html/draft-wright-json-schema-00) ([changes](https://tools.ietf.org/html/draft-wright-json-schema-00#appendix-B))
  - Validation: [draft-wright-json-schema-validation-00](https://tools.ietf.org/html/draft-wright-json-schema-validation-00) ([changes](https://tools.ietf.org/html/draft-wright-json-schema-validation-00#appendix-B))
  - Hyper-Schema: [draft-wright-json-schema-hyperschema-00](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-00) ([changes](https://tools.ietf.org/html/draft-wright-json-schema-hyperschema-00#appendix-B))
+ - Draft 5 was primarily a cleanup of Draft 4 and continued to use the Draft 4 meta-schemas.
 
 ## Draft 4
 
  - Core: [draft-zyp-json-schema-04](https://tools.ietf.org/html/draft-zyp-json-schema-04) ([changes](https://tools.ietf.org/html/draft-zyp-json-schema-04#appendix-A))
  - Validation: [draft-fge-json-schema-validation-00](https://tools.ietf.org/html/draft-fge-json-schema-validation-00) ([changes](https://tools.ietf.org/html/draft-fge-json-schema-validation-00#appendix-A))
  - Hyper-Schema: [draft-luff-json-hyper-schema-00](https://tools.ietf.org/html/draft-luff-json-hyper-schema-00) ([changes](https://tools.ietf.org/html/draft-luff-json-hyper-schema-00#appendix-A))
+ * [JSON Schema meta-schema](http://json-schema.org/draft-04/schema)
+ * [JSON Hyper-Schema meta-schema](http://json-schema.org/draft-04/hyper-schema)
 
 ## Draft 3
 
  - Core: [draft-zyp-json-schema-03](https://tools.ietf.org/html/draft-zyp-json-schema-03) ([changes](https://tools.ietf.org/html/draft-zyp-json-schema-03#appendix-A))
  - Validation: none (included in Core)
  - Hyper-Schema: none (included in Core)
+* [JSON Schema meta-schema](http://json-schema.org/draft-03/schema)
+* [JSON Hyper-Schema meta-schema](http://json-schema.org/draft-03/hyper-schema)
 
 ## Drafts 0/1/2
-These older drafts can be found on GitHub: [Draft 0](https://github.com/json-schema-org/json-schema-org.github.io/tree/master/draft-00), [Draft 1](https://github.com/json-schema-org/json-schema-org.github.io/tree/master/draft-01), [Draft 2](https://github.com/json-schema-org/json-schema-org.github.io/tree/master/draft-02)
+Meta-schemas for these older drafts can be found on GitHub: [Draft 0](https://github.com/json-schema-org/json-schema-org.github.io/tree/master/draft-00), [Draft 1](https://github.com/json-schema-org/json-schema-org.github.io/tree/master/draft-01), [Draft 2](https://github.com/json-schema-org/json-schema-org.github.io/tree/master/draft-02)