summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author kmccormick <kmccormick@google.com> 2014-10-01 17:55:43 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-01 17:55:43 +0000
commit04e50c474ce5b6aa2e366bc057a29a16467a66bd (patch)
treea02b9bfd1e284b0cfb899c8b9920a459e1272164
parent24199873ca3297555909914f92e3cab97169b057 (diff)
parentd1ba4c13d0928d10c467bd7fd5992186925e1a5a (diff)
am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a': Doc update: Update preprod (staging) instructions.
-rw-r--r--docs/html/google/gcm/ccs.jd12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/html/google/gcm/ccs.jd b/docs/html/google/gcm/ccs.jd
index 1c7c8021b766..2faf97f3829d 100644
--- a/docs/html/google/gcm/ccs.jd
+++ b/docs/html/google/gcm/ccs.jd
@@ -81,10 +81,14 @@ Java sample using the Smack library</a>.</p>
<p>The CCS XMPP endpoint runs at {@code gcm.googleapis.com:5235}. When testing
functionality (with non-production users), you should instead connect to
-{@code gcm-staging.googleapis.com:5236} (note the different port). Testing on
-staging (a smaller environment where the latest CCS builds run) is beneficial
-both for isolating real users from test code, as well as for early detection of
-unexpected behavior changes.</p>
+{@code gcm-preprod.googleapis.com:5236} (note the different port). Regular
+testing on preprod (a smaller environment where the latest CCS builds run) is
+beneficial both for isolating real users from test code, as well as for early
+detection of unexpected behavior changes. Note that a connection receives upstream
+messages destined for its GCM sender ID, regardless of which environment (gcm or
+gcm-preprod) it is connected to. Therefore, test code connecting to
+{@code gcm-preprod.googleapis.com:5236} should use a different GCM sender ID to
+avoid upstream messages from production traffic being sent over test connections.</p>
<p>The connection has two important requirements:</p>