Merge branch 'Live-Search-install-update' of https://github.com/magento-devdocs/devdocs into Live-Search-install-update

Author: ccondra

src/_data/toc/cloud-guide.yml

@@ -558,7 +558,7 @@ pages:
       versionless: true
       children:
         - label: Launch checklist
-          url: /cloud/live/go-live-checklist.html
+          url: /cloud/live/site-launch-checklist.html
           versionless: true
 
         - label: Launch steps

src/_data/toc/php-developer-guide.yml

@@ -312,6 +312,9 @@ pages:
         - label: Brute force attacks
           url: /extension-dev-guide/security/anti-brute-force.html
 
+        - label: CSRF
+          url: /extension-dev-guide/security/csrf.html
+
     - label: Versioning
       url: /extension-dev-guide/versioning/
       children:

src/_data/var.yml

@@ -20,7 +20,7 @@ mbi: Adobe Commerce Reporting
 
 # Cloud product name variables
 
-ece: Cloud for Adobe Commerce
+ece: Adobe Commerce on cloud infrastructure
 ece-release-date: July 29, 2021
 csuite: Cloud Suite for Commerce
 

src/_includes/cloud/admin-ui-login-step.md

@@ -1 +1 @@
-1. [Log in]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html#admin) to the Magento Admin UI.
+1. [Log in]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html#admin) to the Admin UI.

src/_includes/cloud/auth-json.md

@@ -1,4 +1,4 @@
-Because the Composer repository that contains {{site.data.var.ece}} requires authentication, you must add a file named `auth.json` to your project's root directory. This file contains your authentication keys. Without `auth.json`, the Magento software won't download.
+Because the Composer repository that contains {{site.data.var.ece}} requires authentication, you must add a file named `auth.json` to your project's root directory. This file contains your authentication keys. Without `auth.json`, the software won't download.
 
 Add `auth.json` in your {{site.data.var.ece}} project root folder if there isn't one already.
 

src/_includes/cloud/beta-release-content-warning.md

@@ -1,4 +1,4 @@
 {:.bs-callout-warning}
 This is beta documentation for functionality
-that will be available after the Magento 2.4 release. Content in this version
+that will be available after the {{site.data.var.ee}} 2.4 release. Content in this version
 is subject to change.

src/_includes/cloud/cli-get-started.md

@@ -3,9 +3,9 @@ To get started with environment branches:
 
 1. On your local workstation, change to your Cloud project directory.
 
-1. Switch to the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
+1. Switch to the [file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
 
-1. Log in to your Magento project.
+1. Log in to your project.
 
    ```bash
    magento-cloud login

src/_includes/cloud/cloud-fastly-manage-vcl-from-admin.md

@@ -1,6 +1,6 @@
 ## Modify the custom VCL snippet
 
-1. [Log in]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html#admin) to the Magento Admin UI.
+1. [Log in]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html#admin) to the Admin UI.
 
 1. Click **Stores** > **Settings** > **Configuration** > **Advanced** > **System**.
 
@@ -19,15 +19,15 @@ The *Custom VCL snippets* UI option shows only the snippets added through the Ad
 
 ## Delete the custom VCL snippet
 
-You can delete custom VCL snippet code from your Fastly configuration by uploading an empty version of the snippet from the Magento Admin UI, or delete it completely using the Fastly API.
+You can delete custom VCL snippet code from your Fastly configuration by uploading an empty version of the snippet from the Admin UI, or delete it completely using the Fastly API.
 
 -  Upload an empty version of the snippet file to Fastly to remove the VCL logic from the active VCL version:
 
    -  Edit the snippet and delete the **VCL** snippet content.
    -  Save the configuration.
    -  Upload the VCL to Fastly to apply your changes.
 
--  Use the Fastly API [Delete custom VCL snippet]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-vcl) operation to delete the snippet completely, or submit a Magento support ticket to request deletion.
+-  Use the Fastly API [Delete custom VCL snippet]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-vcl) operation to delete the snippet completely, or submit a support ticket to request deletion.
 
 [Manage custom VCL snippets]: {{site.baseurl}}/common/images/cloud/cloud-fastly-manage-snippets.png
 {:width="650px"}

src/_includes/cloud/cloud-fastly-prereqs-custom-vcl.md

@@ -2,4 +2,4 @@
 
 -  Verify the environment configuration for the Fastly service. See [Check Fastly caching]({{ site.baseurl }}/cloud/live/stage-prod-test.html#fastly).
 
--  You must have Admin credentials to access the Magento Cloud Staging and Production environments.
+-  You must have Admin credentials to access the Staging and Production environments.

src/_includes/cloud/composer-name.md

@@ -1,11 +1,11 @@
 ## Composer name of an extension
 
-Although this section discusses how to get the Composer name and version of an extension or module from Magento Marketplace, you can find the name and version of *any* module (whether or not you purchased it on Marketplace) in the Composer file of the module. Open the `composer.json` file in a text editor and note the `"name"` and `"version"` values.
+Although this section discusses how to get the Composer name and version of an extension or module from Commerce Marketplace, you can find the name and version of *any* module (whether or not you purchased it on Marketplace) in the Composer file of the module. Open the `composer.json` file in a text editor and note the `"name"` and `"version"` values.
 
 {:.procedure}
-To get the Composer name of a module from the Magento Marketplace:
+To get the Composer name of a module from the Commerce Marketplace:
 
-1. Log in to [Magento Marketplace](https://marketplace.magento.com) with the username and password you used to purchase the component.
+1. Log in to [Commerce Marketplace](https://marketplace.magento.com) with the username and password you used to purchase the component.
 
 1. In the upper right corner, click **Username** > **My Account**.