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

[platform/core/uifw/dali-toolkit.git] / docs / content / programming-guide / dali-application.h

diff --git a/docs/content/programming-guide/dali-application.h b/docs/content/programming-guide/dali-application.h
index 3921284..acd37f8 100644 (file)
--- a/docs/content/programming-guide/dali-application.h
+++ b/docs/content/programming-guide/dali-application.h
@@ -2,7 +2,7 @@
  *
 <h2 class="pg">Creating an Application</h2>
 
-The Adaptor framework provides provides a Dali::Application class which initialises and sets up Dali appropriately so that the application writer does not have to.
+The Adaptor framework provides provides a Dali::Application class which initialises and sets up DALi appropriately so that the application writer does not have to.
 This provides many platform related services.
 
 Several signals can be connected to so that the application writer is informed when certain platform related activities occur.
@@ -13,7 +13,7 @@ The following example shows how to create a Dali::Application instance and conne
 @code
 void CreateProgram(Application& app)
 {
-  // Create Dali components...
+  // Create DALi components...
   Dali::Actor actor = Actor::New();
   ...
 }
@@ -39,8 +39,8 @@ void CreateProgram(Application& app)
 
 int main (int argc, char **argv)
 {
-  Dali::Application app = Application::New(argc, argv);
-  app.SignalInit().Connect(&CreateProgram);
+  Dali::Application app = Application::New(&argc, &argv);
+  app.InitSignal().Connect(&CreateProgram);
   app.MainLoop();
 }
 @endcode
@@ -60,7 +60,7 @@ bool Tick()
 
 // Elsewhere
 Dali::Timer timer = Dali::Timer::New(2000); // 2 second timeout
-timer.SignalTick().Connect(&Tick);
+timer.TickSignal().Connect(&Tick);
 ...
 @endcode