Merge branch 'master' of github.com:magento/devdocs into kh_update-msi-tutorial

Author: keharper

_data/toc/magento-functional-testing-framework-guide-2_3.yml

@@ -1,5 +1,4 @@
 label: Magento Functional Testing Framework Guide version 2.3
-versionless: true
 pages:
 
   - label: Introduction
@@ -72,6 +71,10 @@ pages:
     url: /mftf/2.3/reporting.html
     versionless: true
 
+  - label: Credentials
+    url: /mftf/2.3/credentials.html
+    versionless: true
+
   - label: Configuration
     url: /mftf/2.3/configuration.html
     versionless: true

_includes/cloud/new-project-from-template.md

@@ -1,4 +1,4 @@
-1. Access your account. You can open the email you received from Magento Cloud (accounts@magento.cloud) and click the _Access your project now_ link. Or you can log in to [your Magento Commerce account](https://accounts.magento.cloud).
+1. Access your account. You can open the email you received from Magento Cloud (accounts@magento.cloud) and click the _Access your project now_ link. Or you can log in to [your {{site.data.var.ee}} account](https://accounts.magento.cloud).
 2. Click the _This project has no code yet_ link next to the Project name.
 
 	![Project without code]({{ site.baseurl }}/common/images/cloud_project_empty.png)

_includes/cloud/patch.md

@@ -1,15 +1,15 @@
-This topic discusses how to test patches to your Magento Commerce (Cloud) system locally before you push them to the remote server. We strongly recommend you test patches locally so you can identify and resolve any issues.
+This topic discusses how to test patches to your {{site.data.var.ece}} system locally before you push them to the remote server. We strongly recommend you test patches locally so you can identify and resolve any issues.
 
-When you perform a Magento Commerce upgrade, you automatically upgrade with patches and hotfixes through the `composer update` command. If you upgrade a Cloud patch without upgrading the full Magento Commerce application, see [Upgrade a Magento Commerce patch](#upgrade-patch). To upgrade and test a full Magento Commerce version (including patches and hotfixes), see [Upgrade and test Magento Commerce]({{ page.baseurl }}/cloud/project/project-upgrade.html).
+When you perform a {{site.data.var.ee}} upgrade, you automatically upgrade with patches and hotfixes through the `composer update` command. If you upgrade a Cloud patch without upgrading the full {{site.data.var.ee}} application, see [Upgrade a {{site.data.var.ee}} patch](#upgrade-patch). To upgrade and test a full {{site.data.var.ee}} version (including patches and hotfixes), see [Upgrade and test {{site.data.var.ee}}]({{ page.baseurl }}/cloud/project/project-upgrade.html).
 
 {: .bs-callout .bs-callout-info}
-We recommend installing full Magento Commerce upgrades for important security updates. Full upgrades include all associated patches and hotfixes.
+We recommend installing full {{site.data.var.ee}} upgrades for important security updates. Full upgrades include all associated patches and hotfixes.
 
 There are two types of patches:
 
 *   [General patches](#cloud-patch-gen)
 
-    These patches are provided for all Magento Commerce customers in a GitHub repository that's referenced in your `composer.json`. We apply these patches automatically during the build phase.
+    These patches are provided for all {{site.data.var.ee}} customers in a GitHub repository that's referenced in your `composer.json`. We apply these patches automatically during the build phase.
 
     To install general patches, use `composer update`, test your system, and push the patches to the remote server.
 
@@ -24,9 +24,9 @@ Always test a patch your local system. When complete, push the local Git branch
 
 For more information on Composer, see [Composer in Cloud]({{ page.baseurl }}/cloud/reference/cloud-composer.html).
 
-## Upgrade a Magento Commerce patch {#upgrade-patch}
+## Upgrade a {{site.data.var.ee}} patch {#upgrade-patch}
 
-When you perform a Magento Commerce upgrade, you automatically upgrade with patches and hotfixes through the `composer update` command.
+When you perform a {{site.data.var.ee}} upgrade, you automatically upgrade with patches and hotfixes through the `composer update` command.
 
 ### Back up the database
 
@@ -68,7 +68,7 @@ Verify other changes you're going to submit to source control before you start t
 
         composer update
 
-    This command automatically upgrades for patches associated to the installed Magento Commerce version.
+    This command automatically upgrades for patches associated to the installed {{site.data.var.ee}} version.
 
 4.  Add, commit, and push your changes to initiate a deployment:
 
@@ -78,13 +78,13 @@ Verify other changes you're going to submit to source control before you start t
 
     `git add -A` is required to add all changed files to source control because of the way Composer marshals base packages.
 
-    The files Composer marshals belong to the new version of Magento, to overwrite the outdated version of those same files. Currently, marshaling is disabled in Magento Commerce, so you must add the marshaled files to source control.
+    The files Composer marshals belong to the new version of Magento, to overwrite the outdated version of those same files. Currently, marshaling is disabled in {{site.data.var.ee}}, so you must add the marshaled files to source control.
 
 5.  Wait for deployment to complete.
 
 ## Test general patches {#cloud-patch-gen}
 
-*General patches* are provided for all Magento Commerce customers in a repository referenced in your `composer.json`. We apply patches automatically during the build phase when a patch is available. The procedure discussed in this section enables to you test a patch locally anytime you choose.
+*General patches* are provided for all {{site.data.var.ee}} customers in a repository referenced in your `composer.json`. We apply patches automatically during the build phase when a patch is available. The procedure discussed in this section enables to you test a patch locally anytime you choose.
 
 The procedure you use is slightly different, depending on the type of environment, see [Pro architecture]({{ page.baseurl }}/cloud/architecture/pro-architecture.html#cloud-arch-int).
 

_includes/config/message-queue-consumers.md

@@ -21,7 +21,7 @@ async.operations.all
 To start message queue consumers:
 
 ```bash
-/bin/magento queue:consumers:start [--max-messages=<value>] [--batch-size=<value>] [--pid-file-path=<value>] <consumer_name>
+bin/magento queue:consumers:start [--max-messages=<value>] [--batch-size=<value>] [--pid-file-path=<value>] <consumer_name>
 ```
 
 The following table explains this command’s options, parameters, and values.

_layouts/redoc.html

@@ -1,7 +1,51 @@
 {% include layout/header.html %}
 
 <div class="content-container">
-    {{ content }}
+    <div id="redoc-container"></div>
 </div>
 
+<script src="https://cdn.jsdelivr.net/npm/redoc@2.0.0-alpha.41/bundles/redoc.standalone.js"> </script>
+<script>
+    Redoc.init('{{ page.specUrl }}', {
+        scrollYOffset: '.site-nav',
+        hideHostname: true,
+        sortPropsAlphabetically: true,
+        pathInMiddlePanel: true,
+        hideDownloadButton: true,
+        showExtensions: true,
+        nativeScrollbars: true,
+        lazyRendering: true,
+        theme: {
+            colors: {
+                tonalOffset: 0.2,
+                primary: {
+                    main: '#2b2b2c',
+                },
+                success: {
+                    main: '#008000',
+                    light: '#ecf7ed',
+                },
+                error: {
+                    main: '#cc0000',
+                },
+                responses: {
+                    success: {
+                        backgroundColor: '#ecf7ed',
+                    },
+                    error: {
+                        backgroundColor: '#ffebeb',
+                    }
+                }
+            },
+            typography: {
+                fontFamily: '',
+                headings: {
+                    fontFamily: '',
+                }
+            },
+        }
+    }, document.getElementById('redoc-container'))
+
+</script>
+
 {% include layout/footer.html %}

guides/v2.1/cloud/basic-information/starter-architecture.md

@@ -80,7 +80,7 @@ Each service runs in its own secure container. Containers are managed together i
 *	Git
 *	Secure Shell (SSH)
 
-You can even have multiple applications running in the same project. Building a microservice oriented architecture with Magento Commerce is as easy as managing a monolithic application.
+You can even have multiple applications running in the same project. Building a microservice oriented architecture with {{site.data.var.ee}} is as easy as managing a monolithic application.
 
 ### Software versions {#cloud-arch-software}
 

guides/v2.1/cloud/before/before-setup-env-2_clone.md

@@ -20,7 +20,7 @@ functional_areas:
 #### Previous step:
 [Set up the Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html)
 
-The Magento Commerce project is a Git repository of Magento code with a master origin. Develop your custom code and add extensions in one of eight active Git branches in your local. Each active environment includes a database and services to fully access the Magento site and store in the Integration environment.
+The {{site.data.var.ee}} project is a Git repository of Magento code with a master origin. Develop your custom code and add extensions in one of eight active Git branches in your local. Each active environment includes a database and services to fully access the Magento site and store in the Integration environment.
 
 To begin, you need to clone the `master` environment to your local and add the Magento Admin URL, username, and password (to include with all branches). If you are new to Git workflow, processes, and commands, see Git [documentation](https://git-scm.com/documentation).
 
@@ -70,7 +70,7 @@ To clone the project's `master` environment to your local:
 
 We recommend changing the following variables for the Magento Admin URL and administrator account. You should configure these settings for security reasons prior to branching from the cloned `master`. If you change the variables in the `master` branch, you only have to make these changes once. All branches inherit the variables from `master`.
 
-* `ADMIN_EMAIL`: The email address for the administrative user. This value is required for upgrading and patching Magento Commerce (Cloud) and is used to send password reset emails.
+* `ADMIN_EMAIL`: The email address for the administrative user. This value is required for upgrading and patching {{site.data.var.ece}} and is used to send password reset emails.
 * `ADMIN_USERNAME`: Username for the administrative user. The administrative user
 can create other users, including other administrative users. The default
 hardcoded username is the Project Owner email address. You can use this value, or change it to another secure username.

guides/v2.1/cloud/before/before-setup-env-install.md

@@ -202,7 +202,7 @@ To verify the Integration master branch environment, log into the Project Web In
 
 With these steps completed, you should have:
 
-* Magento Commerce account and initial project setup and master branch
+* A {{site.data.var.ee}} account and initial project setup and master branch
 * A local workspace configured with installations of required software, Magento Cloud CLI, and Magento
 * SSH keys set up
 * The Magento file system owner configured

guides/v2.1/cloud/before/before-workspace.md

@@ -23,7 +23,7 @@ This section walks through the steps for first time merchants with Magento, Mage
 
 ## Set up an account {#newaccount}
 
-To begin working with a project and develop your store, you should have received an e-mail invitation to [create a Magento Commerce (Cloud) account](https://accounts.magento.cloud). The account provides access to your project for Magento development and deployment across all supported environments.
+To begin working with a project and develop your store, you should have received an e-mail invitation to [create a {{site.data.var.ece}} account](https://accounts.magento.cloud). The account provides access to your project for Magento development and deployment across all supported environments.
 
 You should receive an e-mail invitation to verify and access the project. If you don't see the invitation, check your junk e-mail folder. Click the **Verify my account** option in the email to verify and access your project account.
 

guides/v2.1/cloud/composer-packages/patch-notes.md

@@ -1,6 +1,6 @@
 ---
 group: cloud-guide
-title: Magento Commerce (Cloud) package updates
+title: Magento Commerce Cloud package updates
 functional_areas:
   - Cloud
   - Setup