Merge branch 'master' into 3361_newConfigurationType

Author: dobooth

README.md

@@ -29,7 +29,7 @@
           url: /cloud/docker/docker-development.html
           versionless: true
 
-        - label: Launch Docker
+        - label: Configure and launch Docker
           url: /cloud/docker/docker-config.html
           versionless: true
 

src/_data/main-nav.yml

@@ -144,18 +144,20 @@ pages:
             - label: Manage cron jobs
               url: /cloud/docker/docker-manage-cron-jobs.html
               versionless: true
+  
+            - label: Extend Docker
+              url: /cloud/docker/docker-extend.html
+              versionless: true
 
+        - label: Launch Docker
+          children: 
             - label: Developer mode
               url: /cloud/docker/docker-mode-developer.html
               versionless: true
 
             - label: Production mode
               url: /cloud/docker/docker-mode-production.html
               versionless: true
-  
-            - label: Extend Docker
-              url: /cloud/docker/docker-extend.html
-              versionless: true
 
         - label: Functional Testing
           children:

src/_data/toc/cloud-guide.yml

@@ -77,6 +77,10 @@ pages:
 - label: How-Tos
   versionless: true
   children:
+  - label: Add an appearance
+    url: /page-builder/docs/how-to/how-to-add-appearance.html
+    versionless: true
+
   - label: Customize the panel
     url: /page-builder/docs/how-to/how-to-customize-panel.html
     versionless: true

src/_data/toc/page-builder.yml

@@ -0,0 +1,2 @@
+{:.bs-callout-info}
+See [Configure Docker]({{site.baseurl}}/cloud/docker/docker-config.html) for additional information about Docker prerequisites and using the Magento Cloud Docker environment.

src/_includes/cloud/note-docker-config-reference-link.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-architecture.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/architecture/pro-develop-deploy-workflow.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/cdn/fastly-vcl-blocking.md

@@ -51,14 +51,12 @@ The `ece-docker build:compose` command overwrites the existing `docker-compose.y
 
 1. Optionally, [enable Xdebug].
 
-## Launch modes
+## Set the launch mode
 
-_Mode_ is an additional configuration option for the Docker configuration generator (the `ece-docker build:compose` command). This mode option does not affect the Magento mode. It determines the {{site.data.var.ece}} file system installation and read-only or read-write behavior.
+You can launch a Docker environment in production or developer mode by setting the `mode` option on the `ece-docker build:compose` command:
 
-You can launch your Docker environment in one of the following modes:
-
--  [**production**][prod-mode]—Production mode is the default configuration setting for launching the Docker environment with read-only filesystem permissions. This option builds the Docker environment in production mode and verifies configured service versions.
--  [**developer**][dev-mode]—Developer mode supports an active development environment with full, writable filesystem permissions. This option builds the Docker environment in developer mode and verifies configured service versions. System performance is slower in developer mode because of additional file synchronization operations.
+-  **Production mode**—The `--mode="production"` setting supports an active production environment with read-only filesystem permissions. This is the default configuration setting for launching a Docker environment. Selecting this option builds the Docker environment in production mode and verifies configured service versions. See [Production mode launch instructions][prod-mode].
+-  **Developer mode**—The `--mode="developer"` setting supports an active development environment with full, writable filesystem permissions. Selecting this option builds the Docker environment in developer mode and verifies configured service versions. System performance is slower in developer mode because of additional file synchronization operations. See [Developer mode launch instructions][dev-mode].
 
 For example, the following command starts the Docker configuration generator for the developer mode:
 
@@ -68,6 +66,9 @@ For example, the following command starts the Docker configuration generator for
 
 To skip the interactive mode, use the `-n, --no-interaction` option.
 
+{:.bs-callout-info}
+The mode option for the `ece-docker build:compose` command does not affect the Magento mode. It determines the {{site.data.var.ece}} file system installation and read-only or read-write behavior.
+
 ## Stop and start containers
 
 You can stop containers and restore them afterwards using the following methods.
@@ -89,7 +90,7 @@ Use the following command to stop and remove the Docker configuration:
 {: .bs-callout-warning}
 This command removes all components of your local Docker instance including containers, networks, volumes, and images except for the persistent database and the `magento-sync` volume. See [Rebuild a clean environment][refresh].
 
-## Running Composer with Docker
+## Run Composer with Docker
 
 You can run composer using the `docker` command before you create the container instance. This technique is useful to create an application instance during the CI/CD build process, or even during first time Magento set up.
 
@@ -101,7 +102,7 @@ docker run -it  -v $(pwd):/app/ -v ~/.composer/:/root/.composer/ magento/magento
 
 This command passes in the current working directory as `/app/`, includes composer from `~/.composer/`, and runs the `composer install` command in the container. After this set up, the command  fixes the permissions on the files that have been added or changed.
 
-## Sendmail service
+## Set up email
 
 Send emails from your Docker environment by adding the following configuration to the `docker-compose.yml` configuration file:
 

src/cloud/docker/docker-config.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.