From d2ccbf7b7adb8b66fa45a077dddbe97af73abaf4 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 14 Feb 2015 19:25:02 +0200
Subject: [PATCH] Remove "framework" alias for all "framework-*" packages
 Development platform can contain more then 1 framework

---
 docs/platforms/atmelavr.rst          | 2 +-
 docs/platforms/creating_platform.rst | 7 +++----
 docs/platforms/timsp430.rst          | 2 +-
 docs/platforms/titiva.rst            | 8 ++++----
 docs/userguide/cmd_install.rst       | 1 -
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index c94f5057..09156421 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -30,7 +30,7 @@ Packages
       - uploader
       - `AVRDUDE <http://www.nongnu.org/avrdude/>`_
     * - ``framework-arduinoavr``
-      - framework
+      -
       - See below in :ref:`atmelavr_frameworks`
 
 
diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index f894bf14..b4a65b96 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -66,13 +66,13 @@ Packages
       - uploader
       - `Flash Programmer <http://www.ti.com/tool/lmflashprogrammer>`_
     * - ``framework-arduinoavr``
-      - framework
+      -
       - `Arduino Wiring-based Framework (AVR Core, 1.6 branch) <http://arduino.cc/en/Reference/HomePage>`_
     * - ``framework-energiamsp430``
-      - framework
+      -
       - `Energia Wiring-based Framework (MSP430 Core) <http://energia.nu/reference/>`_
     * - ``framework-energiativa``
-      - framework
+      -
       - `Energia Wiring-based Framework (LM4F Core)  <http://energia.nu/reference/>`_
 
 .. _platform_creating_manifest_file:
@@ -132,7 +132,6 @@ Example of the **test** platform (``test.py``):
             },
 
             "framework-baz": {
-                "alias": "framework",
                 "default": True
             }
         }
diff --git a/docs/platforms/timsp430.rst b/docs/platforms/timsp430.rst
index 5d7e625e..f10d1578 100644
--- a/docs/platforms/timsp430.rst
+++ b/docs/platforms/timsp430.rst
@@ -27,7 +27,7 @@ Packages
       - uploader
       - `MSPDebug <http://mspdebug.sourceforge.net>`_
     * - ``framework-energiamsp430``
-      - framework
+      -
       - See below in :ref:`timsp430_frameworks`
 
 
diff --git a/docs/platforms/titiva.rst b/docs/platforms/titiva.rst
index 7380850f..b9d822b9 100644
--- a/docs/platforms/titiva.rst
+++ b/docs/platforms/titiva.rst
@@ -28,10 +28,10 @@ Packages
       - uploader
       - `Flash Programmer <http://www.ti.com/tool/lmflashprogrammer>`_
     * - ``framework-energiativa``
-      - framework
+      -
       - See below in :ref:`titiva_frameworks`
     * - ``framework-opencm3``
-      - framework
+      -
       - See below in :ref:`titiva_frameworks`
 
 .. note::
@@ -52,10 +52,10 @@ Frameworks
       - Reference
     * - ``energia``
       - Energia Wiring-based Framework (LM4F Core)
-      - `Documentation <http://energia.nu/reference/>`_
+      - `Documentation <http://energia.nu/reference/>`__
     * - ``opencm3``
       - libOpenCM3 Framework
-      - `Documentation <http://www.libopencm3.org>`_
+      - `Documentation <http://www.libopencm3.org>`__
 
 
 Boards
diff --git a/docs/userguide/cmd_install.rst b/docs/userguide/cmd_install.rst
index fb7bd53b..33557ca6 100644
--- a/docs/userguide/cmd_install.rst
+++ b/docs/userguide/cmd_install.rst
@@ -23,7 +23,6 @@ There are several predefined aliases for packages, such as:
 
 * ``toolchain``
 * ``uploader``
-* ``framework``
 
 Options
 -------