X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=doc%2Fdali-toolkit-doc.h;h=b2bd7466fffd4cfa88e12df2462374703e70d152;hp=d390f9af668d1654026a30fe40dcee7df1b50bfd;hb=938ea2d2a1a42930cf12c743d839aded892949ea;hpb=74852e7db8de693383138bfb233761006baa9ba7

diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h
index d390f9a..b2bd746 100644
--- a/doc/dali-toolkit-doc.h
+++ b/doc/dali-toolkit-doc.h
@@ -90,11 +90,11 @@
  * </tr>
  * <tr>
  *    <td style="padding-left:1em">@ref dali_toolkit_controls_scroll_bar</td>
- *    <td>ScrollBar control.</td>
+ *    <td>ScrollBar is a component that can be linked to the scrollable objects.</td>
  * </tr>
  * <tr>
  *    <td style="padding-left:1em">@ref dali_toolkit_controls_scrollable</td>
- *    <td>Scrollable container controls.</td>
+ *    <td>Scrollable contains scrolled controls.</td>
  * </tr>
  * <tr>
  *    <td style="padding-left:2em">@ref dali_toolkit_controls_item_view</td>
@@ -113,11 +113,39 @@
  *    <td>Controls for displaying text or text input.</td>
  * </tr>
  * <tr>
+ *    <td style="padding-left:1em">@ref dali_toolkit_controls_flex_container</td>
+ *    <td>FlexContainer is a container for Flexbox layout.</td>
+ * </tr>
+ * <tr>
+ *    <td style="padding-left:1em">@ref dali_toolkit_controls_video_view</td>
+ *    <td>VideoView is a control for video playback and display.</td>
+ * </tr>
+ * <tr>
+ *    <td style="padding-left:1em">@ref dali_toolkit_controls_slider</td>
+ *    <td>Slider is a control to enable sliding an indicator between two values.</td>
+ * </tr>
+ * <tr>
  *    <td>@ref dali_toolkit_managers</td>
  *    <td>Singleton classes for managing application-wide functionalities.</td>
  * </tr>
  * </table>
  *
+ * \ifnot show_tizen_feature
+ *
+ * @section dali_toolkit_feature Related Features
+ * This API is related with the following features:\n
+ *    - http://tizen.org/feature/opengles.version.2_0\n
+ *
+ * It is recommended to design feature related codes in your application for reliability.\n
+ *
+ * You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.\n
+ *
+ * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
+ *
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
+ *
+ * \endif
+ *
  * @ingroup dali
  * @{
  *   @defgroup dali_toolkit_controls Controls
@@ -137,10 +165,10 @@
  *     @brief ImageView is a control displying an image.
 
  *     @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
- *     @brief ScrollBar control.
+ *     @brief ScrollBar is a component that can be linked to the scrollable objects.
 
  *     @defgroup dali_toolkit_controls_scrollable Scrollable
- *     @brief Scrollable container controls.
+ *     @brief Scrollable contains scrolled controls.
 
  *     @{
  *       @defgroup dali_toolkit_controls_item_view Item View
@@ -159,6 +187,12 @@
  *     @defgroup dali_toolkit_controls_flex_container Flex Container
  *     @brief FlexContainer is a container for Flexbox layout.
 
+ *     @defgroup dali_toolkit_controls_video_view Video View
+ *     @brief VideoView is a control for video playback and display.
+
+ *     @defgroup dali_toolkit_controls_slider Slider
+ *     @brief Slider is a control to enable sliding an indicator between two values.
+
  *   @}
 
  *   @defgroup dali_toolkit_managers Managers