diff --git a/platformio/__main__.py b/platformio/__main__.py
index 9b914145..72502afa 100644
--- a/platformio/__main__.py
+++ b/platformio/__main__.py
@@ -121,7 +121,7 @@ An unexpected error occurred. Further steps:
   `pip install -U platformio` command
 
 * Try to find answer in FAQ Troubleshooting section
-  http://docs.platformio.org/en/stable/faq.html
+  http://docs.platformio.org/page/faq.html
 
 * Report this problem to the developers
   https://github.com/platformio/platformio-core/issues
diff --git a/platformio/app.py b/platformio/app.py
index 85279cac..c76a4191 100644
--- a/platformio/app.py
+++ b/platformio/app.py
@@ -62,7 +62,7 @@ DEFAULT_SETTINGS = {
     },
     "enable_telemetry": {
         "description":
-        ("Telemetry service <http://docs.platformio.org/en/stable/"
+        ("Telemetry service <http://docs.platformio.org/page/"
          "userguide/cmd_settings.html?#enable-telemetry> (Yes/No)"),
         "value": True
     }
diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py
index 14b81cbb..1b2bf101 100644
--- a/platformio/builder/tools/piolib.py
+++ b/platformio/builder/tools/piolib.py
@@ -636,7 +636,7 @@ def GetLibBuilders(env):  # pylint: disable=too-many-branches
     if verbose and found_incompat:
         sys.stderr.write(
             "More details about \"Library Compatibility Mode\": "
-            "http://docs.platformio.org/en/stable/librarymanager/ldf.html#"
+            "http://docs.platformio.org/page/librarymanager/ldf.html#"
             "ldf-compat-mode\n")
 
     DefaultEnvironment()['__PIO_LIB_BUILDERS'] = items
diff --git a/platformio/commands/init.py b/platformio/commands/init.py
index fa6cdc19..aebd3bea 100644
--- a/platformio/commands/init.py
+++ b/platformio/commands/init.py
@@ -193,7 +193,7 @@ PlatformIO will find your libraries automatically, configure preprocessor's
 include paths and build them.
 
 More information about PlatformIO Library Dependency Finder
-- http://docs.platformio.org/en/stable/librarymanager/ldf.html
+- http://docs.platformio.org/page/librarymanager/ldf.html
 """)
 
 
@@ -203,7 +203,7 @@ def init_ci_conf(project_dir):
     with open(join(project_dir, ".travis.yml"), "w") as f:
         f.write("""# 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/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@@ -211,10 +211,10 @@ def init_ci_conf(project_dir):
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choice one of the following templates (proposed below) and uncomment
diff --git a/platformio/commands/lib.py b/platformio/commands/lib.py
index 90e72b93..25cc749e 100644
--- a/platformio/commands/lib.py
+++ b/platformio/commands/lib.py
@@ -202,8 +202,7 @@ def lib_search(query, json_output, page, noninteractive, **filters):
         click.echo("For more examples and advanced search syntax, "
                    "please use documentation:")
         click.secho(
-            "http://docs.platformio.org"
-            "/en/stable/userguide/lib/cmd_search.html\n",
+            "http://docs.platformio.org/page/userguide/lib/cmd_search.html\n",
             fg="cyan")
         return
 
diff --git a/platformio/exception.py b/platformio/exception.py
index 8a5489f3..a0c1c10d 100644
--- a/platformio/exception.py
+++ b/platformio/exception.py
@@ -207,7 +207,7 @@ class UpgradeError(PlatformioException):
 
 * Upgrade using `pip install -U platformio`
 * Try different installation/upgrading steps:
-  http://docs.platformio.org/en/stable/installation.html
+  http://docs.platformio.org/page/installation.html
 """
 
 
diff --git a/platformio/projectconftpl.ini b/platformio/projectconftpl.ini
index fa77ae29..dae59074 100644
--- a/platformio/projectconftpl.ini
+++ b/platformio/projectconftpl.ini
@@ -1,8 +1,9 @@
 ; PlatformIO Project Configuration File
 ;
-;   Build options: build flags, source filter, extra scripting
-;   Upload options: custom port, speed and extra flags
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
 ;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
diff --git a/platformio/util.py b/platformio/util.py
index 061ee2ee..c2fe8653 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -281,7 +281,7 @@ def get_projectpioenvs_dir(force=False):
             with open(dontmod_path, "w") as fp:
                 fp.write("""
 [InternetShortcut]
-URL=http://docs.platformio.org/en/stable/projectconf.html#envs-dir
+URL=http://docs.platformio.org/page/projectconf.html#envs-dir
 """)
     except Exception as e:  # pylint: disable=broad-except
         if not force: