Document HPNS regional URLs (Global, US, EU, Japan) and remove stale …

source/administration-guide/configure/push-notification-server-configuration-settings.rst

@@ -95,19 +95,29 @@ See our :ref:`configuration settings <administration-guide/configure/site-config
   :systemconsole: Environment > Push Notification Server
   :configjson: .EmailSettings.PushNotificationServer
   :environment: MM_EMAILSETTINGS_PUSHNOTIFICATIONSERVER
-  :description: The physical location of the Mattermost Hosted Notification Service (HPNS) server.
+  :description: The region of the Mattermost Hosted Push Notification Service (HPNS) server.
 
 Push notification server location
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-+-----------------------------------------------------------------+--------------------------------------------------------------------------------+
-| The physical location of the Mattermost Hosted Push             | - System Config path: **Environment > Push Notification Server**               |
-| Notification Service (HPNS) server.                             | - ``config.json`` setting: ``EmailSettings`` > ``PushNotificationServer``      |
-|                                                                 | - Environment variable: ``MM_EMAILSETTINGS_PUSHNOTIFICATIONSERVER``            |
-| Select from **US** **(Default)** or **Germany** to              |                                                                                |
-| automatically populate the **Push Notification Server**         |                                                                                |
-| field server URL.                                               |                                                                                |
-+-----------------------------------------------------------------+--------------------------------------------------------------------------------+
++--------------------------------------------------------+---------------------------------------------------------------------------+
+| The region of the Mattermost Hosted Push Notification  | - System Config path: **Environment > Push Notification Server**          |
+| Service (HPNS) server.                                 | - ``config.json`` setting: ``EmailSettings`` > ``PushNotificationServer`` |
+|                                                        | - Environment variable: ``MM_EMAILSETTINGS_PUSHNOTIFICATIONSERVER``       |
+| Select a region to automatically populate the          |                                                                           |
+| **Push Notification Server** field with the            |                                                                           |
+| corresponding URL:                                     |                                                                           |
+|                                                        |                                                                           |
+| - **Global**: ``https://global.push.mattermost.com``   |                                                                           |
+|   (load balances requests across the regional          |                                                                           |
+|   endpoints below)                                     |                                                                           |
+| - **US**: ``https://us.push.mattermost.com``           |                                                                           |
+| - **EU (Germany)**: ``https://eu.push.mattermost.com`` |                                                                           |
+| - **AP (Japan)**: ``https://ap.push.mattermost.com``   |                                                                           |
++--------------------------------------------------------+---------------------------------------------------------------------------+
+
+.. note::
+  ``https://us.push.mattermost.com`` supersedes the legacy ``https://push.mattermost.com`` URL, and ``https://eu.push.mattermost.com`` supersedes the legacy ``https://hpns-de.mattermost.com`` URL. The legacy URLs still work, but are deprecated and now point to the same new infrastructure as their replacements above.
 
 .. config:setting:: maximum-notifications-per-channel
   :displayname: Maximum notifications per channel (Push Notifications)

source/deployment-guide/mobile/mobile-troubleshooting.rst

@@ -51,13 +51,13 @@ All my outbound connections need to go through a proxy. How can I connect to the
 You can set up an internal server to proxy the connection out of their network to the Mattermost Hosted Push Notification Service (HPNS) by following the steps below:
 
 1. Make sure your proxy server is properly configured to support SSL. Confirm it works by checking the URL at https://www.digicert.com/help/.
-2. Setup a proxy to forward requests to ``https://push.mattermost.com``.
+2. Setup a proxy to forward requests to the HPNS URL matching your server's :ref:`push notification server location <administration-guide/configure/environment-configuration-settings:push notification server location>`: ``https://global.push.mattermost.com``, ``https://us.push.mattermost.com``, ``https://eu.push.mattermost.com``, or ``https://ap.push.mattermost.com``.
 3. In Mattermost set **System Console** > **Notification Settings** > **Mobile Push** > **Enable Push Notifications** in prior versions or **System Console > Environment > Push Notification Server > Enable Push Notifications** in versions after 5.12 to "Manually enter Push Notification Service location"
 4. Enter the URL of your proxy in the **Push Notification Server** field.
 
-.. Note:: 
+.. Note::
 
-  Depending on how your proxy is configured you may need to add a port number and create a URL like ``https://push.internalproxy.com:8000`` mapped to ``https://push.mattermost.com``
+  Depending on how your proxy is configured you may need to add a port number and create a URL like ``https://push.internalproxy.com:8000`` mapped to your region's HPNS URL, such as ``https://us.push.mattermost.com``.
 
 Build gets stuck at ``bundleReleaseJsAndAssets``
 ------------------------------------------------

source/end-user-guide/preferences/troubleshoot-notifications.rst

@@ -209,7 +209,7 @@ Yes, push notifications are free if you compile your own `push-proxy service <ht
 
 TPNS, hosted at `https://push-test.mattermost.com <https://push-test.mattermost.com>`_, offers transport-level encryption, but not production-level service level agreements (SLAs).
 
-If you need production-level SLAs for push notifications, you can either compile your own push-proxy service, with your own key, or you can use a paid option and become a Mattermost Professional subscriber `agreeing to our Conditions of Use <https://mattermost.com/terms-of-use/>`_, which enables you to use a production-level Hosted Push Notification Service (HPNS) at ``https://push.mattermost.com``.
+If you need production-level SLAs for push notifications, you can either compile your own push-proxy service, with your own key, or you can use a paid option and become a Mattermost Professional subscriber `agreeing to our Conditions of Use <https://mattermost.com/terms-of-use/>`_, which enables you to use a production-level Hosted Push Notification Service (HPNS) at a regional URL such as ``https://global.push.mattermost.com`` — see the :ref:`push notification server location <administration-guide/configure/environment-configuration-settings:push notification server location>` setting for the full list of regions.
 
 Learn more about :ref:`our push notification service <administration-guide/configure/environment-configuration-settings:enable push notifications>`.