[dali_2.3.19] Merge branch 'devel/master'

[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
index 8e8a9b2..ce364eb 100755 (executable)
--- a/doc/dali-toolkit-doc.h
+++ b/doc/dali-toolkit-doc.h
@@ -140,6 +140,10 @@
  *    <td>@ref dali_toolkit_visuals</td>
  *    <td>Visuals can control rendering the contents as using Property.</td>
  * </tr>
+ * <tr>
+ *    <td>@ref dali_toolkit_image_loader</td>
+ *    <td>The ImageLoader is used to load pixel data from a URL.</td>
+ * </tr>
  * </table>
  *
  * \ifnot show_tizen_feature
@@ -154,7 +158,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/tizen-studio/native-tools/configuring-your-app/manifest-text-editor#feature"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://docs.tizen.org/application/tizen-studio/native-tools/manifest-text-editor#feature-element"><b>Feature Element</b>.</a>
  *
  * \endif
  *
@@ -170,6 +174,9 @@
  *     @defgroup dali_toolkit_controls_buttons Buttons
  *     @brief Button is a small object on UI that you can press.
 
+ *     @defgroup dali_toolkit_controls_canvas_view CanvasView
+ *     @brief CanvasView is a class for displaying an vector primitives.
+ *
  *     @defgroup dali_toolkit_controls_gaussian_blur_view Gaussian Blur View
  *     @brief GaussianBlurView provides a render process that blurs an image.
 
@@ -219,6 +226,9 @@
  *   @defgroup dali_toolkit_visuals Visuals
  *   @brief Visuals can control rendering the contents as using Property.
 
+ *   @defgroup dali_toolkit_image_loader Image Loader
+ *   @brief The ImageLoader is used to load pixel data from a URL.
+
  * @}
  */