From bd30de4f18271e15e91bcd9f0a52fe51f59f7386 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 14 Sep 2016 23:42:26 +0300
Subject: [PATCH] ESP8266: Using Arduino Framework with Staging version

---
 HISTORY.rst                            |  4 ++++
 docs/platforms/espressif8266_extra.rst | 19 +++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 0f5f57d7..72000697 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -14,9 +14,13 @@ PlatformIO 3.0
 * Fixed SSL Server-Name-Indication for Python < 2.7.9
 * Return valid exit code from ``plaformio test`` command
 
+-------
+
 * Development platform `Espressif 8266 <https://github.com/platformio/platform-espressif8266>`__
 
   + Add support for `SparkFun Blynk Board <https://www.sparkfun.com/products/13794>`_
+  + Created `staging <http://docs.platformio.org/en/stable/platforms/espressif8266.html#using-arduino-framework-with-staging-version>`__
+    branch to work with development version of Arduino Framework
 
 3.0.1 (2016-09-08)
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/platforms/espressif8266_extra.rst b/docs/platforms/espressif8266_extra.rst
index 983ef916..9855c687 100644
--- a/docs/platforms/espressif8266_extra.rst
+++ b/docs/platforms/espressif8266_extra.rst
@@ -220,20 +220,15 @@ Demo
 Using Arduino Framework with Staging version
 --------------------------------------------
 
-1.  Clone/Copy `main repository <https://github.com/esp8266/Arduino>`_ to
-    :ref:`projectconf_pio_home_dir` + ``packages/framework-arduinoespressif8266``
-    and create new file ``packages/framework-arduinoespressif8266/package.json``
-    with the next contents (you can specify own version if you want)
+1.  Install ``stage`` version of Espressif 8266 development platform
 
-    .. code-block:: json
+    .. code-block:: bash
 
-        {
-            "description":"Arduino Wiring-based Framework (ESP8266 Core)",
-            "name":"framework-arduinoespressif8266",
-            "system":"all",
-            "url":"https://github.com/esp8266/Arduino",
-            "version":"1.20300.0"
-        }
+        # uninstall existing (if you have it)
+        platformio platform uninstall espressif8266
+
+        # install from ``stage`` branch
+        platformio platform install https://github.com/platformio/platform-espressif8266.git#feature/stage
 
 2.  Try to build project
 3.  If you see build errors, then try to build this project using the same