Merge lp:~nik90/component-store/fix-bottomedgetabs-docs into lp:~mrqtros/component-store/bottom-edge-tabs

[Nekhelesh Ramananthan]

Fixes the documentation and adds missing ubuntu_component_store.json.

=== added file 'curated-store/ComponentStore/BottomEdgeTabs/ubuntu_component_store.json'
--- curated-store/ComponentStore/BottomEdgeTabs/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/BottomEdgeTabs/ubuntu_component_store.json	2015-04-13 22:18:13 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "BottomEdgeTabs",
+    "description": "This component adds a bottom edge page to Tabs.",
+    "version": "1.0",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/bottomedgetabs.html"
+}

=== modified file 'docs/_components/bottomedgetabs.rst'
--- docs/_components/bottomedgetabs.rst	2015-04-13 21:30:01 +0000
+++ docs/_components/bottomedgetabs.rst	2015-04-13 22:18:13 +0000
@@ -1,18 +1,18 @@
 Bottom Edge Tabs
-=====================
+================
 
-+----------+---------------------------------+
-| Author   | Roman Shchekin	                 |
-+----------+-------------+-------------------+
-| License  | GNU General Public License v3.0 |
-+----------+---------------------------------+
-| Contact  | [e-mail]               |
-+----------+---------------------------------+
-| Framework| ubuntu-sdk-14.10                |
-+----------+---------------------------------+
++----------+----------------------------------------+
+| Author   | Roman Shchekin                         |
++----------+-------------+--------------------------+
+| License  | GNU General Public License v3.0        |
++----------+----------------------------------------+
+| Contact  | [e-mail]                      |
++----------+----------------------------------------+
+| Framework| ubuntu-sdk-14.10                       |
++----------+----------------------------------------+
 
 BottomEdgeTabs is very similar to PageWithBottomEdge but uses Tabs as root component instead of Page. Check it's documentation.
-  
+ 
 Example:
 
 .. code-block:: qml
@@ -70,15 +70,15 @@
 		}
 	}
 
-.. image:: ../_images/pagewithbottomedge.png
+.. image:: ../_images/bottomedgetabs.png
    :align: center
 
 Properties
 ----------
 
 - :ref:`bottomEdgeTitle`: string
+- :ref:`bottomEdgePage`: Page
 - :ref:`bottomEdgeEnabled`: boolean
-- :ref:`bottomEdgePage`: Page
 
 Signals
 -------
@@ -96,10 +96,10 @@
 
 The text to be displayed in the bottom edge action.
 
-.. _bottomEdgePageComponent:
+.. _bottomEdgePage:
 
 bottomEdgePage
-^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^
 
 The page to be shown when swiping the bottom edge up.
 

=== added file 'docs/_images/bottomedgetabs.png'
Binary files docs/_images/bottomedgetabs.png	1970-01-01 00:00:00 +0000 and docs/_images/bottomedgetabs.png	2015-04-13 22:18:13 +0000 differ
=== modified file 'docs/index.rst'
--- docs/index.rst	2015-04-13 17:45:49 +0000
+++ docs/index.rst	2015-04-13 22:18:13 +0000
@@ -50,6 +50,7 @@
 .. toctree::
    :maxdepth: 1
    
+   _components/bottomedgetabs
    _components/circleimage
    _components/emptystate
    _components/fastscroll

=== modified file 'docs/release.rst'
--- docs/release.rst	2015-03-23 14:32:46 +0000
+++ docs/release.rst	2015-04-13 22:18:13 +0000
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+**13th April 2015**
+
+* Added Bottom Edge Tabs component
+
 **23rd March 2015**
 
 * Added haptic feedback to radial action buttons