From 291a60444aacaa0fe6773c4e257e5ccc3c1f9d54 Mon Sep 17 00:00:00 2001
From: Christian Bromann <github@christian-bromann.com>
Date: Mon, 24 Aug 2015 23:15:59 -0700
Subject: [PATCH 1/3] minor wording fix, updated example

---
 docs/tutorial/using-selenium-and-webdriver.md | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/tutorial/using-selenium-and-webdriver.md b/docs/tutorial/using-selenium-and-webdriver.md
index 29d95576227e..f3b7310dfbe5 100644
--- a/docs/tutorial/using-selenium-and-webdriver.md
+++ b/docs/tutorial/using-selenium-and-webdriver.md
@@ -72,7 +72,7 @@ driver.quit();
 
 ## Setting up with WebdriverIO
 
-[WebdriverIO](http://webdriver.io/) provided a Node package for testing with web driver.
+[WebdriverIO](http://webdriver.io/) provides a Node package for testing with web driver.
 
 ### 1. Start chrome driver
 
@@ -86,7 +86,7 @@ Only local connections are allowed.
 
 Remember the port number `9515`, which will be used later
 
-### 2. Install WebDriverJS
+### 2. Install WebdriverIO
 
 ```bash
 $ npm install webdriverio
@@ -96,22 +96,23 @@ $ npm install webdriverio
 ```javascript
 var webdriverio = require('webdriverio');
 var options = {
-	host: "localhost", // Use localhost as chrome driver server 
+    host: "localhost", // Use localhost as chrome driver server 
     port: 9515,        // "9515" is the port opened by chrome driver.
     desiredCapabilities: {
-            browserName: 'chrome',
-            chromeOptions: {binary: '/Path-to-Your-App.app/Electron'} // Path to your Electron binary.
-        }
+        browserName: 'chrome',
+        chromeOptions: {binary: '/Path-to-Your-App.app/Electron'} // Path to your Electron binary.
+    }
 };
 
-webdriverio
-    .remote(options)
+var client = webdriverio.remote(options);
+
+client
     .init()
     .url('http://google.com')
     .setValue('#q', 'webdriverio')
     .click('#btnG')
-    .title(function(err, res) {
-        console.log('Title was: ' + res.value);
+    .getTitle().then(function(title) {
+        console.log('Title was: ' + title);
     })
     .end();
 ```

From 6a7113e3ce744fd6ab45e64840acaa115b527ab6 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 25 Aug 2015 20:30:50 +0800
Subject: [PATCH 2/3] Update brightray

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index 939a7b814282..9267238d929a 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 939a7b814282a6433b8d7e3c9cfc74451360c07f
+Subproject commit 9267238d929a09491d58f3c2f49abb6ed9272483

From 65046b05afbead0d3b6b8b6f1a6d71d520dd583a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 25 Aug 2015 20:55:35 +0800
Subject: [PATCH 3/3] Update brightray and node

* brightray: fix building on OS X
* node: remove a not used patch
---
 vendor/brightray | 2 +-
 vendor/node      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendor/brightray b/vendor/brightray
index 9267238d929a..5b2a73c68a98 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 9267238d929a09491d58f3c2f49abb6ed9272483
+Subproject commit 5b2a73c68a986780e67eb2e738327d35c7c1c21e
diff --git a/vendor/node b/vendor/node
index 205b013ac86e..b9b6dd9f3fc0 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 205b013ac86e5500678a791cd54f305580fa4f4b
+Subproject commit b9b6dd9f3fc095e66a3b89d3efd50f7c576da2c8