Merge branch 'release/v1.1.0'

platformio · Dec 7, 2016 · 6f06ae7 · 6f06ae7
2 parents 3cbbebe + 49fd897
commit 6f06ae7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -3,14 +3,14 @@
 Windows x86 (32-bit) is a metafamily of graphical operating systems developed and marketed by Microsoft. Using host OS (Windows, Linux 32/64 or Mac OS X) you can build native application for Windows x86 platform.
 
 * [Home](http://platformio.org/platforms/windows_x86) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/en/latest/platforms/windows_x86.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Documentation](http://docs.platformio.org/en/stable/platforms/windows_x86.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
-1. [Install PlatformIO CLI](http://docs.platformio.org/en/latest/installation.html)
+1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html)
 2. Install Windows x86 development platform:
 ```bash
-# isntall the latest stable version
+# install the latest stable version
 > platformio platform install windows_x86
 
 # install development version

diff --git a/examples/hello-world/.travis.yml b/examples/hello-world/.travis.yml
@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/hello-world/README.rst b/examples/hello-world/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-windows_x86/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/hello-world/lib/readme.txt b/examples/hello-world/lib/readme.txt
@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 
diff --git a/platform.json b/platform.json
@@ -6,14 +6,13 @@
   "homepage": "http://platformio.org/platforms/windows_x86",
   "license": "Apache-2.0",
   "engines": {
-    "platformio": "^3.0.0",
-    "scons": ">=2.3.0,<2.6.0"
+    "platformio": "^3.0.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/platformio/platform-windows_x86.git"
   },
-  "version": "1.0.0",
+  "version": "1.1.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,5 +34,5 @@ include paths and build them.

		See additional options for PlatformIO Library Dependency Finder `lib_*`:

		http://docs.platformio.org/en/latest/projectconf.html#lib-install
		http://docs.platformio.org/en/stable/projectconf.html#lib-install