From 507411c77717e809995361ba43b1629ca567599c Mon Sep 17 00:00:00 2001
From: Editor Lionbridge <TizenEditor.SEL@lionbridge.com>
Date: Fri, 28 Apr 2017 11:18:57 +0300
Subject: [PATCH] [Push] Remove guide for request by email

This is a manual cherry-pick from changes #120536 and #126460 in the
tizen_3.0 branch.

Change-Id: I263cfebe3a8e903ae4f8bfb2c22b6f84a3c79467
---
 org.tizen.guides/html/native/messaging/push_n.htm |  3 +-
 org.tizen.guides/html/web/messaging/push_w.htm    | 96 +++++------------------
 2 files changed, 21 insertions(+), 78 deletions(-)

diff --git a/org.tizen.guides/html/native/messaging/push_n.htm b/org.tizen.guides/html/native/messaging/push_n.htm
index 0579b9a..f2042bf 100644
--- a/org.tizen.guides/html/native/messaging/push_n.htm
+++ b/org.tizen.guides/html/native/messaging/push_n.htm
@@ -58,7 +58,6 @@
 
   <p>Once your application is successfully registered in the push server through the <a href="#service">push service</a> (daemon) on the device, your application server can send push messages to the application in that particular device.</p>
   <p>When a push message arrives when the application is running, it is automatically delivered to the application. If not, the push service makes a sound or vibrates and adds a ticker or a badge notification to notify the user. By touching this notification, the user can check the message. The application server may send a message with a <code>LAUNCH</code> option. In this case, the push service forcibly launches the application and hands over the message to the application as an <a href="../app_management/app_controls_n.htm">application control</a>.</p>
-<p>To use the push messaging service, the application needs the permission to access the Tizen push server. Request the permission from the Tizen push service team by <a href="mailto:push.tizen@samsung.com">email</a>, including the <a href="#permission">necessary information</a>. When the team approves the request, you receive a push app ID corresponding to your package ID.</p>
 <p>The main features of the Push API include:</p>
 <ul>
 <li>Connecting to the push service
@@ -114,7 +113,7 @@
 <li>Package ID
 <p>When you create a project in the Tizen Studio, you are given the package ID (randomly generated by the Tizen Studio or entered by yourself). The Tizen push server identifies your applications using the package ID.</p></li>
 <li id="permission" name="permission">Permission to Tizen push servers
-<p>To use the push messaging service, the application needs the permission to access the Tizen push server. Request the permission from the Tizen push service team:</p>
+<p>To use the push messaging service, the application needs the permission to access the Tizen push server. Request the permission from the Tizen push service team using one of the following online request forms:</p>
 <ul>
 <li>
 <p><a href="https://developer.tizen.org/webform/request-push-permission-new-application" target="_blank">Request the permission for a new application</a></p>
diff --git a/org.tizen.guides/html/web/messaging/push_w.htm b/org.tizen.guides/html/web/messaging/push_w.htm
index 34bc17b..bf4a63f 100644
--- a/org.tizen.guides/html/web/messaging/push_w.htm
+++ b/org.tizen.guides/html/web/messaging/push_w.htm
@@ -54,7 +54,6 @@
 
   <p>When a push message arrives when the application is running, it is automatically delivered to the application. If not, the push service makes a sound or vibrates, and adds a ticker or a badge notification to notify the user. By touching the notification, the user can check the message. The application server can send a message with a <code>LAUNCH</code> option. In this case, the push service forcibly launches the application and hands over the message to the application.</p>
 
-<p>To use the push messaging service, the application needs the permission to access the Tizen push server. Request the permission from the Tizen push service team by <a href="mailto:push.tizen@samsung.com">email</a>, including the <a href="#permission">necessary information</a>. When the team approves the request, you receive a push app ID corresponding to your package ID.</p>
 
   <p>The main features of the Push API include:</p>
   <ul>
@@ -103,82 +102,27 @@
 &lt;tizen:privilege name="http://tizen.org/privilege/push"/&gt;
 </pre>
     </li>
-<li>Make sure the following requirements are fulfilled:
-<ul>
-    <li>Proxy and ports
-      <p>To connect to the Tizen push server and receive notifications from it, the target device must be able to contact any IP address with the port 5223. If you are in an enterprise network, ensure that the proxy setting in your local network allows outgoing traffic destined for this port number.</p>
-    </li>
-
-    <li id="permission">Permission to Tizen push servers
-    <p>To use the push messaging service, the application needs the permission to access the Tizen push server. Request the permission from the Tizen push service team by <a href="mailto:push.tizen@samsung.com">email</a>, including the following information. When the team approves the request, you receive a push app ID corresponding to your package ID.</p>
-    <p>By sending the application, you agree to the <a href="https://www.tizen.org/about/terms-service" target="_blank">Terms of Service</a> and <a href="https://www.tizen.org/about/privacy-policy" target="_blank">Privacy Policy</a>.</p>
-
-<p align="center" class="Table"><strong>Table: Request form details</strong></p>
-<table id="request_form">
-    <tbody>
-        <tr>
-         <th colspan="2">Developer information</th>
-        </tr>
-         <tr>
-         <td>Email address</td>
-         <td>Your email address to receive the approval response.</td>
-        </tr>
-         <tr>
-         <td>Last name</td>
-         <td>Your last name.</td>
-        </tr>
-         <tr>
-         <td>First name</td>
-         <td>Your first name.</td>
-        </tr>
-         <tr>
-         <td>Country</td>
-         <td>Your country of residence.</td>
-        </tr>
-        <tr>
-         <th colspan="2">Application information</th>
-        </tr>
-         <tr>
-         <td>Package ID</td>
-         <td>The ID of the application package that uses the push messaging service. The package ID can be obtained from the application manifest file in the Tizen Studio.</td>
-        </tr>
-         <tr>
-         <td>Application name</td>
-         <td>Name of the application that uses the push service.</td>
-        </tr>
-        <tr>
-         <td>Application type</td>
-         <td>Native application or Web application.</td>
-        </tr>
-         <tr>
-         <td>Testing purpose</td>
-         <td> Yes or no. If you request the service for testing purposes only, the duration of the push service is limited to 3 weeks.</td>
-        </tr>
-         <tr>
-         <td> Purpose of the push notification usage</td>
-         <td> Description of how you plan to use the push service, including the situations in which you want to use it.</td>
-        </tr>
-         <tr>
-         <td> Application launch date</td>
-         <td> Application launch date in the YYYY/MM/DD format. For example: 2014/08/01.</td>
-        </tr>
-         <tr>
-         <td>Service area/country</td>
-         <td>Service area, such as Asia, Africa, America, Europe, or the country where the application is used.</td>
-        </tr>
-         <tr>
-         <td>Daily push requests</td>
-         <td>Estimated number of daily notifications.</td>
-        </tr>
-         <tr>
-         <td> Transactions per second</td>
-         <td> Estimated peak number of transactions per second (the recommendation is below 100).</td>
-        </tr>
-    </tbody>
-    </table>
-    </li></ul>
+<li>
+<p>Make sure the following requirements are fulfilled:</p>
+		<ol>
+		<li>Internet access
+		<p>To connect to the Tizen push server and receive notifications from it, the target device or emulator must be able to contact any IP address with the port 5223. If you are in an enterprise network, ensure that the proxy setting in your local network allows outgoing traffic destined for this port number.</p></li>
+		<li>Package ID
+		<p>When you create a project in the Tizen Studio, you are given the package ID (randomly generated by the Tizen Studio or entered by yourself). The Tizen push server identifies your applications using the package ID.</p></li>
+		<li id="permission" name="permission">Permission to Tizen push servers
+		<p>To use the push messaging service, the application needs the permission to access the Tizen push server. Request the permission from the Tizen push service team using one of the following online request forms:</p>
+		<ul>
+		<li>
+		<p><a href="https://developer.tizen.org/webform/request-push-permission-new-application" target="_blank">Request the permission for a new application</a></p>
+		</li>
+		<li>
+		<p><a href="https://developer.tizen.org/webform/request-extend-expiration-date-or-change-quota" target="_blank">Extend the expiration date or change the quota</a> for an application that already has the permission to use the push messaging service</p>
+		</li>
+		</ul>
+		<p>When the team approves the request, you receive a push app ID corresponding to your package ID.</p>
+		</li>
+		</ol>
 	</li>
-
 </ol>
 
   <h2 id="Registering" name="Registering">Registering to the Push Service</h2>
-- 
2.7.4