Merge branch 'master' into release/1.0.0-alpha.3

lindyhopchris · lindyhopchris · commit 3db437eb3551 · 2018-05-17T19:56:20.000+01:00
diff --git a/README.md b/README.md
@@ -27,9 +27,9 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
 
 | Laravel | This Package |
 | --- | --- |
-| 5.4.* | ^0.12 |
-| 5.5.* | ^0.12 |
-| 5.6.* | ^0.12 |
+| 5.4.* | `1.0.0-alpha.2` |
+| 5.5.* | `1.0.0-alpha.2` |
+| 5.6.* | `1.0.0-alpha.2` |
 
 Make sure you consult the [Upgrade Guide](http://laravel-json-api.readthedocs.io/en/latest/upgrade/) when upgrading.
 
@@ -47,8 +47,8 @@ Documentation is available on [Read the Docs](http://laravel-json-api.readthedoc
 This repository is under development. We have production applications that are using the package and extensive test
 coverage of these applications.
 
-> We are aiming for v1.0 as soon as possible. See 
-[this issue](https://github.com/cloudcreativity/laravel-json-api/issues/60) for progress.
+We are aiming for v1.0 as soon as possible.
+[Check the progress here.](https://github.com/cloudcreativity/laravel-json-api/milestone/2)
 
 ## License
 
diff --git a/docs/basics/schemas.md b/docs/basics/schemas.md
@@ -134,7 +134,7 @@ The above schema would result in the following resource object:
 
 A resource object may have a `relationships` key that holds a relationships object. This object describes linkages
 to other resource objects. Relationships can either be to-one or to-many. The JSON API spec allows these linkages 
-to be described in resource relationships in multiple ways - either through a `data`, `links` or `meta` value, 
+to be described in resource relationships in multiple ways - either through a `links`, `data` or `meta` value, 
 or a combination of all three.
 
 > It's worth mentioning again that every PHP class that could be returned as a related object must have a schema
diff --git a/docs/installation.md b/docs/installation.md
@@ -5,7 +5,7 @@
 Install using [Composer](http://getcomposer.org):
 
 ``` bash
-$ composer require cloudcreativity/laravel-json-api
+$ composer require cloudcreativity/laravel-json-api:1.0.0-alpha.2
 $ composer require --dev cloudcreativity/json-api-testing
 ```
 
@@ -17,7 +17,7 @@ need to follow the instructions below for updating your `ExceptionHandler`.
 Install using [Composer](http://getcomposer.org):
 
 ``` bash
-$ composer require cloudcreativity/laravel-json-api
+$ composer require cloudcreativity/laravel-json-api:1.0.0-alpha.2
 $ composer require --dev cloudcreativity/json-api-testing
 ```
 
