Merge pull request #6660 from magento/small-changes

Small changes

Author: dobooth

src/cloud/architecture/pro-architecture.md

@@ -156,7 +156,7 @@ The Production environment has three virtual machines (VMs) behind an Elastic Lo
    -  `pub/static`
    -  `app/etc`
 -  **Redis**—one server per VM with only one active and the other two as replicas
--  **Elasticsearch**—search for {{site.data.var.ece}} 2.1 and later
+-  **Elasticsearch**—search for {{site.data.var.ece}} 2.2 and later
 -  **Galera**—database cluster with one MariaDB MySQL database per node with an auto-increment setting of three for unique IDs across every database
 
 The following figure shows the technologies used in the Production environment:

src/cloud/architecture/pro-develop-deploy-workflow.md

@@ -61,7 +61,7 @@ Combine all verified code changes by merging your Active development branch into
 
 ### Merge to Staging
 
-Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes in iterations to your Staging environment for full testing that includes all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.
+Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes from the Integration environment to the Staging environment so that you can perform thorough testing with all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.
 
 It is best to thoroughly test every service, verify your performance testing tools, and perform UAT testing as an administrator and as a customer, until you feel that your store is ready for the Production environment. See [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html).
 

src/cloud/cdn/fastly-vcl-blocking.md

@@ -25,7 +25,7 @@ You create an Edge ACL to define the list of IP addresses to block. After creati
 If you want to manage access for both Staging and Production sites, create the Edge ACL with the same name in both environments. The VCL snippet code will apply to both environments.
 
 1. Log in to the Magento Admin.
-1. Navigate to **Stores** > **Settings** > **Configuration** > **Advanced** > **System** > **Fastly Configuration**.
+1. Navigate to **Stores** > Settings > **Configuration** > **Advanced** > **System** > **Full Page Cache** > **Fastly Configuration**.
 1. Expand the **Edge ACL** section.
 1. Click **Add ACL** to create a list. For this example, name the list "blocklist".
 1. Enter IP address values in the list. Any client IPs added to this list will be blocked access from the site.

src/cloud/docker/docker-containers-service.md

@@ -77,7 +77,7 @@ The FPM container includes the following volumes:
    -  `/app/pub/media`
 
 {:.bs-callout-tip}
-You can add custom PHP extensions and manage their status from the `runtime` section of the `.magento.app.yaml` file. See [PHP extensions]. To test custom extensions without updating the {{site.data.var.ece}} environment configuration, you can add the custom configuration to the [`docker-compose.override.yml`][Docker override] file. Configuration settings in this file are applied only when you build and deploy to the Docker environment.
+You can add custom PHP extensions and manage their status from the `runtime` section of the `.magento.app.yaml` file. See [PHP extensions]. To test custom extensions without updating the {{site.data.var.ece}} environment configuration, you can add the custom configuration to the [`docker-compose.override.yml`][Docker override file]. Configuration settings in this file are applied only when you build and deploy to the Docker environment.
 
 For additional information about configuring the php environment, see the [XDebug for Docker] documentation.
 

src/cloud/docker/docker-containers.md

@@ -39,7 +39,7 @@ See [Docker CLI containers] for details.
 | [selenium][selenium-container]| Selenium | `--with-selenium`<br>`--selenium-version`<br>`--selenium-image`| Any | Enables Magento application testing using the Magento Functional Testing Framework (MFTF)
 | [tls][tls-container] | SSL Endpoint |  |   |  Terminates SSL, can be configured to pass to varnish or nginx
 | [varnish][varnish-container] | Varnish | `--varnish` | 4, 6 |
-| [web][web-container] | NGNIX | `--nginx` | 1.9, latest |
+| [web][web-container] | NGINX | `--nginx` | 1.9, latest |
 
 The `ece-docker build:compose` command runs in interactive mode and verifies the configured service versions. To skip interactive mode, use the `-n, --no-interaction` option.
 

src/cloud/project/ece-tools-upgrade-project.md

@@ -29,11 +29,11 @@ Each {{site.data.var.ee}} version requires a different constraint based on the f
 
 You can always find the latest metapackage constraint in the [`magento-cloud` template](https://github.com/magento/magento-cloud/blob/master/composer.json).
 
-The following example places a constraint for the {{site.data.var.ece}} metapackage to any version greater than or equal to the current version 2.2.0 and lower than next version 2.2.1:
+The following example places a constraint for the {{site.data.var.ece}} metapackage to any version greater than or equal to the current version 2.3.4 and lower than next version 2.3.5:
 
 ```json
 "require": {
-    "magento/magento-cloud-metapackage": ">=2.2.0 <2.2.1"
+    "magento/magento-cloud-metapackage": ">=2.3.4 <2.3.5"
 },
 ```
 
@@ -46,9 +46,9 @@ To upgrade project to use ece-tools:
 
 1. Update the `magento/magento-cloud-metapackage` version constraint in the `composer.json` file.
 
-   ```bash
-   composer require "magento//magento-cloud-metapackage": ">=2.2.0 <2.2.1" --no-update
-   ```
+    ```bash
+    composer require "magento/magento-cloud-metapackage":">=2.3.4 <2.3.5" --no-update
+    ```
 
 1. Update the metapackage.
 

src/cloud/project/project-conf-files_services-redis.md

@@ -52,7 +52,7 @@ To enable Redis:
 
 Assuming your Redis relationship is named `redis`, you can access it using the `redis-cli` tool.
 
-1. Use SSH to connect to the Integration environment with RabbitMQ installed and configured.
+1. Use SSH to connect to the Integration environment with Redis installed and configured.
 
 1. Open an SSH tunnel to a host.
 

src/cloud/project/project-multi-sites.md

@@ -82,7 +82,7 @@ To configure a new web location:
    ```yaml
    web:
        locations:
-           "/":&app
+           "/": &app
                # The public directory of the app, relative to its root.
                root: "pub"
                passthru: "/index.php"
@@ -98,7 +98,7 @@ To configure a new web location:
    ```yaml
    web:
        locations:
-           "/":&app
+           "/": &app
                # The public directory of the app, relative to its root.
                root: "pub"
                passthru: "/index.php"
@@ -130,14 +130,14 @@ To configure a location with a different directory:
    ```yaml
    web:
        locations:
-           "/":&root
+           "/": &root
                # The public directory of the app, relative to its root.
                root: "pub"
                passthru: "/index.php"
                index:
                - index.php
                ...
-           "/static":&static
+           "/static": &static
                root: "pub/static"
    ```
 
@@ -146,7 +146,7 @@ To configure a location with a different directory:
    ```yaml
    web:
        locations:
-           "/":&root
+           "/": &root
                # The public directory of the app, relative to its root.
                root: "pub"
                passthru: "/index.php"
@@ -156,7 +156,7 @@ To configure a location with a different directory:
            "/media":
                root: "pub/media"
                ...
-           "/static":&static
+           "/static": &static
                root: "pub/static"
                allow: true
                scripts: false

src/cloud/project/project-upgrade.md

@@ -224,7 +224,7 @@ To resolve the error:
 
 [technology stack]: {{site.baseurl}}/guides/v2.3/install-gde/system-requirements-tech.html
 [Upgrades and patches]: {{site.baseurl}}/cloud/project/project-upgrade-parent.html
-[Magento technology stack requirements]: {{site.baseurl}}/guides/v2.2/install-gde/system-requirements-tech.html
+[Magento technology stack requirements]: {{site.baseurl}}/guides/v2.3/install-gde/system-requirements-tech.html
 [Configuration Management]: {{site.baseurl}}/cloud/live/sens-data-over.html
 [extensions section of the .magento.app.yaml file]: {{site.baseurl}}/cloud/project/project-conf-files_magento-app.html#configure-php-options
 [.magento.app.yaml]: {{site.baseurl}}/cloud/project/project-conf-files_magento-app.html