diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 162fc45e..6ba7a7d3 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -54,7 +54,7 @@ Frameworks
       - Name
       - Reference
     * - ``arduino``
-      - Arduino Wiring-based Framework (AVR Core, 1.6 branch)
+      - Arduino Wiring-based Framework (AVR Core, 1.6)
       - `Documentation <http://arduino.cc/en/Reference/HomePage>`_
 
 
@@ -299,7 +299,7 @@ Adafruit
     * - ``flora8``
       - `Adafruit Flora
         <http://www.adafruit.com/product/659>`_
-      - ATmega32 ``atmega32u4``
+      - ATmega32u4 ``atmega32u4``
       - 8 MHz ``8000000L``
       - 32 Kb
       - 2.5 Kb
@@ -307,7 +307,7 @@ Adafruit
       - `Adafruit Trinket 8MHz 3.3V LOGIC
         <http://www.adafruit.com/products/1500>`_
       - ATtiny85 ``attiny85``
-      - 8 MHz ``16000000L``
+      - 8 MHz ``8000000L``
       - 8 Kb
       - 0.5 Kb
     * - ``trinket5``
@@ -318,33 +318,33 @@ Adafruit
       - 8 Kb
       - 0.5 Kb
     * - ``protrinket3``
-      - `Pro Trinket 3V/12MHz (USB)
+      - `Adafruit Pro Trinket 3V/12MHz (USB)
         <http://www.adafruit.com/products/2010>`_
-      - ATmega328 ``atmega328p``
+      - ATmega328P ``atmega328p``
       - 12 MHz ``12000000L``
       - 32 Kb
       - 2 Kb
     * - ``protrinket3ftdi``
-      - `Pro Trinket 3V/12MHz (FTDI)
+      - `Adafruit Pro Trinket 3V/12MHz (FTDI)
         <http://www.adafruit.com/products/2010>`_
-      - ATmega328 ``atmega328p``
+      - ATmega328P ``atmega328p``
       - 12 MHz ``12000000L``
       - 32 Kb
       - 2 Kb
     * - ``protrinket5``
-      - `Pro Trinket 5V/16MHz (USB)
+      - `Adafruit Pro Trinket 5V/16MHz (USB)
         <http://www.adafruit.com/products/2000>`_
-      - ATmega328 ``atmega328p``
+      - ATmega328P ``atmega328p``
       - 16 MHz ``16000000L``
       - 32 Kb
       - 2 Kb
     * - ``protrinket5ftdi``
-      - `Pro Trinket 5V/16MHz (FTDI)
+      - `Adafruit Pro Trinket 5V/16MHz (FTDI)
         <http://www.adafruit.com/products/2000>`_
-      - ATmega328 ``atmega328p``
+      - ATmega328P ``atmega328p``
       - 16 MHz ``16000000L``
       - 32 Kb
-      - 2 Kb  
+      - 2 Kb
 
 More detailed information you can find here
 `Adafruits boards <https://learn.adafruit.com/category/trinket>`_.
@@ -379,7 +379,7 @@ Digispark
       - ATtiny167 ``attiny167``
       - 16 Mhz ``16000000L``
       - 16 kb
-      - 0.5 Kb 
+      - 0.5  Kb
 
 More detailed information you can find here
 `Digistump Development Boards <http://digistump.com/wiki/start>`_.
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index 6db06f5a..796d9188 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -25,7 +25,7 @@ Packages
         `GDB <http://www.gnu.org/software/gdb/>`_
     * - ``tool-bossac``
       - uploader
-      - `Bossac <https://sourceforge.net/projects/b-o-s-s-a/>`_
+      - `BOSSA CLI <https://sourceforge.net/projects/b-o-s-s-a/>`_
     * - ``framework-arduino``
       -
       - See below in :ref:`atmelsam_frameworks`
@@ -48,7 +48,7 @@ Frameworks
       - Name
       - Reference
     * - ``arduino``
-      - Arduino Wiring-based Framework
+      - Arduino Wiring-based Framework (SAM Core, 1.6)
       - `Documentation <http://arduino.cc/en/Reference/HomePage>`_
 
 
diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index b4a65b96..5347be01 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -59,21 +59,48 @@ Packages
     * - ``tool-avrdude``
       - uploader
       - `AVRDUDE <http://www.nongnu.org/avrdude/>`_
+    * - ``tool-bossac``
+      - uploader
+      - `BOSSA CLI <https://sourceforge.net/projects/b-o-s-s-a/>`_
+    * - ``tool-micronucleus``
+      - uploader
+      - `Micronucleus <https://github.com/micronucleus/micronucleus>`_
     * - ``tool-mspdebug``
       - uploader
       - `MSPDebug <http://mspdebug.sourceforge.net>`_
     * - ``tool-lm4flash``
       - uploader
       - `Flash Programmer <http://www.ti.com/tool/lmflashprogrammer>`_
+    * - ``tool-stlink``
+      - uploader
+      - `STLink <https://github.com/texane/stlink>`_
+    * - ``tool-teensy``
+      - uploader
+      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
     * - ``framework-arduinoavr``
       -
       - `Arduino Wiring-based Framework (AVR Core, 1.6 branch) <http://arduino.cc/en/Reference/HomePage>`_
+    * - ``framework-arduinosam``
+      -
+      - `Arduino Wiring-based Framework (SAM Core, 1.6 branch) <http://arduino.cc/en/Reference/HomePage>`_
+    * - ``framework-arduinoteensy``
+      -
+      - `Arduino Wiring-based Framework <http://arduino.cc/en/Reference/HomePage>`_
     * - ``framework-energiamsp430``
       -
       - `Energia Wiring-based Framework (MSP430 Core) <http://energia.nu/reference/>`_
     * - ``framework-energiativa``
       -
       - `Energia Wiring-based Framework (LM4F Core)  <http://energia.nu/reference/>`_
+    * - ``framework-cmsis``
+      -
+      - `Vendor-independent hardware abstraction layer for the Cortex-M processor series <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php>`_
+    * - ``framework-spl``
+      -
+      - `Standard Peripheral Library for STM32 MCUs <http://www.st.com/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890>`_
+    * - ``framework-opencm3``
+      -
+      - `libOpenCM3 Framework <http://www.libopencm3.org>`_
 
 .. _platform_creating_manifest_file:
 
diff --git a/docs/platforms/stm32.rst b/docs/platforms/stm32.rst
index 0543002e..ab4000c3 100644
--- a/docs/platforms/stm32.rst
+++ b/docs/platforms/stm32.rst
@@ -3,7 +3,7 @@
 Platform ``stm32``
 ==================
 
-`The STM32 family of 32-bit Flash microcontrollers <http://www.st.com/web/en/catalog/mmc/FM141/SC1169?sc=stm32>`_ based on the ARM® Cortex®-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+`The STM32 family of 32-bit Flash MCUs <http://www.st.com/web/en/catalog/mmc/FM141/SC1169?sc=stm32>`_ based on the ARM® Cortex®-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
 
 The unparalleled and large range of STM32 devices, based on an industry-standard core and accompanied by a vast choice of tools and software, makes this family of products the ideal choice, both for small projects and for entire platform decisions.
 
@@ -24,7 +24,7 @@ Packages
         `GDB <http://www.gnu.org/software/gdb/>`_
     * - ``tool-stlink``
       - uploader
-      - `Flash Programmer <https://github.com/texane/stlink>`_
+      - `STLink <https://github.com/texane/stlink>`_
     * - ``framework-cmsis``
       -
       - See below in :ref:`stm32_frameworks`
@@ -81,21 +81,21 @@ Boards
       - RAM
     * - ``stm32ldiscovery``
       - `Discovery kit for STM32L151/152 line <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/PF250990?sc=internet/evalboard/product/250990.jsp>`_
-      - stm32l152rbt6 ``cortex-m3``
+      - STM32L152rbt6 ``cortex-m3``
       - 32 MHz ``32000000L``
       - 128 Kb
       - 16 Kb
     * - ``stm32f3discovery``
       - `Discovery kit for STM32F303xx microcontrollers
         <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/PF254044>`_
-      - stm32f303vct6 ``cortex-m4``
+      - STM32F303vct6 ``cortex-m4``
       - 72 MHz ``72000000L``
       - 256 Kb
       - 48 Kb
     * - ``stm32f4discovery``
       - `Discovery kit for STM32F407/417 lines
         <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/PF252419>`_
-      - stm32f407vgt6 ``cortex-m4``
+      - STM32F407vgt6 ``cortex-m4``
       - 168 Mhz ``168000000L``
       - 1 Mb
       - 192 Kb
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index 23662d02..a60b6d02 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -28,8 +28,8 @@ Packages
         `SimulAVR <http://www.nongnu.org/simulavr/>`_
     * - ``tool-teensy``
       - uploader
-      - `Flash Programmer <https://www.pjrc.com/teensy/loader.html>`_
-    * - ``framework-arduino``
+      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
+    * - ``framework-arduinoteensy``
       -
       - See below in :ref:`teensy_frameworks`
 
@@ -73,26 +73,26 @@ Boards
       - Flash
       - RAM
     * - ``teensy20``
-      - `Teensy USB Board, Version 2.0 <https://www.pjrc.com/store/teensy.html>`_
-      - ATmega32 ``atmega32u4``
+      - `Teensy 2.0 <https://www.pjrc.com/store/teensy.html>`_
+      - ATmega32u4 ``atmega32u4``
       - 16 MHz ``16000000L``
       - 32 Kb
       - 2.5 Kb
     * - ``teensy20pp``
-      - `Teensy++ USB Board, Version 2.0 <https://www.pjrc.com/store/teensypp.html>`_
+      - `Teensy++ 2.0 <https://www.pjrc.com/store/teensypp.html>`_
       - AT90USB1289 ``at90usb1286``
       - 16 MHz ``16000000L``
       - 128 Kb
       - 8 Kb
     * - ``teensy30``
-      - `Teensy USB Board, Version 3.0 <https://www.pjrc.com/store/teensy3.html>`_
-      - mk20dx128 ``cortex-m4``
+      - `Teensy 3.0 <https://www.pjrc.com/store/teensy3.html>`_
+      - MK20DX128 ``cortex-m4``
       - 48 Mhz ``48000000L``
       - 128 kb
       - 16 Kb
     * - ``teensy31``
-      - `Teensy USB Board, Version 3.1 <https://www.pjrc.com/store/teensy31.html>`_
-      - mk20dx256 ``cortex-m4``
+      - `Teensy 3.1 <https://www.pjrc.com/store/teensy31.html>`_
+      - MK20DX256 ``cortex-m4``
       - 72 Mhz ``72000000L``
       - 256 kb
       - 64 Kb