Merge remote-tracking branch 'upstream/master'

Author: Charlie Owen

_includes/draft-06

@@ -115,7 +115,7 @@ should almost certainly be dropped.  Other than that:
 
 #### PATCH
 
-It was never entirely clear how to model a propert PATCH (that uses
+It was never entirely clear how to model a proper PATCH (that uses
 a patch media type rather than `application/json` in the request) in Hyper-Schema.
 One option was to treat it identically to PUT except with the patch media type
 in `encType`.  Assuming that approach (and the same `taregetSchema`/`mediaType`

_includes/draft-07

@@ -137,7 +137,7 @@ For example, the only incompatibilities between draft-04 and draft-06 involve `e
 
 -   .NET
     -   [Json.NET](https://www.newtonsoft.com/jsonschema) (AGPL-3.0) - generates schemas from .NET types
-    -   [NJsonSchema](http://NJsonSchema.org) - (Ms-PL) - generates schemas from .NET types, see issue [574](https://github.com/RSuter/NJsonSchema/issues/574) for draft-06+ support progress
+    -   [NJsonSchema](https://github.com/RSuter/NJsonSchema/) - (Ms-PL) - generates schemas from .NET types, see issue [574](https://github.com/RSuter/NJsonSchema/issues/574) for draft-06+ support progress
 -   Golang
     -  [qri-io/jsonschema](https://github.com/qri-io/jsonschema)(MIT) - idiomatic go implementation with custom validator support, coding to and from json, rich error returns *supports Draft 7*
 -   PHP
@@ -150,7 +150,7 @@ For example, the only incompatibilities between draft-04 and draft-06 involve `e
 -   Scala
     -   [Schema Guru](https://github.com/snowplow/schema-guru) (Apache 2.0) - CLI util, Spark Job and Web UI for deriving JSON Schemas out of corpus of JSON instances; see issue [178](https://github.com/snowplow/schema-guru/issues/178) for progress towards draft-06+ support
 -   Online (web tool)
-    -   [jsonschema.net](http://www.jsonschema.net) - generates schemas from example data
+    -   [jsonschema.net](https://www.jsonschema.net/) - generates schemas from example data
     -   [quicktype.io](https://app.quicktype.io/#l=schema) - infer JSON Schema from samples, and generate TypeScript, C++, go, Java, C#, Swift, etc. types from JSON Schema
 
 
@@ -189,10 +189,10 @@ Various levels of support for UI generation primarily from the validation vocabu
     -   [JSON Editor](https://github.com/jdorn/json-editor) (MIT)
     -   [JSON Form (joshfire)](https://github.com/joshfire/jsonform) (joshfire) (MIT)
     -   [Json Forms (brutusin)](https://github.com/brutusin/json-forms) (brutusin) (MIT)
-    -   [JSONForms (jsonforms.io)](http://jsonforms.io) (EclipseSource) (MIT)
-    -   [Jsonary](http://jsonary.com/) (MIT)
+    -   [JSONForms (jsonforms.io)](https://jsonforms.io/) (EclipseSource) (MIT)
+    -   [Jsonary](https://github.com/jsonary-js/) (MIT)
     -   [Liform-react](https://github.com/Limenius/liform-react) (MIT)
-    -   [Metawidget](http://metawidget.org/) (LGPL)
+    -   [Metawidget](https://metawidget.org/) (LGPL)
     -   [pure-form webcomponent](https://github.com/john-doherty/pure-form) (MIT)
     -   [React JSON Schema Form (mozilla)](https://github.com/mozilla-services/react-jsonschema-form) (Apache 2)
     -   [React Schema Form (networknt)](https://github.com/networknt/react-schema-form) (MIT)
@@ -247,11 +247,11 @@ _None currently support draft-06 or later._
 _TODO: Sort by draft support._
 
 -   [Liquid XML Studio 2016](https://www.liquid-technologies.com/json-schema-editor) - *Graphical JSON schema editor for draft 4, context sensitive intellisense for JSON documents.*
--   [Visual Studio 2013](http://www.visualstudio.com/) - *Auto-completion and tooltips based on JSON schema draft 3 and draft 4*
--   [JSONBuddy](http://www.json-buddy.com/) - *Grid-style JSON editor and context sensitive entry-helpers based on JSON schema*
+-   [Visual Studio 2013](https://www.visualstudio.com/) - *Auto-completion and tooltips based on JSON schema draft 3 and draft 4*
+-   [JSONBuddy](http://www.json-buddy.com/) - *Text and grid-style JSON editor and validator with context sensitive entry-helpers and sample data generation based on JSON schema. Support for draft 4 and draft 6.*
 -   [ReSharper 2016.1](https://www.jetbrains.com/resharper/) - *code completion, inspections and quick fixes for JSON schema in Visual Studio 2010 - 2015, including support for JSON Path and regular expressions for schema editing*
 -   [Visual Studio Code](https://code.visualstudio.com/) - *Schema driven code completion, hovers and validation for editing JSON files (including schemas)*
--   [JSONEditor Online](http://jsoneditoronline.org) - *View, edit, format, and validate JSON online*
+-   [JSONEditor Online](https://jsoneditoronline.org/) - *View, edit, format, and validate JSON online*
 -   [JSON Schema Editor](https://json-schema-editor.tangramjs.com) - *An intuitive editor for JSON schema online*
 -   [JSON Editor](https://json-editor.tangramjs.com) - *An online, schema-aware editor for JSON document*
 -   [Eclipse IDE](https://www.eclipse.org/downloads/eclipse-packages) - *Rich JSON edition supporting schema for instantaneous validation and error reporting, completion, documentation.*

draft-07/json-hyper-schema-release-notes.md

@@ -276,7 +276,7 @@ So far our JSON schema has been wholly self contained. It is very common to shar
 
 For this example we introduce a new JSON Schema resource and for both properties therein:
 * We use the `minimum` validation keyword noted earlier.
-* We add the http://json-schema.org/latest/json-schema-validation.html#rfc.section.6.2.2 validation keyword.
+* We add the [`maximum`](http://json-schema.org/latest/json-schema-validation.html#rfc.section.6.2.2) validation keyword.
 * Combined, these give us a range to use in validation.
 
 ```json

implementations.md

@@ -27,9 +27,9 @@ The specification is split into three parts, Core, Validation, and Hyper-Schema,
 | [Relative JSON Pointers](latest/relative-json-pointer.html)  | extends the JSON Pointer syntax for relative pointers |
 
 They are also available on the IETF main site:
-* [draft-handrews-json-schema-01 (core)](http://tools.ietf.org/html/draft-handrews-json-schema-01)
-* [draft-handrews-json-schema-validation-01](http://tools.ietf.org/html/draft-handrews-json-schema-validation-01)
-* [draft-handrews-json-schema-hyperschema-01](http://tools.ietf.org/html/draft-handrews-json-schema-hyperschema-01) ([errata](https://github.com/json-schema-org/json-schema-spec/issues?q=label%3Aerrata+label%3Ahypermedia))
+* [draft-handrews-json-schema-01 (core)](https://tools.ietf.org/html/draft-handrews-json-schema-01)
+* [draft-handrews-json-schema-validation-01](https://tools.ietf.org/html/draft-handrews-json-schema-validation-01)
+* [draft-handrews-json-schema-hyperschema-01](https://tools.ietf.org/html/draft-handrews-json-schema-hyperschema-01) ([errata](https://github.com/json-schema-org/json-schema-spec/issues?q=label%3Aerrata+label%3Ahypermedia))
 * [draft-handrews-relative-json-pointer-01](https://tools.ietf.org/html/draft-handrews-relative-json-pointer-01)
 
 Meta-schemas
@@ -47,7 +47,7 @@ _If you are accessing the above meta-schema links **from a web browser**, you wi
 Migrating from older drafts
 -------------
 
-The release notes discuss the changes impacting users and implementors:
+The release notes discuss the changes impacting users and implementers:
 
 - JSON Schema Core and Validation
     - [Draft-06 to Draft-07](draft-07/json-schema-release-notes.html)