Removing native layouting

[platform/core/uifw/dali-toolkit.git] / doc / dali-toolkit-doc.h

diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h
old mode 100644 (file)
new mode 100755 (executable)
index a58cbda..813d2ac
--- a/doc/dali-toolkit-doc.h
+++ b/doc/dali-toolkit-doc.h
@@ -86,7 +86,11 @@
  * </tr>
  * <tr>
  *    <td style="padding-left:1em">@ref dali_toolkit_controls_image_view</td>
- *    <td>ImageView is a control displying an image.</td>
+ *    <td>ImageView is a control displaying an image.</td>
+ * </tr>
+ * <tr>
+ *    <td style="padding-left:1em">@ref dali_toolkit_controls_model3d_view</td>
+ *    <td>Model3dView is a control for displaying 3d geometry.</td>
  * </tr>
  * <tr>
  *    <td style="padding-left:1em">@ref dali_toolkit_controls_scroll_bar</td>
@@ -125,6 +129,10 @@
  *    <td>Slider is a control to enable sliding an indicator between two values.</td>
  * </tr>
  * <tr>
+ *    <td style="padding-left:1em">@ref dali_toolkit_controls_progress_bar</td>
+ *    <td>ProgressBar is a control to give the user an indication of the progress of an operation.</td>
+ * </tr>
+ * <tr>
  *    <td>@ref dali_toolkit_managers</td>
  *    <td>Singleton classes for managing application-wide functionalities.</td>
  * </tr>
@@ -146,7 +154,7 @@
  *
  * 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>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tizen-studio/native-tools/configuring-your-app/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  * \endif
  *
@@ -166,7 +174,10 @@
  *     @brief GaussianBlurView provides a render process that blurs an image.
 
  *     @defgroup dali_toolkit_controls_image_view Image View
- *     @brief ImageView is a control displying an image.
+ *     @brief ImageView is a control displaying an image.
+
+ *     @defgroup dali_toolkit_controls_model3d_view Model3dView
+ *     @brief Model3dView is a control for displaying 3d geometry.
 
  *     @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
  *     @brief ScrollBar is a component that can be linked to the scrollable objects.
@@ -197,6 +208,9 @@
  *     @defgroup dali_toolkit_controls_slider Slider
  *     @brief Slider is a control to enable sliding an indicator between two values.
 
+ *     @defgroup dali_toolkit_controls_progress_bar Progress Bar
+ *     @brief ProgressBar is a control to give the user an indication of the progress of an operation.
+
  *   @}
 
  *   @defgroup dali_toolkit_managers Managers