projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Merge branch 'devel/master(1.2.18)' into tizen" into tizen
[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
41cf322
..
0127bec
100644
(file)
--- a/
doc/dali-toolkit-doc.h
+++ b/
doc/dali-toolkit-doc.h
@@
-59,7
+59,7
@@
*
* @brief DALi Toolkit provides UI components and various effects on top of the DALi Core.
*
*
* @brief DALi Toolkit provides UI components and various effects on top of the DALi Core.
*
- * @section dali_
core
_overview Overview
+ * @section dali_
toolkit
_overview Overview
*
* DALi Toolkit consists of the following groups of API:
*
*
* DALi Toolkit consists of the following groups of API:
*
@@
-90,11
+90,11
@@
* </tr>
* <tr>
* <td style="padding-left:1em">@ref dali_toolkit_controls_scroll_bar</td>
* </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>
* </tr>
* <tr>
* <td style="padding-left:1em">@ref dali_toolkit_controls_scrollable</td>
- * <td>Scrollable contain
er
controls.</td>
+ * <td>Scrollable contain
s scrolled
controls.</td>
* </tr>
* <tr>
* <td style="padding-left:2em">@ref dali_toolkit_controls_item_view</td>
* </tr>
* <tr>
* <td style="padding-left:2em">@ref dali_toolkit_controls_item_view</td>
@@
-165,10
+165,10
@@
* @brief ImageView is a control displying an image.
* @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
* @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
* @defgroup dali_toolkit_controls_scrollable Scrollable
- * @brief Scrollable contain
er
controls.
+ * @brief Scrollable contain
s scrolled
controls.
* @{
* @defgroup dali_toolkit_controls_item_view Item View
* @{
* @defgroup dali_toolkit_controls_item_view Item View