From 516959bddc819be2ed127712547efafc3865a8bb Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 25 Mar 2015 11:42:36 +0200
Subject: [PATCH] Normalize board names // Issue #128

---
 docs/frameworks/arduino.rst    | 24 ++++++++++-----------
 docs/frameworks/cmsis.rst      |  6 +++---
 docs/frameworks/energia.rst    | 20 +++++++++---------
 docs/frameworks/libopencm3.rst | 12 +++++------
 docs/frameworks/mbed.rst       | 38 +++++++++++++++++-----------------
 docs/frameworks/spl.rst        |  6 +++---
 docs/platforms/atmelavr.rst    | 24 ++++++++++-----------
 docs/platforms/nordicnrf51.rst |  2 +-
 docs/platforms/nxplpc.rst      | 22 ++++++++++----------
 docs/platforms/ststm32.rst     | 16 +++++++-------
 docs/platforms/timsp430.rst    | 14 ++++++-------
 docs/platforms/titiva.rst      |  6 +++---
 12 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 6215048c..e178058f 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -57,28 +57,28 @@ Adafruit
       - 2.5 Kb
 
     * - ``protrinket3``
-      - `Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
+      - `Adafruit Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
       - 12 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``protrinket3ftdi``
-      - `Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
+      - `Adafruit Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``protrinket5``
-      - `Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
+      - `Adafruit Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``protrinket5ftdi``
-      - `Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
+      - `Adafruit Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -112,7 +112,7 @@ Arduino
       - RAM
 
     * - ``LilyPadUSB``
-      - `LilyPad Arduino USB <http://arduino.cc/en/Main/ArduinoBoardLilyPadUSB>`_
+      - `Arduino LilyPad USB <http://arduino.cc/en/Main/ArduinoBoardLilyPadUSB>`_
       - ATMEGA32U4
       - 8 MHz
       - 32 Kb
@@ -203,14 +203,14 @@ Arduino
       - 2.5 Kb
 
     * - ``lilypadatmega168``
-      - `LilyPad Arduino ATmega168 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
+      - `Arduino LilyPad ATmega168 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
       - ATMEGA168
       - 8 MHz
       - 16 Kb
       - 1 Kb
 
     * - ``lilypadatmega328``
-      - `LilyPad Arduino ATmega328 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
+      - `Arduino LilyPad ATmega328 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
       - ATMEGA328P
       - 8 MHz
       - 32 Kb
@@ -342,7 +342,7 @@ BitWizard
       - RAM
 
     * - ``raspduino``
-      - `Raspduino <http://www.bitwizard.nl/wiki/index.php/Raspduino>`_
+      - `BitWizard Raspduino <http://www.bitwizard.nl/wiki/index.php/Raspduino>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -362,28 +362,28 @@ Digistump
       - RAM
 
     * - ``digispark-pro``
-      - `Digispark Pro (Default 16 MHz) <http://digistump.com/products/109>`_
+      - `Digistump Digispark Pro (Default 16 MHz) <http://digistump.com/products/109>`_
       - ATTINY167
       - 16 MHz
       - 16 Kb
       - 0.5 Kb
 
     * - ``digispark-pro32``
-      - `Digispark Pro (16 MHz) (32 byte buffer) <http://digistump.com/products/109>`_
+      - `Digistump Digispark Pro (16 MHz) (32 byte buffer) <http://digistump.com/products/109>`_
       - ATTINY167
       - 16 MHz
       - 16 Kb
       - 0.5 Kb
 
     * - ``digispark-pro64``
-      - `Digispark Pro (16 MHz) (64 byte buffer) <http://digistump.com/products/109>`_
+      - `Digistump Digispark Pro (16 MHz) (64 byte buffer) <http://digistump.com/products/109>`_
       - ATTINY167
       - 16 MHz
       - 16 Kb
       - 0.5 Kb
 
     * - ``digispark-tiny``
-      - `Digispark (Default - 16 MHz) <http://digistump.com/products/1>`_
+      - `Digistump Digispark (Default - 16 MHz) <http://digistump.com/products/1>`_
       - ATTINY85
       - 16 MHz
       - 8 Kb
diff --git a/docs/frameworks/cmsis.rst b/docs/frameworks/cmsis.rst
index 2bdf474e..7824155e 100644
--- a/docs/frameworks/cmsis.rst
+++ b/docs/frameworks/cmsis.rst
@@ -41,21 +41,21 @@ ST
       - RAM
 
     * - ``disco_f303vc``
-      - `STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
+      - `ST STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
       - STM32F303VCT6
       - 72 MHz
       - 256 Kb
       - 48 Kb
 
     * - ``disco_f407vg``
-      - `STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
+      - `ST STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
       - STM32F407VGT6
       - 168 MHz
       - 1024 Kb
       - 128 Kb
 
     * - ``disco_l152rb``
-      - `STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
+      - `ST STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
       - STM32L152RBT6
       - 32 MHz
       - 128 Kb
diff --git a/docs/frameworks/energia.rst b/docs/frameworks/energia.rst
index 56826b10..0f2b4397 100644
--- a/docs/frameworks/energia.rst
+++ b/docs/frameworks/energia.rst
@@ -44,70 +44,70 @@ TI
       - RAM
 
     * - ``lplm4f120h5qr``
-      - `LaunchPad (Stellaris) w/ lm4f120 (80MHz) <http://www.ti.com/tool/ek-lm4f120xl>`_
+      - `TI LaunchPad (Stellaris) w/ lm4f120 (80MHz) <http://www.ti.com/tool/ek-lm4f120xl>`_
       - LPLM4F120H5QR
       - 80 MHz
       - 256 Kb
       - 32 Kb
 
     * - ``lpmsp430f5529``
-      - `LaunchPad w/ msp430f5529 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
+      - `TI LaunchPad w/ msp430f5529 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
       - MSP430F5529
       - 16 MHz
       - 128 Kb
       - 1 Kb
 
     * - ``lpmsp430f5529_25``
-      - `LaunchPad w/ msp430f5529 (25MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
+      - `TI LaunchPad w/ msp430f5529 (25MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
       - MSP430F5529
       - 25 MHz
       - 128 Kb
       - 1 Kb
 
     * - ``lpmsp430fr5739``
-      - `FraunchPad w/ msp430fr5739 <http://www.ti.com/tool/msp-exp430fr5739>`_
+      - `TI FraunchPad w/ msp430fr5739 <http://www.ti.com/tool/msp-exp430fr5739>`_
       - MSP430FR5739
       - 16 MHz
       - 16 Kb
       - 1 Kb
 
     * - ``lpmsp430fr5969``
-      - `LaunchPad w/ msp430fr5969 <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430fr5969.html>`_
+      - `TI LaunchPad w/ msp430fr5969 <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430fr5969.html>`_
       - MSP430FR5969
       - 8 MHz
       - 64 Kb
       - 1 Kb
 
     * - ``lpmsp430g2231``
-      - `LaunchPad w/ msp430g2231 (1 MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - `TI LaunchPad w/ msp430g2231 (1 MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
       - MSP430G2231
       - 1 MHz
       - 2 Kb
       - 0.125 Kb
 
     * - ``lpmsp430g2452``
-      - `LaunchPad w/ msp430g2452 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - `TI LaunchPad w/ msp430g2452 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
       - MSP430G2452
       - 16 MHz
       - 8 Kb
       - 0.25 Kb
 
     * - ``lpmsp430g2553``
-      - `LaunchPad w/ msp430g2553 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - `TI LaunchPad w/ msp430g2553 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
       - MSP430G2553
       - 16 MHz
       - 16 Kb
       - 0.5 Kb
 
     * - ``lptm4c1230c3pm``
-      - `LaunchPad (Tiva C) w/ tm4c123 (80MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
+      - `TI LaunchPad (Tiva C) w/ tm4c123 (80MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
       - LPTM4C1230C3PM
       - 80 MHz
       - 256 Kb
       - 32 Kb
 
     * - ``lptm4c1294ncpdt``
-      - `LaunchPad (Tiva C) w/ tm4c129 (120MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
+      - `TI LaunchPad (Tiva C) w/ tm4c129 (120MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
       - LPTM4C1294NCPDT
       - 120 MHz
       - 1024 Kb
diff --git a/docs/frameworks/libopencm3.rst b/docs/frameworks/libopencm3.rst
index be36dbd9..dfde004a 100644
--- a/docs/frameworks/libopencm3.rst
+++ b/docs/frameworks/libopencm3.rst
@@ -44,21 +44,21 @@ ST
       - RAM
 
     * - ``disco_f303vc``
-      - `STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
+      - `ST STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
       - STM32F303VCT6
       - 72 MHz
       - 256 Kb
       - 48 Kb
 
     * - ``disco_f407vg``
-      - `STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
+      - `ST STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
       - STM32F407VGT6
       - 168 MHz
       - 1024 Kb
       - 128 Kb
 
     * - ``disco_l152rb``
-      - `STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
+      - `ST STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
       - STM32L152RBT6
       - 32 MHz
       - 128 Kb
@@ -78,21 +78,21 @@ TI
       - RAM
 
     * - ``lplm4f120h5qr``
-      - `LaunchPad (Stellaris) w/ lm4f120 (80MHz) <http://www.ti.com/tool/ek-lm4f120xl>`_
+      - `TI LaunchPad (Stellaris) w/ lm4f120 (80MHz) <http://www.ti.com/tool/ek-lm4f120xl>`_
       - LPLM4F120H5QR
       - 80 MHz
       - 256 Kb
       - 32 Kb
 
     * - ``lptm4c1230c3pm``
-      - `LaunchPad (Tiva C) w/ tm4c123 (80MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
+      - `TI LaunchPad (Tiva C) w/ tm4c123 (80MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
       - LPTM4C1230C3PM
       - 80 MHz
       - 256 Kb
       - 32 Kb
 
     * - ``lptm4c1294ncpdt``
-      - `LaunchPad (Tiva C) w/ tm4c129 (120MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
+      - `TI LaunchPad (Tiva C) w/ tm4c129 (120MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
       - LPTM4C1294NCPDT
       - 120 MHz
       - 1024 Kb
diff --git a/docs/frameworks/mbed.rst b/docs/frameworks/mbed.rst
index 98436f12..3bea58b5 100644
--- a/docs/frameworks/mbed.rst
+++ b/docs/frameworks/mbed.rst
@@ -50,7 +50,7 @@ CQ Publishing
       - RAM
 
     * - ``lpc11u35_501``
-      - `TG-LPC11U35-501 <https://developer.mbed.org/platforms/TG-LPC11U35-501/>`_
+      - `CQ Publishing TG-LPC11U35-501 <https://developer.mbed.org/platforms/TG-LPC11U35-501/>`_
       - LPC11U35
       - 48 MHz
       - 64 Kb
@@ -70,21 +70,21 @@ Embedded Artists
       - RAM
 
     * - ``lpc11u35``
-      - `EA LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
+      - `Embedded Artists LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
       - LPC11U35
       - 48 MHz
       - 64 Kb
       - 10 Kb
 
     * - ``lpc4088``
-      - `EA LPC4088 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC4088/>`_
+      - `Embedded Artists LPC4088 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC4088/>`_
       - LPC4088
       - 120 MHz
       - 512 Kb
       - 96 Kb
 
     * - ``lpc4088_dm``
-      - `EA LPC4088 Display Module <https://developer.mbed.org/platforms/EA-LPC4088-Display-Module/>`_
+      - `Embedded Artists LPC4088 Display Module <https://developer.mbed.org/platforms/EA-LPC4088-Display-Module/>`_
       - LPC4088
       - 120 MHz
       - 512 Kb
@@ -186,7 +186,7 @@ NGX Technologies
       - RAM
 
     * - ``blueboard_lpc11u24``
-      - `BlueBoard-LPC11U24 <https://developer.mbed.org/platforms/BlueBoard-LPC11U24/>`_
+      - `NGX Technologies BlueBoard-LPC11U24 <https://developer.mbed.org/platforms/BlueBoard-LPC11U24/>`_
       - LPC11U24
       - 48 MHz
       - 32 Kb
@@ -206,21 +206,21 @@ NXP
       - RAM
 
     * - ``lpc11u24``
-      - `mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
+      - `NXP mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
       - LPC11U24
       - 48 MHz
       - 32 Kb
       - 8 Kb
 
     * - ``lpc1549``
-      - `LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
+      - `NXP LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
       - LPC1549
       - 72 MHz
       - 256 Kb
       - 36 Kb
 
     * - ``lpc1768``
-      - `mbed LPC1768 <http://developer.mbed.org/platforms/mbed-LPC1768/>`_
+      - `NXP mbed LPC1768 <http://developer.mbed.org/platforms/mbed-LPC1768/>`_
       - LPC1768
       - 96 MHz
       - 512 Kb
@@ -321,49 +321,49 @@ ST
       - RAM
 
     * - ``disco_f051r8``
-      - `STM32F0DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215>`_
+      - `ST STM32F0DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215>`_
       - STM32F051R8T6
       - 48 MHz
       - 64 Kb
       - 8 Kb
 
     * - ``disco_f100rb``
-      - `STM32VLDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863>`_
+      - `ST STM32VLDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863>`_
       - STM32F100RBT6
       - 24 MHz
       - 128 Kb
       - 8 Kb
 
     * - ``disco_f303vc``
-      - `STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
+      - `ST STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
       - STM32F303VCT6
       - 72 MHz
       - 256 Kb
       - 48 Kb
 
     * - ``disco_f334c8``
-      - `32F3348DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF260318>`_
+      - `ST 32F3348DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF260318>`_
       - STM32F334C8T6
       - 72 MHz
       - 64 Kb
       - 16 Kb
 
     * - ``disco_f401vc``
-      - `32F401CDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098>`_
+      - `ST 32F401CDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098>`_
       - STM32F401VCT6
       - 84 MHz
       - 256 Kb
       - 64 Kb
 
     * - ``disco_f407vg``
-      - `STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
+      - `ST STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
       - STM32F407VGT6
       - 168 MHz
       - 1024 Kb
       - 128 Kb
 
     * - ``disco_f429zi``
-      - `32F429IDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090>`_
+      - `ST 32F429IDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090>`_
       - STM32F429ZIT6
       - 180 MHz
       - 2048 Kb
@@ -467,14 +467,14 @@ SeeedStudio
       - RAM
 
     * - ``seeedTinyBLE``
-      - `Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
+      - `SeeedStudio Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
       - NRF51822
       - 16 MHz
       - 256 Kb
       - 16 Kb
 
     * - ``seeeduinoArchPro``
-      - `Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
+      - `SeeedStudio Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
       - LPC1768
       - 96 MHz
       - 512 Kb
@@ -494,7 +494,7 @@ Solder Splash Labs
       - RAM
 
     * - ``dipcortexm0``
-      - `DipCortex M0 <https://developer.mbed.org/platforms/DipCortex-M0/>`_
+      - `Solder Splash Labs DipCortex M0 <https://developer.mbed.org/platforms/DipCortex-M0/>`_
       - LPC11U24
       - 50 MHz
       - 32 Kb
@@ -521,7 +521,7 @@ Switch Science
       - 16 Kb
 
     * - ``lpc1114fn28``
-      - `mbed LPC1114FN28 <https://developer.mbed.org/platforms/LPC1114FN28/>`_
+      - `Switch Science mbed LPC1114FN28 <https://developer.mbed.org/platforms/LPC1114FN28/>`_
       - LPC1114FN28
       - 48 MHz
       - 32 Kb
diff --git a/docs/frameworks/spl.rst b/docs/frameworks/spl.rst
index fa4e9cdc..64d91979 100644
--- a/docs/frameworks/spl.rst
+++ b/docs/frameworks/spl.rst
@@ -41,21 +41,21 @@ ST
       - RAM
 
     * - ``disco_f303vc``
-      - `STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
+      - `ST STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
       - STM32F303VCT6
       - 72 MHz
       - 256 Kb
       - 48 Kb
 
     * - ``disco_f407vg``
-      - `STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
+      - `ST STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
       - STM32F407VGT6
       - 168 MHz
       - 1024 Kb
       - 128 Kb
 
     * - ``disco_l152rb``
-      - `STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
+      - `ST STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
       - STM32L152RBT6
       - 32 MHz
       - 128 Kb
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 600f4ebc..86f448bd 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -76,28 +76,28 @@ Adafruit
       - 2.5 Kb
 
     * - ``protrinket3``
-      - `Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
+      - `Adafruit Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
       - 12 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``protrinket3ftdi``
-      - `Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
+      - `Adafruit Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``protrinket5``
-      - `Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
+      - `Adafruit Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``protrinket5ftdi``
-      - `Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
+      - `Adafruit Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -131,7 +131,7 @@ Arduino
       - RAM
 
     * - ``LilyPadUSB``
-      - `LilyPad Arduino USB <http://arduino.cc/en/Main/ArduinoBoardLilyPadUSB>`_
+      - `Arduino LilyPad USB <http://arduino.cc/en/Main/ArduinoBoardLilyPadUSB>`_
       - ATMEGA32U4
       - 8 MHz
       - 32 Kb
@@ -208,14 +208,14 @@ Arduino
       - 2.5 Kb
 
     * - ``lilypadatmega168``
-      - `LilyPad Arduino ATmega168 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
+      - `Arduino LilyPad ATmega168 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
       - ATMEGA168
       - 8 MHz
       - 16 Kb
       - 1 Kb
 
     * - ``lilypadatmega328``
-      - `LilyPad Arduino ATmega328 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
+      - `Arduino LilyPad ATmega328 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
       - ATMEGA328P
       - 8 MHz
       - 32 Kb
@@ -347,7 +347,7 @@ BitWizard
       - RAM
 
     * - ``raspduino``
-      - `Raspduino <http://www.bitwizard.nl/wiki/index.php/Raspduino>`_
+      - `BitWizard Raspduino <http://www.bitwizard.nl/wiki/index.php/Raspduino>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -367,28 +367,28 @@ Digistump
       - RAM
 
     * - ``digispark-pro``
-      - `Digispark Pro (Default 16 MHz) <http://digistump.com/products/109>`_
+      - `Digistump Digispark Pro (Default 16 MHz) <http://digistump.com/products/109>`_
       - ATTINY167
       - 16 MHz
       - 16 Kb
       - 0.5 Kb
 
     * - ``digispark-pro32``
-      - `Digispark Pro (16 MHz) (32 byte buffer) <http://digistump.com/products/109>`_
+      - `Digistump Digispark Pro (16 MHz) (32 byte buffer) <http://digistump.com/products/109>`_
       - ATTINY167
       - 16 MHz
       - 16 Kb
       - 0.5 Kb
 
     * - ``digispark-pro64``
-      - `Digispark Pro (16 MHz) (64 byte buffer) <http://digistump.com/products/109>`_
+      - `Digistump Digispark Pro (16 MHz) (64 byte buffer) <http://digistump.com/products/109>`_
       - ATTINY167
       - 16 MHz
       - 16 Kb
       - 0.5 Kb
 
     * - ``digispark-tiny``
-      - `Digispark (Default - 16 MHz) <http://digistump.com/products/1>`_
+      - `Digistump Digispark (Default - 16 MHz) <http://digistump.com/products/1>`_
       - ATTINY85
       - 16 MHz
       - 8 Kb
diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst
index 90bf1ac9..6ae93a56 100644
--- a/docs/platforms/nordicnrf51.rst
+++ b/docs/platforms/nordicnrf51.rst
@@ -144,7 +144,7 @@ SeeedStudio
       - RAM
 
     * - ``seeedTinyBLE``
-      - `Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
+      - `SeeedStudio Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
       - NRF51822
       - 16 MHz
       - 256 Kb
diff --git a/docs/platforms/nxplpc.rst b/docs/platforms/nxplpc.rst
index 2bea9de5..1f2e402b 100644
--- a/docs/platforms/nxplpc.rst
+++ b/docs/platforms/nxplpc.rst
@@ -63,7 +63,7 @@ CQ Publishing
       - RAM
 
     * - ``lpc11u35_501``
-      - `TG-LPC11U35-501 <https://developer.mbed.org/platforms/TG-LPC11U35-501/>`_
+      - `CQ Publishing TG-LPC11U35-501 <https://developer.mbed.org/platforms/TG-LPC11U35-501/>`_
       - LPC11U35
       - 48 MHz
       - 64 Kb
@@ -83,21 +83,21 @@ Embedded Artists
       - RAM
 
     * - ``lpc11u35``
-      - `EA LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
+      - `Embedded Artists LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
       - LPC11U35
       - 48 MHz
       - 64 Kb
       - 10 Kb
 
     * - ``lpc4088``
-      - `EA LPC4088 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC4088/>`_
+      - `Embedded Artists LPC4088 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC4088/>`_
       - LPC4088
       - 120 MHz
       - 512 Kb
       - 96 Kb
 
     * - ``lpc4088_dm``
-      - `EA LPC4088 Display Module <https://developer.mbed.org/platforms/EA-LPC4088-Display-Module/>`_
+      - `Embedded Artists LPC4088 Display Module <https://developer.mbed.org/platforms/EA-LPC4088-Display-Module/>`_
       - LPC4088
       - 120 MHz
       - 512 Kb
@@ -117,7 +117,7 @@ NGX Technologies
       - RAM
 
     * - ``blueboard_lpc11u24``
-      - `BlueBoard-LPC11U24 <https://developer.mbed.org/platforms/BlueBoard-LPC11U24/>`_
+      - `NGX Technologies BlueBoard-LPC11U24 <https://developer.mbed.org/platforms/BlueBoard-LPC11U24/>`_
       - LPC11U24
       - 48 MHz
       - 32 Kb
@@ -137,21 +137,21 @@ NXP
       - RAM
 
     * - ``lpc11u24``
-      - `mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
+      - `NXP mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
       - LPC11U24
       - 48 MHz
       - 32 Kb
       - 8 Kb
 
     * - ``lpc1549``
-      - `LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
+      - `NXP LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
       - LPC1549
       - 72 MHz
       - 256 Kb
       - 36 Kb
 
     * - ``lpc1768``
-      - `mbed LPC1768 <http://developer.mbed.org/platforms/mbed-LPC1768/>`_
+      - `NXP mbed LPC1768 <http://developer.mbed.org/platforms/mbed-LPC1768/>`_
       - LPC1768
       - 96 MHz
       - 512 Kb
@@ -191,7 +191,7 @@ SeeedStudio
       - RAM
 
     * - ``seeeduinoArchPro``
-      - `Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
+      - `SeeedStudio Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
       - LPC1768
       - 96 MHz
       - 512 Kb
@@ -211,7 +211,7 @@ Solder Splash Labs
       - RAM
 
     * - ``dipcortexm0``
-      - `DipCortex M0 <https://developer.mbed.org/platforms/DipCortex-M0/>`_
+      - `Solder Splash Labs DipCortex M0 <https://developer.mbed.org/platforms/DipCortex-M0/>`_
       - LPC11U24
       - 50 MHz
       - 32 Kb
@@ -231,7 +231,7 @@ Switch Science
       - RAM
 
     * - ``lpc1114fn28``
-      - `mbed LPC1114FN28 <https://developer.mbed.org/platforms/LPC1114FN28/>`_
+      - `Switch Science mbed LPC1114FN28 <https://developer.mbed.org/platforms/LPC1114FN28/>`_
       - LPC1114FN28
       - 48 MHz
       - 32 Kb
diff --git a/docs/platforms/ststm32.rst b/docs/platforms/ststm32.rst
index 215d239c..4f2c5e40 100644
--- a/docs/platforms/ststm32.rst
+++ b/docs/platforms/ststm32.rst
@@ -87,56 +87,56 @@ ST
       - RAM
 
     * - ``disco_f051r8``
-      - `STM32F0DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215>`_
+      - `ST STM32F0DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215>`_
       - STM32F051R8T6
       - 48 MHz
       - 64 Kb
       - 8 Kb
 
     * - ``disco_f100rb``
-      - `STM32VLDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863>`_
+      - `ST STM32VLDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863>`_
       - STM32F100RBT6
       - 24 MHz
       - 128 Kb
       - 8 Kb
 
     * - ``disco_f303vc``
-      - `STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
+      - `ST STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
       - STM32F303VCT6
       - 72 MHz
       - 256 Kb
       - 48 Kb
 
     * - ``disco_f334c8``
-      - `32F3348DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF260318>`_
+      - `ST 32F3348DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF260318>`_
       - STM32F334C8T6
       - 72 MHz
       - 64 Kb
       - 16 Kb
 
     * - ``disco_f401vc``
-      - `32F401CDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098>`_
+      - `ST 32F401CDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098>`_
       - STM32F401VCT6
       - 84 MHz
       - 256 Kb
       - 64 Kb
 
     * - ``disco_f407vg``
-      - `STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
+      - `ST STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
       - STM32F407VGT6
       - 168 MHz
       - 1024 Kb
       - 128 Kb
 
     * - ``disco_f429zi``
-      - `32F429IDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090>`_
+      - `ST 32F429IDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090>`_
       - STM32F429ZIT6
       - 180 MHz
       - 2048 Kb
       - 256 Kb
 
     * - ``disco_l152rb``
-      - `STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
+      - `ST STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
       - STM32L152RBT6
       - 32 MHz
       - 128 Kb
diff --git a/docs/platforms/timsp430.rst b/docs/platforms/timsp430.rst
index 19102624..913f1970 100644
--- a/docs/platforms/timsp430.rst
+++ b/docs/platforms/timsp430.rst
@@ -92,49 +92,49 @@ TI
       - RAM
 
     * - ``lpmsp430f5529``
-      - `LaunchPad w/ msp430f5529 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
+      - `TI LaunchPad w/ msp430f5529 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
       - MSP430F5529
       - 16 MHz
       - 128 Kb
       - 1 Kb
 
     * - ``lpmsp430f5529_25``
-      - `LaunchPad w/ msp430f5529 (25MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
+      - `TI LaunchPad w/ msp430f5529 (25MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
       - MSP430F5529
       - 25 MHz
       - 128 Kb
       - 1 Kb
 
     * - ``lpmsp430fr5739``
-      - `FraunchPad w/ msp430fr5739 <http://www.ti.com/tool/msp-exp430fr5739>`_
+      - `TI FraunchPad w/ msp430fr5739 <http://www.ti.com/tool/msp-exp430fr5739>`_
       - MSP430FR5739
       - 16 MHz
       - 16 Kb
       - 1 Kb
 
     * - ``lpmsp430fr5969``
-      - `LaunchPad w/ msp430fr5969 <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430fr5969.html>`_
+      - `TI LaunchPad w/ msp430fr5969 <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430fr5969.html>`_
       - MSP430FR5969
       - 8 MHz
       - 64 Kb
       - 1 Kb
 
     * - ``lpmsp430g2231``
-      - `LaunchPad w/ msp430g2231 (1 MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - `TI LaunchPad w/ msp430g2231 (1 MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
       - MSP430G2231
       - 1 MHz
       - 2 Kb
       - 0.125 Kb
 
     * - ``lpmsp430g2452``
-      - `LaunchPad w/ msp430g2452 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - `TI LaunchPad w/ msp430g2452 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
       - MSP430G2452
       - 16 MHz
       - 8 Kb
       - 0.25 Kb
 
     * - ``lpmsp430g2553``
-      - `LaunchPad w/ msp430g2553 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - `TI LaunchPad w/ msp430g2553 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
       - MSP430G2553
       - 16 MHz
       - 16 Kb
diff --git a/docs/platforms/titiva.rst b/docs/platforms/titiva.rst
index 2b02465f..0f98f8d7 100644
--- a/docs/platforms/titiva.rst
+++ b/docs/platforms/titiva.rst
@@ -75,21 +75,21 @@ TI
       - RAM
 
     * - ``lplm4f120h5qr``
-      - `LaunchPad (Stellaris) w/ lm4f120 (80MHz) <http://www.ti.com/tool/ek-lm4f120xl>`_
+      - `TI LaunchPad (Stellaris) w/ lm4f120 (80MHz) <http://www.ti.com/tool/ek-lm4f120xl>`_
       - LPLM4F120H5QR
       - 80 MHz
       - 256 Kb
       - 32 Kb
 
     * - ``lptm4c1230c3pm``
-      - `LaunchPad (Tiva C) w/ tm4c123 (80MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
+      - `TI LaunchPad (Tiva C) w/ tm4c123 (80MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
       - LPTM4C1230C3PM
       - 80 MHz
       - 256 Kb
       - 32 Kb
 
     * - ``lptm4c1294ncpdt``
-      - `LaunchPad (Tiva C) w/ tm4c129 (120MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
+      - `TI LaunchPad (Tiva C) w/ tm4c129 (120MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
       - LPTM4C1294NCPDT
       - 120 MHz
       - 1024 Kb