Merge "Text improvement 1. Text - Layout text & icons. * Feature added to layout...

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

diff --git a/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md b/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md
index ba1fc6d..f870d4b 100644 (file)
--- a/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md
@@ -1,14 +1,14 @@
-/**
- *
+<!--
+/**-->
 
 Multi-Touch Events
 ==================
 
 Touch events are received via signals.
 
-For C++ API see Dali::Actor::TouchedSignal() and Dali::Actor::HoveredSignal() for more details.
+For C++ API see Dali::Actor::TouchSignal() and Dali::Actor::HoveredSignal() for more details.
 
-For JavaScript use actor.connect( "touched", myCallback ) and actor.connect("hovered", myCallback );
+For JavaScript use actor.connect( "touch", myCallback ) and actor.connect("hovered", myCallback );
 
 ### Hit Testing Rules Summary:
 
@@ -34,7 +34,7 @@ For JavaScript use actor.connect( "touched", myCallback ) and actor.connect("hov
 
  - Actors
    - The final part of hit testing is performed by walking through the actor tree within a layer.
-   - The following pseudocode shows the algorithm used:
+   - The following pseudo-code shows the algorithm used:
 
 
 ~~~
@@ -107,7 +107,7 @@ Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest.
      actor (and its parents).  There will be NO touch signal delivery for the hit actors of the
      other touch points.
    - The local coordinates are from the top-left (0.0f, 0.0f, 0.5f) of the hit actor.
-   - The following pseudocode shows the delivery mechanism:
+   - The following pseudo-code shows the delivery mechanism:
 
 ~~~
   EMIT-TOUCH-SIGNAL( ACTOR )
@@ -115,7 +115,7 @@ Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest.
     IF ( TOUCH-SIGNAL-NOT-EMPTY )
     {
       // Only do the emission if touch signal of actor has connections.
-        CONSUMED = TOUCHED-SIGNAL( TOUCH-EVENT )
+        CONSUMED = TOUCH-SIGNAL( TOUCH-DATA )
     }
 
     IF ( NOT-CONSUMED )
@@ -144,5 +144,5 @@ Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest.
      touch signals are also emitted from the touch-down actor with an "Interrupted" state.
 
 @class MultiTouch
-*
+
 */