Merge "If the height is small even if scrolling is enabled, it should be elide."...

[platform/core/uifw/dali-toolkit.git] / docs / content / shared-javascript-and-cpp-documentation / dali-introduction.md

diff --git a/docs/content/shared-javascript-and-cpp-documentation/dali-introduction.md b/docs/content/shared-javascript-and-cpp-documentation/dali-introduction.md
index 50262f9..7cdb3aa 100644 (file)
--- a/docs/content/shared-javascript-and-cpp-documentation/dali-introduction.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/dali-introduction.md
@@ -1,5 +1,6 @@
-/**
- *
+<!--
+/**-->
+
 # DALi 3D ( Dynamic Animation Library ) {#dali-introduction}
 
 DALi is a quick and easy way of allowing developers to create Rich UI Applications like:
@@ -22,7 +23,7 @@ the OpenGL API from developers and provides a clean cross-platform C++ & JavaScr
  + Provides Layers to aid in 2D UI layout
  + Easy to use Animation framework
  + Automatic background loading of resources ( images / text / meshes )
- + Runs all animations in a seperate thread. This helps maintain 60 FPS even if JavaScript is performing a long operation ( e.g. Garbage Collection ).
+ + Runs all animations in a separate thread. This helps maintain 60 FPS even if JavaScript is performing a long operation ( e.g. Garbage Collection ).
  + Provides keyboard / touch / mouse handling
 
 ![ ](screen-shot.png)