[Push] Adjust html to new standards

Change-Id: I643cde5c11ca125454bccf92254ada907c886b7a
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/org.tizen.web.apireference/html/device_api/mobile/tizen/push.html b/org.tizen.web.apireference/html/device_api/mobile/tizen/push.html
index 5d1c89c..d907a51 100644 (file)
--- a/org.tizen.web.apireference/html/device_api/mobile/tizen/push.html
+++ b/org.tizen.web.apireference/html/device_api/mobile/tizen/push.html
@@ -93,13 +93,9 @@ Push service does not guarantee delivery and order of push messages.          </
 <tr>
 <td><a href="#PushManager">PushManager</a></td>
 <td>
-<div class="deprecated">void <a href="#PushManager::registerService">registerService</a> (<a href="application.html#ApplicationControl">ApplicationControl</a> appControl, <a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
 <div>void <a href="#PushManager::register">register</a> (<a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
-<div class="deprecated">void <a href="#PushManager::unregisterService">unregisterService</a> (optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
 <div>void <a href="#PushManager::unregister">unregister</a> (optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
-<div class="deprecated">void <a href="#PushManager::connectService">connectService</a> (<a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback)</div>
 <div>void <a href="#PushManager::connect">connect</a> (<a href="#PushRegistrationStateChangeCallback">PushRegistrationStateChangeCallback</a> stateChangeCallback, <a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
-<div class="deprecated">void <a href="#PushManager::disconnectService">disconnectService</a> ()</div>
 <div>void <a href="#PushManager::disconnect">disconnect</a> ()</div>
 <div>
 <a href="#PushRegistrationId">PushRegistrationId</a> <a href="#PushManager::getRegistrationId">getRegistrationId</a> ()</div>
@@ -186,24 +182,14 @@ The <em>tizen.push </em>object allows access to the functionality of the Push AP
  The PushManager interface provides methods to manage push registration and notification.
           </div>
 <pre class="webidl prettyprint">    [NoInterfaceObject] interface PushManager {
-      void registerService(<a href="application.html#ApplicationControl">ApplicationControl</a> appControl, <a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback,
-                  optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void register(<a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void unregisterService(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
-                    optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void unregister(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
                       optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void connectService(<a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void connect(<a href="#PushRegistrationStateChangeCallback">PushRegistrationStateChangeCallback</a> stateChangeCallback,
                    <a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void disconnectService() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void disconnect() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
       <a href="#PushRegistrationId">PushRegistrationId</a> getRegistrationId() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
@@ -302,13 +288,13 @@ var service = new tizen.ApplicationControl("http://tizen.org/appcontrol/operatio
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log('The following error occurred: ' + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the registration success callback */
 function registerSuccessCallback(id)
 {
-   console.log("Registration succeeded with id: " + id);
+&nbsp;&nbsp;console.log("Registration succeeded with id: " + id);
 }
 
 /* Requests registration */
@@ -392,31 +378,31 @@ The <em>connect()</em> method must be called before calling the <em>register()</
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log("The following error occurred: " + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the registration success callback */
 function registerSuccessCallback(id)
 {
-   console.log("Registration succeeded with id: " + id);
+&nbsp;&nbsp;console.log("Registration succeeded with id: " + id);
 }
 
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 
-   if (state == "UNREGISTERED")
-   {
-      /* Requests application registration */
-      tizen.push.register(registerSuccessCallback, errorCallback);
-   }
+&nbsp;&nbsp;if (state == "UNREGISTERED")
+&nbsp;&nbsp;{
+&nbsp;&nbsp;&nbsp;&nbsp;/* Requests application registration */
+&nbsp;&nbsp;&nbsp;&nbsp;tizen.push.register(registerSuccessCallback, errorCallback);
+&nbsp;&nbsp;}
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Connects to push service */
@@ -499,13 +485,13 @@ UnknownError - If an unknown error occurs.              </li>
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log('The following error occurred: ' + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the unregistration success callback */
 function unregisterSuccessCallback()
 {
-   console.log("Unregistration succeeded.");
+&nbsp;&nbsp;console.log("Unregistration succeeded.");
 }
 
 /* Requests unregistration */
@@ -583,13 +569,13 @@ AbortError - If the operation cannot be finished properly.              </li>
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log("The following error occurred: " + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the unregistration success callback */
 function unregisterSuccessCallback()
 {
-   console.log("Unregistration succeeded.");
+&nbsp;&nbsp;console.log("Unregistration succeeded.");
 }
 
 /* Requests unregistration */
@@ -661,7 +647,7 @@ the <em>registerService()</em> method must be called before calling the <em>conn
 /* Defines the connect success callback */
 function notificationCallback(noti)
 {
-   console.log("Notification received with alert message: " + noti.alertMessage);
+&nbsp;&nbsp;console.log("Notification received with alert message: " + noti.alertMessage);
 }
 
 /* Defines the data to be used when this process is launched by notification service */
@@ -670,16 +656,16 @@ var service = new tizen.ApplicationControl("http://tizen.org/appcontrol/operatio
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log("The following error occurred: " + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the registration success callback */
 function registerSuccessCallback(id)
 {
-   console.log("Registration succeeded with id: " + id);
+&nbsp;&nbsp;console.log("Registration succeeded with id: " + id);
 
-   /* Requests for push service connection */
-   tizen.push.connectService(notificationCallback);
+&nbsp;&nbsp;/* Requests for push service connection */
+&nbsp;&nbsp;tizen.push.connectService(notificationCallback);
 }
 
 /* Requests registration */
@@ -755,19 +741,19 @@ just after connection is established.
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Defines the error callback */
 function errorCallback(error)
 {
-   console.log("The following error occurred: " + error.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + error.name);
 }
 
 /* Requests for push service connection */
@@ -904,7 +890,7 @@ tizen.push.disconnect();
 var registrationId = tizen.push.getRegistrationId();
 if (registrationId != null)
 {
-   console.log("The registration id: " + registrationId);
+&nbsp;&nbsp;console.log("The registration id: " + registrationId);
 }
 </pre>
 </div>
@@ -913,16 +899,16 @@ if (registrationId != null)
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 
-   var id = tizen.push.getRegisterationId();
-   console.log("The registration ID: " + id);
+&nbsp;&nbsp;var id = tizen.push.getRegisterationId();
+&nbsp;&nbsp;console.log("The registration ID: " + id);
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Requests for push service connection */
@@ -990,7 +976,7 @@ Once a missed push notification is retrieved the server deletes it from its data
 /* Defines the connect success callback */
 function notificationCallback(message)
 {
-   console.log("New push message: " + message.alertMessage + ", date: " + message.date + ", data: " + message.appData);
+&nbsp;&nbsp;console.log("New push message: " + message.alertMessage + ", date: " + message.date + ", data: " + message.appData);
 }
 
 /* Requests for push service connection */
@@ -1003,19 +989,19 @@ tizen.push.getUnreadNotifications();
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 
-   if (state === "REGISTERED")
-   {
-      /* Gets unread push notifications */
-      tizen.push.getUnreadNotifications();
-   }
+&nbsp;&nbsp;if (state === "REGISTERED")
+&nbsp;&nbsp;{
+&nbsp;&nbsp;&nbsp;&nbsp;/* Gets unread push notifications */
+&nbsp;&nbsp;&nbsp;&nbsp;tizen.push.getUnreadNotifications();
+&nbsp;&nbsp;}
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Requests for push service connection */
@@ -1077,12 +1063,12 @@ If the application was not launched by the push service, this method returns <em
 <span class="example"><p>Code example:</p></span><pre name="code" class="examplecode prettyprint">
 try
 {
-   var message = tizen.push.getPushMessage();
-   console.log('Message received from: ' + message.sender);
+&nbsp;&nbsp;var message = tizen.push.getPushMessage();
+&nbsp;&nbsp;console.log("Message received from: " + message.sender);
 }
 catch (err)
 {
-   console.log('Exception - code: ' + err.name + ' message: ' + err.message);
+&nbsp;&nbsp;console.log("Exception - code: " + err.name + " message: " + err.message);
 }
 </pre>
 </div>
@@ -1197,24 +1183,31 @@ This data is the message that the sender wants to send and its length must be le
             </p>
 <div class="example">
 <span class="example"><p>Code example:</p></span><pre name="code" class="examplecode prettyprint">
+/* Defines the state change callback */
+function stateChangeCallback(state)
+{
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
+}
+
 /* Defines the connect success callback */
 function notificationCallback(noti)
 {
-   console.log('notification received on ' + noti.date + ' from: ' + noti.sender);
-   console.log('Details:');
-   console.log(' - data: ' + noti.appData);
-   console.log(' - alert message: ' + noti.alertMessage);
-   console.log(' - message: ' + noti.message);
-   console.log(' - session: ' + noti.sessionInfo);
-   console.log(' - request ID: ' + noti.requestId);
+&nbsp;&nbsp;console.log("notification received on " + noti.date + " from: " + noti.sender);
+&nbsp;&nbsp;console.log("Details:");
+&nbsp;&nbsp;console.log(" - data: " + noti.appData);
+&nbsp;&nbsp;console.log(" - alert message: " + noti.alertMessage);
+&nbsp;&nbsp;console.log(" - message: " + noti.message);
+&nbsp;&nbsp;console.log(" - session: " + noti.sessionInfo);
+&nbsp;&nbsp;console.log(" - request ID: " + noti.requestId);
 }
 
 /* Requests for push service connection */
-tizen.push.connectService(notificationCallback);
+tizen.push.connect(stateChangeCallback, notificationCallback);
 </pre>
 </div>
 <div class="output">
-<span class="title"><p>Output example:</p></span><pre> Notification received on Thu Jan 01 2015 from: xyz.AnotherApp
+<span class="title"><p>Output example:</p></span><pre> The state is changed to: REGISTERED
+ notification received on Thu Jan 01 2015 from: xyz.AnotherApp
  Details:
   - data: {id:asdf}
   - alert message: Hi
@@ -1397,24 +1390,14 @@ To guarantee that the push application runs on a device with the push feature, d
     <a href="tizen.html#Tizen">Tizen</a> implements <a href="#PushManagerObject">PushManagerObject</a>;
 
     [NoInterfaceObject] interface PushManager {
-      void registerService(<a href="application.html#ApplicationControl">ApplicationControl</a> appControl, <a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback,
-                  optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void register(<a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void unregisterService(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
-                    optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void unregister(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
                       optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void connectService(<a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void connect(<a href="#PushRegistrationStateChangeCallback">PushRegistrationStateChangeCallback</a> stateChangeCallback,
                    <a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void disconnectService() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void disconnect() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
       <a href="#PushRegistrationId">PushRegistrationId</a> getRegistrationId() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);

diff --git a/org.tizen.web.apireference/html/device_api/wearable/tizen/push.html b/org.tizen.web.apireference/html/device_api/wearable/tizen/push.html
index 1ba1a1f..5846ea4 100755 (executable)
--- a/org.tizen.web.apireference/html/device_api/wearable/tizen/push.html
+++ b/org.tizen.web.apireference/html/device_api/wearable/tizen/push.html
@@ -93,13 +93,9 @@ Push service does not guarantee delivery and order of push messages.          </
 <tr>
 <td><a href="#PushManager">PushManager</a></td>
 <td>
-<div class="deprecated">void <a href="#PushManager::registerService">registerService</a> (<a href="application.html#ApplicationControl">ApplicationControl</a> appControl, <a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
 <div>void <a href="#PushManager::register">register</a> (<a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
-<div class="deprecated">void <a href="#PushManager::unregisterService">unregisterService</a> (optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
 <div>void <a href="#PushManager::unregister">unregister</a> (optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
-<div class="deprecated">void <a href="#PushManager::connectService">connectService</a> (<a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback)</div>
 <div>void <a href="#PushManager::connect">connect</a> (<a href="#PushRegistrationStateChangeCallback">PushRegistrationStateChangeCallback</a> stateChangeCallback, <a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback)</div>
-<div class="deprecated">void <a href="#PushManager::disconnectService">disconnectService</a> ()</div>
 <div>void <a href="#PushManager::disconnect">disconnect</a> ()</div>
 <div>
 <a href="#PushRegistrationId">PushRegistrationId</a> <a href="#PushManager::getRegistrationId">getRegistrationId</a> ()</div>
@@ -186,24 +182,14 @@ The <em>tizen.push </em>object allows access to the functionality of the Push AP
  The PushManager interface provides methods to manage push registration and notification.
           </div>
 <pre class="webidl prettyprint">    [NoInterfaceObject] interface PushManager {
-      void registerService(<a href="application.html#ApplicationControl">ApplicationControl</a> appControl, <a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback,
-                  optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void register(<a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void unregisterService(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
-                    optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void unregister(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
                       optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void connectService(<a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void connect(<a href="#PushRegistrationStateChangeCallback">PushRegistrationStateChangeCallback</a> stateChangeCallback,
                    <a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void disconnectService() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void disconnect() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
       <a href="#PushRegistrationId">PushRegistrationId</a> getRegistrationId() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
@@ -302,13 +288,13 @@ var service = new tizen.ApplicationControl("http://tizen.org/appcontrol/operatio
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log('The following error occurred: ' + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the registration success callback */
 function registerSuccessCallback(id)
 {
-   console.log("Registration succeeded with id: " + id);
+&nbsp;&nbsp;console.log("Registration succeeded with id: " + id);
 }
 
 /* Requests registration */
@@ -392,31 +378,31 @@ The <em>connect()</em> method must be called before calling the <em>register()</
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log("The following error occurred: " + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the registration success callback */
 function registerSuccessCallback(id)
 {
-   console.log("Registration succeeded with id: " + id);
+&nbsp;&nbsp;console.log("Registration succeeded with id: " + id);
 }
 
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 
-   if (state == "UNREGISTERED")
-   {
-      /* Requests application registration */
-      tizen.push.register(registerSuccessCallback, errorCallback);
-   }
+&nbsp;&nbsp;if (state == "UNREGISTERED")
+&nbsp;&nbsp;{
+&nbsp;&nbsp;&nbsp;&nbsp;/* Requests application registration */
+&nbsp;&nbsp;&nbsp;&nbsp;tizen.push.register(registerSuccessCallback, errorCallback);
+&nbsp;&nbsp;}
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Connects to push service */
@@ -499,13 +485,13 @@ UnknownError - If an unknown error occurs.              </li>
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log('The following error occurred: ' + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the unregistration success callback */
 function unregisterSuccessCallback()
 {
-   console.log("Unregistration succeeded.");
+&nbsp;&nbsp;console.log("Unregistration succeeded.");
 }
 
 /* Requests unregistration */
@@ -554,7 +540,7 @@ AbortError - If the operation cannot be finished properly.              </li>
                 </li>
           <li class="param">
 <span class="name">errorCallback</span><span class="optional"> [optional]</span><span class="optional"> [nullable]</span>:
- The method to be called when the unregistration request fails.
+ The callback to be called when the unregistration request fails.
                 </li>
         </ul>
 </div>
@@ -583,13 +569,13 @@ AbortError - If the operation cannot be finished properly.              </li>
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log("The following error occurred: " + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the unregistration success callback */
 function unregisterSuccessCallback()
 {
-   console.log("Unregistration succeeded.");
+&nbsp;&nbsp;console.log("Unregistration succeeded.");
 }
 
 /* Requests unregistration */
@@ -661,7 +647,7 @@ the <em>registerService()</em> method must be called before calling the <em>conn
 /* Defines the connect success callback */
 function notificationCallback(noti)
 {
-   console.log("Notification received with alert message: " + noti.alertMessage);
+&nbsp;&nbsp;console.log("Notification received with alert message: " + noti.alertMessage);
 }
 
 /* Defines the data to be used when this process is launched by notification service */
@@ -670,16 +656,16 @@ var service = new tizen.ApplicationControl("http://tizen.org/appcontrol/operatio
 /* Defines the error callback */
 function errorCallback(response)
 {
-   console.log("The following error occurred: " + response.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + response.name);
 }
 
 /* Defines the registration success callback */
 function registerSuccessCallback(id)
 {
-   console.log("Registration succeeded with id: " + id);
+&nbsp;&nbsp;console.log("Registration succeeded with id: " + id);
 
-   /* Requests for push service connection */
-   tizen.push.connectService(notificationCallback);
+&nbsp;&nbsp;/* Requests for push service connection */
+&nbsp;&nbsp;tizen.push.connectService(notificationCallback);
 }
 
 /* Requests registration */
@@ -755,19 +741,19 @@ just after connection is established.
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Defines the error callback */
 function errorCallback(error)
 {
-   console.log("The following error occurred: " + error.name);
+&nbsp;&nbsp;console.log("The following error occurred: " + error.name);
 }
 
 /* Requests for push service connection */
@@ -904,7 +890,7 @@ tizen.push.disconnect();
 var registrationId = tizen.push.getRegistrationId();
 if (registrationId != null)
 {
-   console.log("The registration id: " + registrationId);
+&nbsp;&nbsp;console.log("The registration id: " + registrationId);
 }
 </pre>
 </div>
@@ -913,16 +899,16 @@ if (registrationId != null)
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 
-   var id = tizen.push.getRegisterationId();
-   console.log("The registration ID: " + id);
+&nbsp;&nbsp;var id = tizen.push.getRegisterationId();
+&nbsp;&nbsp;console.log("The registration ID: " + id);
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Requests for push service connection */
@@ -990,7 +976,7 @@ Once a missed push notification is retrieved the server deletes it from its data
 /* Defines the connect success callback */
 function notificationCallback(message)
 {
-   console.log("New push message: " + message.alertMessage + ", date: " + message.date + ", data: " + message.appData);
+&nbsp;&nbsp;console.log("New push message: " + message.alertMessage + ", date: " + message.date + ", data: " + message.appData);
 }
 
 /* Requests for push service connection */
@@ -1003,19 +989,19 @@ tizen.push.getUnreadNotifications();
 /* Defines the state change callback */
 function stateChangeCallback(state)
 {
-   console.log("The state is changed to: " + state);
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
 
-   if (state === "REGISTERED")
-   {
-      /* Gets unread push notifications */
-      tizen.push.getUnreadNotifications();
-   }
+&nbsp;&nbsp;if (state === "REGISTERED")
+&nbsp;&nbsp;{
+&nbsp;&nbsp;&nbsp;&nbsp;/* Gets unread push notifications */
+&nbsp;&nbsp;&nbsp;&nbsp;tizen.push.getUnreadNotifications();
+&nbsp;&nbsp;}
 }
 
 /* Defines the notification callback */
 function notificationCallback(notification)
 {
-   console.log("A notification arrives.");
+&nbsp;&nbsp;console.log("A notification arrives.");
 }
 
 /* Requests for push service connection */
@@ -1077,12 +1063,12 @@ If the application was not launched by the push service, this method returns <em
 <span class="example"><p>Code example:</p></span><pre name="code" class="examplecode prettyprint">
 try
 {
-   var message = tizen.push.getPushMessage();
-   console.log('Message received from: ' + message.sender);
+&nbsp;&nbsp;var message = tizen.push.getPushMessage();
+&nbsp;&nbsp;console.log("Message received from: " + message.sender);
 }
 catch (err)
 {
-   console.log('Exception - code: ' + err.name + ' message: ' + err.message);
+&nbsp;&nbsp;console.log("Exception - code: " + err.name + " message: " + err.message);
 }
 </pre>
 </div>
@@ -1197,24 +1183,31 @@ This data is the message that the sender wants to send and its length must be le
             </p>
 <div class="example">
 <span class="example"><p>Code example:</p></span><pre name="code" class="examplecode prettyprint">
+/* Defines the state change callback */
+function stateChangeCallback(state)
+{
+&nbsp;&nbsp;console.log("The state is changed to: " + state);
+}
+
 /* Defines the connect success callback */
 function notificationCallback(noti)
 {
-   console.log('notification received on ' + noti.date + ' from: ' + noti.sender);
-   console.log('Details:');
-   console.log(' - data: ' + noti.appData);
-   console.log(' - alert message: ' + noti.alertMessage);
-   console.log(' - message: ' + noti.message);
-   console.log(' - session: ' + noti.sessionInfo);
-   console.log(' - request ID: ' + noti.requestId);
+&nbsp;&nbsp;console.log("notification received on " + noti.date + " from: " + noti.sender);
+&nbsp;&nbsp;console.log("Details:");
+&nbsp;&nbsp;console.log(" - data: " + noti.appData);
+&nbsp;&nbsp;console.log(" - alert message: " + noti.alertMessage);
+&nbsp;&nbsp;console.log(" - message: " + noti.message);
+&nbsp;&nbsp;console.log(" - session: " + noti.sessionInfo);
+&nbsp;&nbsp;console.log(" - request ID: " + noti.requestId);
 }
 
 /* Requests for push service connection */
-tizen.push.connectService(notificationCallback);
+tizen.push.connect(stateChangeCallback, notificationCallback);
 </pre>
 </div>
 <div class="output">
-<span class="title"><p>Output example:</p></span><pre> Notification received on Thu Jan 01 2015 from: xyz.AnotherApp
+<span class="title"><p>Output example:</p></span><pre> The state is changed to: REGISTERED
+ notification received on Thu Jan 01 2015 from: xyz.AnotherApp
  Details:
   - data: {id:asdf}
   - alert message: Hi
@@ -1397,24 +1390,14 @@ To guarantee that the push application runs on a device with the push feature, d
     <a href="tizen.html#Tizen">Tizen</a> implements <a href="#PushManagerObject">PushManagerObject</a>;
 
     [NoInterfaceObject] interface PushManager {
-      void registerService(<a href="application.html#ApplicationControl">ApplicationControl</a> appControl, <a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback,
-                  optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void register(<a href="#PushRegisterSuccessCallback">PushRegisterSuccessCallback</a> successCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void unregisterService(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
-                    optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void unregister(optional <a href="tizen.html#SuccessCallback">SuccessCallback</a>? successCallback,
                       optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void connectService(<a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void connect(<a href="#PushRegistrationStateChangeCallback">PushRegistrationStateChangeCallback</a> stateChangeCallback,
                    <a href="#PushNotificationCallback">PushNotificationCallback</a> notificationCallback, optional <a href="tizen.html#ErrorCallback">ErrorCallback</a>? errorCallback) raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
-      void disconnectService() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
-
       void disconnect() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 
       <a href="#PushRegistrationId">PushRegistrationId</a> getRegistrationId() raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);