MAGECLOUD-2128 Multi-site URLs (magento#2714)

* Remove old note from config topic

* MAGECLOUD-2128 update multisite URL construct

* Fix magento#1785

* MAGECLOUD-2128 Formatting and fixes from feedback

* Remve old graphics and fix steps so don't need them

* remind to add to the secure section

* edits based on feedback

* broken link

* more broken links after running report

These links are not really associated with the point of this PR, but fixed them anyway.

* Reformatted all steps

locations are italicized, elements of action are bold

Author: hguthrie

common/images/config_multi-site_base-url-default2.png

@@ -1,12 +1,6 @@
 ---
 group: cloud
-subgroup: 080_setup
 title: Prepare your existing Magento Commerce install
-menu_title: Prepare your existing Magento Commerce install
-menu_order: 153
-menu_node:
-level3_menu_node: level3child
-level3_subgroup: import
 version: 2.1
 functional_areas:
   - Cloud
@@ -34,7 +28,7 @@ To import {{site.data.var.ee}} code to a {{site.data.var.ece}} project, you need
 *  [`.magento.app.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_magento-app.html) manages applications, service relationships, mounts for writable directories, and cron jobs
 *  [`.magento/services.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_services.html) for service configurations including MySQL, PHP, Redis, Solr (2.0.X only), ElasticSearch (2.1.X and later)
 *  [`.magento/routes.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_routes.html) for handling routes including redirections, caching, and server-side includes
-*  [`magento-vars.php`]({{ page.baseurl }}/cloud/project/project-multi-sites.html#cloud-multi-stores-magento-vars) for multiple websites and stores
+*  [`magento-vars.php`]({{ page.baseurl }}/cloud/project/project-multi-sites.html) for multiple websites and stores
 
 You need to add these files to your {{site.data.var.ee}} code:
 

common/images/config_multi-site_base-url.png

@@ -269,7 +269,7 @@ crons:
         cmd: "php bin/magento cron:run"
 ```
 
-For {{site.data.var.ece}} 2.1.X, you can use only [workers](#workers) and [cron jobs](#crons). For {{site.data.var.ece}} 2.2.X, cron jobs launch consumers to process batches of messages, and do not require additional configuration.
+For {{site.data.var.ece}} 2.1.X, you can use only workers and [cron jobs](#crons). For {{site.data.var.ece}} 2.2.X, cron jobs launch consumers to process batches of messages, and do not require additional configuration.
 
 For more information, see [Set up cron jobs]({{ page.baseurl }}/cloud/configure/setup-cron-jobs.html).
 

guides/v2.1/cloud/access-acct/first-time-setup_import-prepare.md

@@ -33,7 +33,7 @@ magento-cloud environment:routes
 +-------------------+----------+---------------+
 ```
 
-## Route templates {#cloud-yaml-routes-temp}
+## Route templates
 
 The `routes.yaml` file is a list of templated routes and their configurations. A route template looks similar to this: `http://www.{default}/` or `https://{default}/blog`, where `{default}` is the qualified domain name configured for the project. For example, the routes for `example.com` domain resolve to the following:
 
@@ -53,19 +53,22 @@ For example, if the project ID is `mswy7hzcuhcjw` on a branch called `refactorcs
 
 <!-- {{site.data.var.ece}} also supports [multiple applications]({{ page.baseurl }}/cloud/project/project-conf-multi.html) per project. Each project has a single `routes.yaml` file that defines which request is routed to which application. -->
 
-## Route options {#cloud-yaml-routes-opts}
+## Route options
 
 Configure each route separately using the following properties:
 
--  `type: upstream`—serves an application. Also, it has an `upstream` property that specifies the name of the application (as defined in `.magento.app.yaml`) followed by the `:http` endpoint.
--  `type: redirect`—redirects to another route. It is followed by the `to` property, which is an HTTP redirection to another route identified by its template.
--  `cache`—controls [caching for the route]({{ page.baseurl }}/cloud/project/project-routes-more-cache.html).
--  `redirects`—controls [redirect rules]({{ page.baseurl }}/cloud/project/project-routes-more-redir.html).
--  `ssi`—controls enabling of [Server Side Includes]({{ page.baseurl }}/cloud/project/project-routes-more-ssi.html).
+Property         | Description
+---------------- | -----------
+`type: upstream` | Serves an application. Also, it has an `upstream` property that specifies the name of the application (as defined in `.magento.app.yaml`) followed by the `:http` endpoint.
+`type: redirect` | Redirects to another route. It is followed by the `to` property, which is an HTTP redirection to another route identified by its template.
+`cache:`         | Controls [caching for the route]({{ page.baseurl }}/cloud/project/project-routes-more-cache.html).
+`redirects:`     | Controls [redirect rules]({{ page.baseurl }}/cloud/project/project-routes-more-redir.html).
+`ssi:`           | Controls enabling of [Server Side Includes]({{ page.baseurl }}/cloud/project/project-routes-more-ssi.html).
+{:style="table-layout:auto;"}
 
-## Simple routes {#cloud-yaml-routes-sample-simple}
+## Simple routes
 
-The following sample routes the naked domain and the `www` subdomain to the `frontend`application. This route does not redirect HTTPS:
+The following sample routes the apex domain and the `www` subdomain to the `frontend`application. This route does not redirect HTTPS:
 
 ```yaml
 "http://{default}/":
@@ -77,7 +80,7 @@ The following sample routes the naked domain and the `www` subdomain to the `fro
     to: "http://{default}/"
 ```
 
-The following sample route does not redirect from the `www` to the naked domain; instead, it serves from both:
+The following sample route does not redirect from the `www` to the apex domain; instead, it serves from both:
 
 ```yaml
 "http://{default}/":
@@ -91,7 +94,7 @@ The following sample route does not redirect from the `www` to the naked domain;
 
 In the first sample, the server responds directly to a request of the form `http://example.com/hello`, but it issues a _301 redirect_ for `http://www.example.com/mypath` (to `http://example.com/mypath`).
 
-## Wildcard routes {#cloud-yaml-routes-sample-wild}
+## Wildcard routes
 {{site.data.var.ece}} supports wildcard routes, so you can map multiple subdomains to the same application. This works for {% glossarytooltip 510de766-1ebd-4546-bf38-c618c9c945d2 %}redirect{% endglossarytooltip %} and upstream routes. You prefix the route with an asterisk (\*). For example, the following routes to the same application:
 
 -  `*.example.com`
@@ -103,29 +106,31 @@ This functions as a catch-all domain in a live environment.
 
 ### Routing a non-mapped domain
 
-You can route to a system that is not mapped to a domain using the dot (\.) to separate the subdomain.
+You can route to a system that is not mapped to a domain using a dot (\.) to separate the subdomain. For example, a project with an `add-theme` branch routes to `http://add-theme-projectID.us.magento.com/`.
 
-{% include note.html type="info" content="Projects provisioned before December 8, 2017, use the triple dash (\-\-\-) as a separator for the subdomain." %}
-
-For example, a project with the `vmwklxcpbi6zq` ID and an `add-theme` branch routes to `http://add-theme-vmwklxcpbi6zq.us.magento.com/`.
-
-If you define a `http://www.{default}/` route, the route becomes `http://www.add-theme-vmwklxcpbi6zq.us.magento.com/`.
+If you define a `http://www.{default}/` route, the route becomes `http://www.add-theme-projectID.us.magento.com/`.
 
 You can put any subdomain before the dot and the route resolves. In this example, the route is defined as `http://*.{default}/`, so both of the following URLs work:
 
--  `http://foo.add-theme-vmwklxcpbi6zq.us.magentosite.cloud/`
--  `http://bar.add-theme-vmwklxcpbi6zq.us.magentosite.cloud/`
+-  `http://foo.add-theme-projectID.us.magentosite.cloud/`
+-  `http://bar.add-theme-projectID.us.magentosite.cloud/`
 
 If you examine the routes of this sample application, you see:
 
-```
+```bash
 echo $MAGENTO_CLOUD_RELATIONSHIPS | base64 --decode | json_pp
-https://*.add-theme-vmwklxcpbi6zq.us.magentosite.cloud/
 ```
 
+```terminal
+https://*.add-theme-projectID.us.magentosite.cloud/
+```
+
+{: .bs-callout .bs-callout-info}
+Some projects provisioned before December 8, 2017, use the triple dash (\-\-\-) as a separator for the subdomain.
+
 See more information about [caching]({{ page.baseurl }}/cloud/project/project-routes-more-cache.html).
 
-## Redirects {#cloud-yaml-routes-sample-redirects}
+## Redirects
 
 As discussed in more detail in [Redirects]({{ page.baseurl }}/cloud/project/project-routes-more-redir.html), you can manage complex redirection rules, such as *partial redirects*: