summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author kmccormick <kmccormick@google.com> 2013-03-29 16:00:03 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-03-29 16:00:03 -0700
commit93c4446af02b3ccf6da5f8bd7ecb4b8b1cdf62d5 (patch)
treeb8cb634a63a049e6eb28684d08b4ffea21fe85a9
parent6f50c846ad46dfeadf8eac389102031662ad892f (diff)
parent75fa3012467117933d6afb7353b1c027bd446b72 (diff)
am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '75fa3012467117933d6afb7353b1c027bd446b72': Doc update: clarify guidelines for firewall setup.
-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 fb57a910dd25..26fc49a33398 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>