From 59da97136b94d9f855e67fb5135f1da7a1461c69 Mon Sep 17 00:00:00 2001
From: "piotr.kazmierczak" <piotr.kazmierczak@10clouds.com>
Date: Fri, 2 Dec 2016 10:35:43 +0100
Subject: [PATCH 1/5] Android - Ably installation instructions update

---
 content/tutorials/history.textile              | 6 +++---
 content/tutorials/publish-subscribe.textile    | 6 +++---
 content/tutorials/token-authentication.textile | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/content/tutorials/history.textile b/content/tutorials/history.textile
index e5b7f7c23c..634fcde4dc 100644
--- a/content/tutorials/history.textile
+++ b/content/tutorials/history.textile
@@ -114,7 +114,7 @@ blang[android].
   }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/2165b22
+  "See this step in Github":https://github.com/ably/tutorials/commit/b354fd2
 
 blang[javascript].
   To start using Ably in your web app, you first need to include the Ably library. We recommend that you include the latest client library from our CDN using a simple @<script>@ tag. The client library must be instanced with the API key you copied in Step 1. Note in production we recommend you always use the "token authentication scheme":/general/authentication#token-authentication for browser clients, however in this example we use an API key for simplicity.
@@ -283,7 +283,7 @@ blang[android].
   }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/8f57b35
+  "See this step in Github":https://github.com/ably/tutorials/commit/22c4618
 
 blang[javascript].
   ```[javascript]
@@ -373,7 +373,7 @@ blang[android].
     }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/3a20150
+  "See this step in Github":https://github.com/ably/tutorials/commit/1eb8b1d
 
 blang[javascript].
   ```[javascript]
diff --git a/content/tutorials/publish-subscribe.textile b/content/tutorials/publish-subscribe.textile
index 8551d6cd2f..aa5e213452 100644
--- a/content/tutorials/publish-subscribe.textile
+++ b/content/tutorials/publish-subscribe.textile
@@ -98,7 +98,7 @@ blang[android].
   }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/089d9fd
+  "See this step in Github":https://github.com/ably/tutorials/commit/f390749
 
 blang[javascript].
   To start using Ably in your web app, you first need to include the Ably library. We recommend that you include the latest client library from our CDN using a simple @<script>@ tag. The client library must be instanced with the API key you copied in Step 1. Note in production we recommend you always use the "token authentication scheme":/general/authentication#token-authentication for browser clients, however in this example we use an API key for simplicity.
@@ -365,7 +365,7 @@ blang[android].
     });
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/0819d8a
+  "See this step in Github":https://github.com/ably/tutorials/commit/48132b8
 
 blang[javascript].
   ```[javascript]
@@ -487,7 +487,7 @@ blang[android].
     });
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/110bd69
+  "See this step in Github":https://github.com/ably/tutorials/commit/aaf5888
 
 blang[javascript].
   ```[javascript]
diff --git a/content/tutorials/token-authentication.textile b/content/tutorials/token-authentication.textile
index f157241454..706752015e 100644
--- a/content/tutorials/token-authentication.textile
+++ b/content/tutorials/token-authentication.textile
@@ -606,7 +606,7 @@ blang[android].
   ...
   dependencies {
       ...
-      compile 'io.ably:ably-java:0.8.+'
+      compile 'io.ably:ably-android:0.8.+'
   }
   ```
   After you add necessary dependencies, you can import AblyRealtime class into your @ExampleActivity@ and initialize it.
@@ -775,7 +775,7 @@ blang[android].
   So let's see what happens now. Restart the local server and rerun your application. You should receive an alert to confirm that you're connected to Ably which means your server has successfully issued a token request to the client, the client has then obtained a token from Ably with the token request, it has subsequently authenticated and finally connected.
 
 blang[android].
-  "See this step in Github":http://github.com/ably/tutorials/commit/f37b17c
+  "See this step in Github":http://github.com/ably/tutorials/commit/ae636ad
 
 blang[java].
   "See this step in Github":https://github.com/ably/tutorials/commit/ebcf93e
@@ -1654,7 +1654,7 @@ blang[android].
   </a>
 
 blang[android].
-  "See this step in Github":https://github.com/ably/tutorials/commit/42f253a
+  "See this step in Github":https://github.com/ably/tutorials/commit/bcce690
 
 blang[java].
   "See this step in Github":https://github.com/ably/tutorials/commit/91449ca

From ef36060aa27b30fa42c77071477dfd4addfd218d Mon Sep 17 00:00:00 2001
From: "piotr.kazmierczak" <piotr.kazmierczak@10clouds.com>
Date: Fri, 2 Dec 2016 11:33:01 +0100
Subject: [PATCH 2/5] Java - Ably installation instructions update

---
 content/tutorials/history.textile              |  6 +++---
 content/tutorials/publish-subscribe.textile    |  6 +++---
 content/tutorials/token-authentication.textile | 13 ++++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/content/tutorials/history.textile b/content/tutorials/history.textile
index 634fcde4dc..4ab31a43cc 100644
--- a/content/tutorials/history.textile
+++ b/content/tutorials/history.textile
@@ -74,7 +74,7 @@ blang[java].
   }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/b271032
+  "See this step in Github":https://github.com/ably/tutorials/commit/56b96fe
 
 blang[android].
   To build your own Android Project, please visit "Android Developers":https://developer.android.com/training/basics/firstapp/creating-project.html website and get familiar with steps necessary to set up your own application.
@@ -261,7 +261,7 @@ blang[java].
   channel.publish("play", "cluck");
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/8f620b2
+  "See this step in Github":https://github.com/ably/tutorials/commit/cb014ca
 
 blang[android].
   ```[java]
@@ -360,7 +360,7 @@ blang[java].
     }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/24f79be
+  "See this step in Github":https://github.com/ably/tutorials/commit/72c9b95
 
 blang[android].
   ```[java]
diff --git a/content/tutorials/publish-subscribe.textile b/content/tutorials/publish-subscribe.textile
index aa5e213452..1dd1937e2f 100644
--- a/content/tutorials/publish-subscribe.textile
+++ b/content/tutorials/publish-subscribe.textile
@@ -57,7 +57,7 @@ blang[java].
   }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/21cbacb
+  "See this step in Github":https://github.com/ably/tutorials/commit/044c23f
 
 
 blang[android].
@@ -351,7 +351,7 @@ blang[java].
     });
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/519d498
+  "See this step in Github":https://github.com/ably/tutorials/commit/a0c24c5
 
 blang[android].
   ```[java]
@@ -467,7 +467,7 @@ blang[java].
     });
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/098e674
+  "See this step in Github":https://github.com/ably/tutorials/commit/71f8444
 
 blang[android].
   ```[java]
diff --git a/content/tutorials/token-authentication.textile b/content/tutorials/token-authentication.textile
index 706752015e..902812de58 100644
--- a/content/tutorials/token-authentication.textile
+++ b/content/tutorials/token-authentication.textile
@@ -22,11 +22,10 @@ blang[java].
   ```[groovy]
     repositories {
       jcenter()
-        maven { url "https://raw.github.com/paddybyers/Java-WebSocket/mvn-repo/" }
     }
 
     dependencies {
-        compile 'io.ably:ably-java:0.8.4'
+        compile 'io.ably:ably-java:0.8.+'
     }
   ```
 
@@ -52,7 +51,7 @@ blang[java].
     }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/2a4119f
+  "See this step in Github":https://github.com/ably/tutorials/commit/5a72529
 
 blang[nodejs,android].
   To start using Ably on your Node.js server, you first need to install the NPM module. The NPM module can be installed as follows:
@@ -248,7 +247,7 @@ blang[java].
 
   Once running, open your browser to "http://localhost:3000/":http://localhost:3000/ and you should see the text "Hello, I am a very simple server".
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/b75d500
+  "See this step in Github":https://github.com/ably/tutorials/commit/6d7ce69
 
 blang[nodejs,android].
   "Express.js":https://expressjs.com/ is a very popular and simple web framework for Node.js. Let's get this setup:
@@ -442,7 +441,7 @@ blang[java].
   }
   ```
 
-  "See this step in Github":https://github.com/ably/tutorials/commit/2d2f86f
+  "See this step in Github":https://github.com/ably/tutorials/commit/4828df8
 
 blang[nodejs,android].
   By adding the following route to your Express.js server, it is now ready to service clients wanting to authenticate with Ably.
@@ -778,7 +777,7 @@ blang[android].
   "See this step in Github":http://github.com/ably/tutorials/commit/ae636ad
 
 blang[java].
-  "See this step in Github":https://github.com/ably/tutorials/commit/ebcf93e
+  "See this step in Github":https://github.com/ably/tutorials/commit/c2f1ab3
 
 blang[nodejs].
   "See this step in Github":https://github.com/ably/tutorials/commit/f63b65e
@@ -1657,7 +1656,7 @@ blang[android].
   "See this step in Github":https://github.com/ably/tutorials/commit/bcce690
 
 blang[java].
-  "See this step in Github":https://github.com/ably/tutorials/commit/91449ca
+  "See this step in Github":https://github.com/ably/tutorials/commit/3bd80eb
 
 blang[nodejs].
   "See this step in Github":https://github.com/ably/tutorials/commit/4acb241

From 29c7d0a311a697eb9239dcb67d432a81852b65ff Mon Sep 17 00:00:00 2001
From: "piotr.kazmierczak" <piotr.kazmierczak@10clouds.com>
Date: Fri, 2 Dec 2016 12:09:08 +0100
Subject: [PATCH 3/5] Added missing Android resources

---
 .../token-authentication-android-anonymous.png  | Bin 0 -> 25009 bytes
 .../token-authentication-android-mike.png       | Bin 0 -> 24218 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/assets/images/tutorials/token-authentication-android-anonymous.png
 create mode 100644 app/assets/images/tutorials/token-authentication-android-mike.png

diff --git a/app/assets/images/tutorials/token-authentication-android-anonymous.png b/app/assets/images/tutorials/token-authentication-android-anonymous.png
new file mode 100644
index 0000000000000000000000000000000000000000..439b3db23a93e6bb0e491f823d519325baa5a0e7
GIT binary patch
diff --git a/app/assets/images/tutorials/token-authentication-android-mike.png b/app/assets/images/tutorials/token-authentication-android-mike.png
new file mode 100644
index 0000000000000000000000000000000000000000..0521d729510cfed2d127b0f072dd7b117a8536fc
GIT binary patch

From 95ed9d04ce953b831ee881e346c62b843f09bb97 Mon Sep 17 00:00:00 2001
From: "piotr.kazmierczak" <piotr.kazmierczak@10clouds.com>
Date: Thu, 15 Dec 2016 11:31:27 +0100
Subject: [PATCH 4/5] fixup! Java - Ably installation instructions update

---
 content/tutorials/token-authentication.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/tutorials/token-authentication.textile b/content/tutorials/token-authentication.textile
index 902812de58..ea762457c3 100644
--- a/content/tutorials/token-authentication.textile
+++ b/content/tutorials/token-authentication.textile
@@ -25,7 +25,7 @@ blang[java].
     }
 
     dependencies {
-        compile 'io.ably:ably-java:0.8.+'
+        compile 'io.ably:ably-java:0.8.7'
     }
   ```
 
@@ -605,7 +605,7 @@ blang[android].
   ...
   dependencies {
       ...
-      compile 'io.ably:ably-android:0.8.+'
+      compile 'io.ably:ably-android:0.8.7'
   }
   ```
   After you add necessary dependencies, you can import AblyRealtime class into your @ExampleActivity@ and initialize it.

From 56e07b792328c1142a081f1e4d9d0987c23ae844 Mon Sep 17 00:00:00 2001
From: "piotr.kazmierczak" <piotr.kazmierczak@10clouds.com>
Date: Fri, 16 Dec 2016 11:54:19 +0100
Subject: [PATCH 5/5] fixup! Java - Ably installation instructions update

---
 content/tutorials/history.textile              | 4 ++++
 content/tutorials/publish-subscribe.textile    | 4 ++++
 content/tutorials/token-authentication.textile | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/content/tutorials/history.textile b/content/tutorials/history.textile
index 4ab31a43cc..ee7b44d69d 100644
--- a/content/tutorials/history.textile
+++ b/content/tutorials/history.textile
@@ -52,6 +52,8 @@ blang[java].
   }
   ```
 
+  In the above example a specific version of the library is referenced, however we recommend you check which is the latest stable version and always use that. Follow link to get the latest stable release for "Java":https://bintray.com/ably-io/ably/ably-java.
+
   After you add necessary dependencies, you can import AblyRest class into your code and initialize it.
 
   ```[java]
@@ -89,6 +91,8 @@ blang[android].
   }
   ```
 
+  In the above example a specific version of the library is referenced, however we recommend you check which is the latest stable version and always use that. Follow link to get the latest stable release for "Android":https://bintray.com/ably-io/ably/ably-android.
+
   After you add necessary dependencies, you can import AblyRealtime class into your code and initialize it.
 
   ```[java]
diff --git a/content/tutorials/publish-subscribe.textile b/content/tutorials/publish-subscribe.textile
index 1dd1937e2f..d628652579 100644
--- a/content/tutorials/publish-subscribe.textile
+++ b/content/tutorials/publish-subscribe.textile
@@ -35,6 +35,8 @@ blang[java].
   }
   ```
 
+  In the above example a specific version of the library is referenced, however we recommend you check which is the latest stable version and always use that. Follow link to get the latest stable release for "Java":https://bintray.com/ably-io/ably/ably-java.
+
   After you add necessary dependencies, you can import AblyRealtime class into your code and initialize it.
 
   ```[java]
@@ -73,6 +75,8 @@ blang[android].
   }
   ```
 
+  In the above example a specific version of the library is referenced, however we recommend you check which is the latest stable version and always use that. Follow link to get the latest stable release for "Android":https://bintray.com/ably-io/ably/ably-android.
+
   After you add necessary dependencies, you can import AblyRest class into your code and initialize it.
 
   ```[java]
diff --git a/content/tutorials/token-authentication.textile b/content/tutorials/token-authentication.textile
index ea762457c3..122fbe94d9 100644
--- a/content/tutorials/token-authentication.textile
+++ b/content/tutorials/token-authentication.textile
@@ -29,6 +29,8 @@ blang[java].
     }
   ```
 
+  In the above example a specific version of the library is referenced, however we recommend you check which is the latest stable version and always use that. Follow link to get the latest stable release for "Java":https://bintray.com/ably-io/ably/ably-java.
+
   The server client library must be instanced with the private API key you copied in Step 1. This will ensure that the "basic authentication scheme":/general/authentication#basic-authentication is used, which is almost always the right choice for your own trusted servers where risk of compromise of your API key credentials is low.
 
   Add the following to a file named @Example.java@ to instance the Ably library inside your Node.js server:
@@ -608,6 +610,9 @@ blang[android].
       compile 'io.ably:ably-android:0.8.7'
   }
   ```
+
+  In the above example a specific version of the library is referenced, however we recommend you check which is the latest stable version and always use that. Follow link to get the latest stable release for "Android":https://bintray.com/ably-io/ably/ably-android.
+
   After you add necessary dependencies, you can import AblyRealtime class into your @ExampleActivity@ and initialize it.
 
   ```[java]
