Merge branch 'master' into 2.4.3-release-note-update-hotfix-MC-43059

Author: jfrontain

src/_data/whats-new.yml

@@ -1225,7 +1225,7 @@ entries:
   link: https://github.com/magento/devdocs/pull/8770
   contributor: abukatar
   profile: https://github.com/abukatar
-- description: Added the "Configure product video options from Magento Admin" section
+- description: Added the "Configure product video options from Admin" section
     to the [Configure product video](https://devdocs.magento.com/guides/v2.4/frontend-dev-guide/themes/product-video.html)
     topic.
   versions: 2.3.x, 2.4.x
@@ -1834,7 +1834,7 @@ entries:
   link: https://github.com/magento/devdocs/pull/8311
   contributor: sathiyaaa
   profile: https://github.com/sathiyaaa
-- description: Added a new topic describing how to [customize the Magento Admin design](https://devdocs.magento.com/guides/v2.4/howdoi/admin/customize_admin.html).
+- description: Added a new topic describing how to [customize the Admin design](https://devdocs.magento.com/guides/v2.4/howdoi/admin/customize_admin.html).
   versions: 2.3.x, 2.4.x
   type: New Topic
   date: December 8, 2020
@@ -3601,7 +3601,7 @@ entries:
   link: https://github.com/magento/devdocs/pull/6811
 - description: Improved the instructions to configure Cloud Starter projects to use
     New Relic to add alternative instructions for users who have access to New Relic
-    and the Magento Admin for a site, but do not have access to configure environment
+    and the Admin for a site, but do not have access to configure environment
     variables through the Magento Cloud project. See [Configure New Relic for Starter
     environments](https://devdocs.magento.com/cloud/project/new-relic.html#configure-new-relic-for-starter-environments).
   versions: 2.3.x
@@ -5809,7 +5809,7 @@ entries:
   date: March  1, 2019
   link: https://github.com/magento/devdocs/pull/3841
 - description: "-  Updated the Custom VCL snippets with instructions for using the
-    Magento Admin UI to create and manage VCL snippets.<br/>-  Updated and corrected
+    Admin UI to create and manage VCL snippets.<br/>-  Updated and corrected
     the following examples for using Fastly Edge Dictionaries and custom VCL snippets
     to manage request routing for Magento Commerce Cloud traffic: Set up redirects
     to WordPress backend, Block referrer spam, and Secure access to the Admin UI by
@@ -5841,7 +5841,7 @@ entries:
     Updated the Cloud Docker content to explain how to configure Xdebug.<br/>- Added
     two new environment variables: RESOURCE_CONFIGURATION deploy variable and X_FRAME_CONFIGURATION
     global variable<br/>- Updated the ADMIN variables and clarified the usage of ADMIN
-    variables in the Access your Magento Admin panel page.<br/>- Added an example
+    variables in the Access your Admin page.<br/>- Added an example
     for preloading pages from multiple domains in the WARM_UP_PAGES post-deploy variable.<br/>-
     Deprecated SCD_EXCLUDE_THEMES environment variable.<br/>- Clarified the backup
     and retention statements regarding the most recent 24-hour period.'

src/_includes/comp-man/backup.md

@@ -4,7 +4,7 @@ After you pass all readiness checks, you can back up:
 *  The `pub/media` directory
 *  The Magento 2 database
 
-Backups are stored in the `var/backups` directory and can be restored at any time using the [`magento setup:rollback`]({{ page.baseurl }}/install-gde/install/cli/install-cli-uninstall-mods.html#instgde-cli-uninst-mod-roll) or using the Magento Admin.
+Backups are stored in the `var/backups` directory and can be restored at any time using the [`magento setup:rollback`]({{ page.baseurl }}/install-gde/install/cli/install-cli-uninstall-mods.html#instgde-cli-uninst-mod-roll) or using the Admin.
 
 {:.bs-callout-info}
 Magento backup features must be enabled. For more information and commands, see [Enable backups]({{ page.baseurl }}/install-gde/install/cli/install-cli-backup.html#enable-backups).

src/_includes/comp-man/checklist.md

@@ -35,7 +35,7 @@ Results similar to the following should display:
 * * * * * /usr/bin/php /var/www/magento2/bin/magento setup:cron:run >> /var/www/magento2/var/log/setup.cron.log
 ```
 
-Another symptom of cron not running is the following error in the Magento Admin:
+Another symptom of cron not running is the following error in the Admin:
 
 ![cron isn't running]({{ site.baseurl }}/common/images/compman-cron-not-running.png){:width="500px"}
 

src/_includes/comp-man/checklist_2.2.md

@@ -62,7 +62,7 @@ Results similar to the following should display:
 * * * * * /usr/bin/php /var/www/magento2/bin/magento setup:cron:run >> /var/www/magento2/var/log/setup.cron.log
 ```
 
-Another symptom of cron not running is the following error in the Magento Admin:
+Another symptom of cron not running is the following error in the Admin:
 
 ![cron isn't running]({{ site.baseurl }}/common/images/compman-cron-not-running.png){:width="500px"}
 

src/_includes/config/config-reference-b2b.md

@@ -6,7 +6,7 @@ This section lists variable names and configuration paths available for options
 
 ### B2B Features paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **General** > **B2B Features**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **General** > **B2B Features**.
 
 | Name | Config path | Encrypted? | System-specific? | Sensitive? |
 | -------------- | -------------- | -------------- | -------------- | -------------- |
@@ -24,7 +24,7 @@ This section lists variable names and config paths available for options in the
 
 ### Company configuration paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Customers** > **Company Configuration**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Customers** > **Company Configuration**.
 
 | Name | Config path | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|
@@ -62,7 +62,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Requisition lists paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Customers** > **Requisition Lists**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Customers** > **Requisition Lists**.
 
 | Name | Config path | Encrypted? | System-specific? | Sensitive? |
 | -------------- | -------------- | -------------- | -------------- | -------------- |
@@ -74,7 +74,7 @@ This section lists variable names and config paths available for options in the
 
 ### Sales Emails paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Sales Emails**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Sales Emails**.
 
 | Name | Config path | Encrypted? | System-specific? | Sensitive? |
 | -------------- | -------------- | -------------- | -------------- | -------------- |
@@ -91,7 +91,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Quotes paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Quotes**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Quotes**.
 
 | Name | Config path | Encrypted? | System-specific? | Sensitive? |
 | -------------- | -------------- | -------------- | -------------- | -------------- |
@@ -108,7 +108,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ## Payment method paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Payment Methods**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Payment Methods**.
 
 {:.bs-callout-info}
 The available paths are determined by your choice of Merchant country.

src/_includes/config/config-reference_sensitive.md

@@ -7,7 +7,7 @@ This section lists variable names and configuration paths available for options
 
 ### Web paths sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **General** > **Web**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **General** > **Web**.
 
 | Name  | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -26,15 +26,15 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Currency setup sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **General** > **Currency setup**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **General** > **Currency setup**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
 | Error Email Recipient | `currency/import/error_email` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> | | | ![Sensitive]({{ site.baseurl }}/common/images/cloud_sens.png) |
 
 ### Store email address sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Email Configuration** > **General** > **Store Email Addresses**.
+These configuration values are available in the Admin in **Stores** > Settings > **Email Configuration** > **General** > **Store Email Addresses**.
 
 | Name  | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -51,15 +51,15 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Contacts sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **General** > **Contacts**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **General** > **Contacts**.
 
 | Name  | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
 | Send Emails To | `contact/email/recipient_email` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> | | | ![Sensitive]({{ site.baseurl }}/common/images/cloud_sens.png) |
 
 ### New Relic reporting sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **General** > **New Relic Reporting**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **General** > **New Relic Reporting**.
 
 | Name  | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -76,7 +76,7 @@ This section lists variable names and config paths available for options in the
 
 ### Customer configuration sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Customers** > **Customer Configuration**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Customers** > **Customer Configuration**.
 
 Name  | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -88,7 +88,7 @@ This section lists variable names and config paths available for options in the
 
 ### Catalog sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Catalog** > **Catalog**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Catalog** > **Catalog**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -109,7 +109,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### XML sitemap sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Catalog** > **XML Sitemap**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Catalog** > **XML Sitemap**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -121,7 +121,7 @@ This section lists variable names and config paths available for options in the
 
 ### Shipping settings sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Shipping Settings**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Shipping Settings**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -135,7 +135,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Sales emails sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Sales Emails**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Sales Emails**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -150,23 +150,23 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Checkout sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Checkout**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Checkout**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
 | Send Payment Failed Email Copy To | `checkout/payment_failed/copy_to` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> | | | ![Sensitive]({{ site.baseurl }}/common/images/cloud_sens.png) |
 
 ### Google API sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Google API**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Google API**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
 | Container Id | `google/analytics/container_id` | ![EE-only]({{ site.baseurl }}/common/images/cloud_ee.png) | | | ![Sensitive]({{ site.baseurl }}/common/images/cloud_sens.png) |
 
 ### Shipping methods sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Shipping Methods**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Shipping Methods**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -195,7 +195,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Sales sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Sales**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Sales**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -213,7 +213,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Google API paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Sales** > **Google API**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Sales** > **Google API**.
 
 | Name  | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -225,7 +225,7 @@ This section lists variable names and config paths available for options in the
 
 ### Admin sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Advanced** > **Admin**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Advanced** > **Admin**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -234,7 +234,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### System sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Advanced** > **System**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Advanced** > **System**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -244,7 +244,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Developer sensitive and system-specific paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Advanced** > **Developer**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Advanced** > **Developer**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -256,7 +256,7 @@ This section lists variable names and config paths available for options in the
 
 ### System paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Advanced** > **System**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Advanced** > **System**.
 
 | Name | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|
@@ -267,7 +267,7 @@ These configuration values are available in the Magento Admin in **Stores** > Se
 
 ### Developer paths
 
-These configuration values are available in the Magento Admin in **Stores** > Settings > **Configuration** > **Advanced** > **Developer**.
+These configuration values are available in the Admin in **Stores** > Settings > **Configuration** > **Advanced** > **Developer**.
 
 | Name  | Config path | EE only? | Encrypted? | System-specific? | Sensitive? |
 |--------------|--------------|--------------|--------------|--------------|--------------|