diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/google/gcm/ccs.jd | 12 | ||||
| -rw-r--r-- | docs/html/sdk/index.jd | 8 |
2 files changed, 11 insertions, 9 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> diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 2bbdfc8..9ed70ed 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -246,11 +246,9 @@ This is the Android Software Development Kit License Agreement <p>The Android SDK provides you the API libraries and developer tools necessary to build, test, and debug apps for Android.</p> -<p>If you're a new Android developer, we recommend you download the ADT Bundle -to quickly start developing apps. It includes the essential -Android SDK components and a version of the Eclipse IDE with built-in -<b>ADT (Android Developer Tools)</b> to -streamline your Android app development.</p> +<p>Download the ADT Bundle to quickly start developing apps. It includes the essential Android +SDK components and a version of the Eclipse IDE with built-in <b>ADT (Android Developer Tools)</b> +to streamline your Android app development.</p> <!-- this appears when viewing the online docs --> |