summaryrefslogtreecommitdiffstats
path: root/docs/html/google/gcm
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2013-01-11 22:31:43 -0800
committerScott Kennedy <skennedy@google.com>2013-01-11 23:44:11 -0800
commit7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8 (patch)
treea78e3e87fc9b51fd0df8baa26d4415f4124492ba /docs/html/google/gcm
parent0bb4dade30d3413cc7951c5d2c0ee761a93ae468 (diff)
downloadframeworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.zip
frameworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.tar.gz
frameworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.tar.bz2
docs: Fix a bunch of issues
External tracker 42609 External tracker 42607 External tracker 42604 External tracker 42600 External tracker 42574 External tracker 42450 External tracker 41050 External tracker 40995 External tracker 40970 External tracker 40935 External tracker 40507 External tracker 40481 External tracker 40435 External tracker 40406 External tracker 40297 External tracker 40281 External tracker 39978 External tracker 39929 External tracker 39803 External tracker 39715 External tracker 39441 Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
Diffstat (limited to 'docs/html/google/gcm')
-rw-r--r--docs/html/google/gcm/gcm.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/google/gcm/gcm.jd b/docs/html/google/gcm/gcm.jd
index 1762e12..f218bc2 100644
--- a/docs/html/google/gcm/gcm.jd
+++ b/docs/html/google/gcm/gcm.jd
@@ -208,9 +208,9 @@ ID in a database. </li>
<p>The registration ID lasts until the Android application explicitly unregisters
itself, or until Google refreshes the registration ID for your Android application.</p>
-<p class="note"><strong>Note:</strong> When users uninstall an application, it is not automatically unregistered on GCM. It is only unregistered when the GCM server tries to send a message to the device and the device answers that the application is uninstalled or it does not have a broadcast receiver configured to receive <code>com.google.android.c2dm.intent.RECEIVE</code> intents. At that point, you server should mark the device as unregistered (the server will receive a <code><a href="#unreg_device">NotRegistered</a></code> error).
+<p class="note"><strong>Note:</strong> When users uninstall an application, it is not automatically unregistered on GCM. It is only unregistered when the GCM server tries to send a message to the device and the device answers that the application is uninstalled or it does not have a broadcast receiver configured to receive <code>com.google.android.c2dm.intent.RECEIVE</code> intents. At that point, your server should mark the device as unregistered (the server will receive a <code><a href="#unreg_device">NotRegistered</a></code> error).
<p>
-Note that it might take a few minutes for the registration ID to be completed removed from the GCM server. So if the 3rd party server sends a message during this time, it will get a valid message ID, even though the message will not be delivered to the device.</p>
+Note that it might take a few minutes for the registration ID to be completely removed from the GCM server. So if the 3rd party server sends a message during this time, it will get a valid message ID, even though the message will not be delivered to the device.</p>
</p>
<h4 id="push-process">Sending a Message</h4>
@@ -593,7 +593,7 @@ have an application server that meets the following criteria:</p>
<ul>
<li>Able to communicate with your client.</li>
<li>Able to fire off HTTPS requests to the GCM server.</li>
- <li>Able to handle requests and resend then as needed, using <a href="http://en.wikipedia.org/wiki/Exponential_backoff">exponential back-off.</a></li>
+ <li>Able to handle requests and resend them as needed, using <a href="http://en.wikipedia.org/wiki/Exponential_backoff">exponential back-off.</a></li>
<li>Able to store the API key and client registration IDs. The
API key is included in the header of POST requests that send
messages.</li>