summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-03-29 16:04:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-29 16:04:05 -0700
commita92ca7fa3ec630aee14e51d87851749956bad875 (patch)
treeccf459a835441f1d4fd5bdbeac32751acb4dce01 /docs/html
parentee5880c95a6f6528a2497e1cc9580880aa1c95ef (diff)
parenta8858d215123b819557d130bfeeeb50568649b51 (diff)
downloadframeworks_base-a92ca7fa3ec630aee14e51d87851749956bad875.zip
frameworks_base-a92ca7fa3ec630aee14e51d87851749956bad875.tar.gz
frameworks_base-a92ca7fa3ec630aee14e51d87851749956bad875.tar.bz2
am a8858d21: am 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit 'a8858d215123b819557d130bfeeeb50568649b51': Doc update: clarify guidelines for firewall setup.
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/google/gcm/gcm.jd5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/google/gcm/gcm.jd b/docs/html/google/gcm/gcm.jd
index f8ba7b4..089baf5 100644
--- a/docs/html/google/gcm/gcm.jd
+++ b/docs/html/google/gcm/gcm.jd
@@ -777,10 +777,11 @@ sent. Optional. The default value is <code>false</code>, and must be a JSON bool
<p class="note"><strong>Note:</strong> If your organization has a firewall
that restricts the traffic to or
-from the Internet, you need to configure it to allow connectivity with GCM.
+from the Internet, you need to configure it to allow connectivity with GCM in order for
+your Android devices to receive messages.
The ports to open are: 5228, 5229, and 5230. GCM typically only uses 5228, but
it sometimes uses 5229 and 5230. GCM doesn't provide specific IPs, so you should
-allow your server to accept incoming connections from all IP addresses
+allow your firewall to accept incoming connections from all IP addresses
contained in the IP blocks listed in Google's ASN of 15169.</p>