summaryrefslogtreecommitdiffstats
path: root/docs/html/google
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2014-10-01 17:02:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-01 17:02:26 +0000
commita1572ffc6b8df1f0da637fdb93b949322fcb3637 (patch)
tree9fb5fd11d98345e223b1aa1569fdc23d039a667e /docs/html/google
parentae7b5dc49381e76c82cda928cc37a6a8b529da25 (diff)
parent76ab6c629079901d13041c34d2f17ea1dedea4d3 (diff)
downloadframeworks_base-a1572ffc6b8df1f0da637fdb93b949322fcb3637.zip
frameworks_base-a1572ffc6b8df1f0da637fdb93b949322fcb3637.tar.gz
frameworks_base-a1572ffc6b8df1f0da637fdb93b949322fcb3637.tar.bz2
Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
Diffstat (limited to 'docs/html/google')
-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 1c7c802..2faf97f 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>