diff --git a/README.rst b/README.rst
index 923c9608..f67a01e8 100644
--- a/README.rst
+++ b/README.rst
@@ -23,8 +23,7 @@ PlatformIO
 `Blog <http://www.ikravets.com/category/computer-life/platformio>`_ |
 `Twitter <https://twitter.com/smartanthill>`_
 
-**PlatformIO** is a console tool to build code with different development
-platforms.
+**PlatformIO** is a cross-platform code builder and library manager.
 
 * `Quickstart <http://docs.platformio.ikravets.com/en/latest/quickstart.html>`_
 * `Installation <http://docs.platformio.ikravets.com/en/latest/installation.html>`_
@@ -72,14 +71,6 @@ It has support for many popular embedded platforms like these:
   (including `TIVA C Series LaunchPads <http://www.ti.com/ww/en/launchpad/launchpads-connected.html>`_)
 
 
-Questions & Bugs
-----------------
-
-Please use the
-`issue tracker <https://github.com/ivankravets/platformio/issues>`_
-to ask questions or report bugs.
-
-
 Licence
 -------
 
diff --git a/platformio/projectconftpl.ini b/platformio/projectconftpl.ini
index 06d414ba..6064784f 100644
--- a/platformio/projectconftpl.ini
+++ b/platformio/projectconftpl.ini
@@ -1,71 +1,13 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
-# Please uncomment (remove "#" sign from the beginning of the line)
-# some of the environments which fit to your project.
 #
-# And replace all values that match with "%..._HERE%" by real data.
-
+# Project Configuration File
+#
+# A detailed documentation with EXAMPLES is located here:
+# http://docs.platformio.ikravets.com/en/latest/projectconf.html
+#
 
 # Simple and base environment
 #[env:mybaseenv]
 #platform = %INSTALLED_PLATFORM_NAME_HERE%
-
-# Environment with specific build flags
-#[env:specbuildflags]
-#platform = %INSTALLED_PLATFORM_NAME_HERE%
-#build_flags = "-I/opt/include -L/opt/lib -lfoo"
-#srcbuild_flags = "-DSPECIAL_DEFINE_FOR_MY_SRC_FILES=13"
-
-#
-# Atmel AVR based board
-#
-#[env:myatmelavr_board]
-#platform = atmelavr
-#board_mcu = %MICROCONTROLLER_TYPE_HERE%     # for example -> atmega168
-#board_f_cpu = %PROCESSOR_FREQUENCY_HERE%    # for example -> 16000000L
-#upload_port = %UPLOAD_PORT_HERE%    # for example (Mac/Linux) -> /dev/ttyUSB0
-#upload_port = %UPLOAD_PORT_HERE%    # for example (Windows) -> COM3
-#upload_protocol = %UPLOAD_PROTOCOL_HERE%    # for example -> arduino
-#upload_speed = %UPLOAD_PROTOCOL_HERE%       # for example -> 19200
-#targets = %DEFAULT_TARGETS_HERE%            # for auto-upload use -> upload
-
-#
-# Atmel AVR based board + Arduino Wiring Framework
-#
-#[env:myarduino_board]
-#platform = atmelavr
-#framework = arduino
-#board = %BOARD_HERE%               # for example -> pro16MHzatmega168
-#upload_port = %UPLOAD_PORT_HERE%   # for example (Mac/Linux) -> /dev/ttyUSB0
-#upload_port = %UPLOAD_PORT_HERE%   # for example (Windows) -> COM3
-#targets = %DEFAULT_TARGETS_HERE%   # for auto-upload use -> upload
-
-#
-# TI MSP430 based board
-#
-#[env:mytimso430_board]
-#platform = timsp430
-#board_mcu = %MICROCONTROLLER_TYPE_HERE%     # for example -> msp430g2553
-#board_f_cpu = %PROCESSOR_FREQUENCY_HERE%    # for example -> 16000000L
-#upload_protocol = %UPLOAD_PROTOCOL_HERE%    # for example -> rf2500
-#targets = %DEFAULT_TARGETS_HERE%   # for auto-upload use -> upload
-
-#
-# TI MSP430  based board + Energia Wiring Framework
-#
-#[env:myarduino_board]
-#platform = timsp430
-#framework = energia
-#board = %BOARD_HERE%                        # for example -> lpmsp430g2553
-#upload_protocol = %UPLOAD_PROTOCOL_HERE%    # for example -> rf2500
-#targets = %DEFAULT_TARGETS_HERE%            # for auto-upload use -> upload
-
-#
-# TI TIVA C ARM based board  + Energia Wiring Framework
-#
-#[env:mytitiva_board]
-#platform = titiva
-#framework = energia
-#board = %BOARD_HERE%                        # for example -> lplm4f120h5qr
-#targets = %DEFAULT_TARGETS_HERE%            # for auto-upload use -> upload