Merge branch 'master' into 8-27_integration

Author: dobooth

src/_includes/config/code-backup.md

@@ -1,2 +1,2 @@
 {:.bs-callout-info}
-This is _not_ the same code backup performed by the [bin/magento setup:backup]({{ page.baseurl }}/install-gde/install/cli/install-cli-backup.html) command. This command is intended to be used to back up code for examination by Magento Support.
+This is _not_ the same code backup performed by the [bin/magento setup:backup]({{ page.baseurl }}/install-gde/install/cli/install-cli-backup.html) command. This command is intended to be used to back up code for examination by {{site.data.var.ee}} Support.

src/_includes/install/pre-release.md

@@ -1,2 +1,2 @@
 {:.bs-callout-info}
-{{site.data.var.ee}} customers can access 2.4.x and 2.3.x patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot access pre-releases on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact Magento Support.
+{{site.data.var.ee}} customers can access 2.4.x and 2.3.x patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot access pre-releases on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact {{site.data.var.ee}} Support.

src/community/support.md

@@ -2,16 +2,16 @@
 layout: full-width
 group: community
 subgroup: resources
-title: Magento Support
+title: Adobe Commerce Support
 redirect_from:
   - /community/resources/support.html
 ---
 
-If you have issues, receive error messages, or need additional How To's, see our [Magento Support Knowledge Base](https://support.magento.com). The knowledge base includes a growing amount of troubleshooting, how to, and FAQ articles for Magento 2 Commerce, Commerce (Cloud), and Open Source. We are constantly adding new content for Magento platform, services, modules, and much more.
+If you have issues, receive error messages, or need additional How To's, see our [{{site.data.var.ee}} Support Knowledge Base](https://support.magento.com). The knowledge base includes a growing amount of troubleshooting, how to, and FAQ articles for Magento 2 Commerce, Commerce (Cloud), and Open Source. We are constantly adding new content for Magento platform, services, modules, and much more.
 
 *  Search using keywords to find answers and help
 *  Browse through various categories
 *  Watch videos for more information
 *  Provide feedback as you read articles
 
-New to knowledge bases? See the [Magento Help Center User Guide](https://support.magento.com/hc/en-us/articles/360000913794).
+New to knowledge bases? See the [{{site.data.var.ee}} Help Center User Guide](https://support.magento.com/hc/en-us/articles/360000913794).

src/guides/v2.3/comp-mgr/cli/cli-upgrade.md

@@ -56,7 +56,7 @@ Complete the following prerequisites to prepare your environment before starting
 ## Manage packages
 
 {:.bs-callout-info}
-See the examples at the end of this section for help specifying different release levels. For example, minor release, quality patch, and security patch. {{site.data.var.ee}} customers can access patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot find them on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact Magento Support.
+See the examples at the end of this section for help specifying different release levels. For example, minor release, quality patch, and security patch. {{site.data.var.ee}} customers can access patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot find them on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact {{site.data.var.ee}} Support.
 
 1. Backup the `composer.json` file.
 

src/guides/v2.3/comp-mgr/patching.md

@@ -21,7 +21,7 @@ When the [patch][] program is run, this file is read in and the specified change
 There are three types of patches:
 
 -  **Hotfixes**—Patches that Magento publishes on the [Magento Security Center][].
--  **Individual patches**—Patches that Magento Support creates and distributes on an individual basis.
+-  **Individual patches**—Patches that {{site.data.var.ee}} Support creates and distributes on an individual basis.
 -  **Custom patches**—Unofficial patches that you can create from a git commit.
 
 ### Hotfixes

src/guides/v2.3/config-guide/cli/config-cli-subcommands-spt-util.md

@@ -12,11 +12,11 @@ functional_areas:
 
 ## Overview of the support utilities {#config-cli-spt-utils-over}
 
-The Magento support utilities (also referred to as the [*Data Collector*](http://docs.magento.com/m2/ee/user_guide/system/support-data-collector.html)) enable {{site.data.var.ee}} users to gather troubleshooting information about your system that can be used by our Support team.
+The {{site.data.var.ee}} Support utilities (also referred to as the [*Data Collector*](http://docs.magento.com/m2/ee/user_guide/system/support-data-collector.html)) enable {{site.data.var.ee}} users to gather troubleshooting information about your system that can be used by our Support team.
 
-Magento Support uses these backups (also referred to as *dumps*) to analyze issues that require access to your code. A typical scenario follows:
+{{site.data.var.ee}} uses these backups (also referred to as *dumps*) to analyze issues that require access to your code. A typical scenario follows:
 
-1. You're having an issue with your Magento store and you contact Magento Support.
+1. You're having an issue with your Magento store and you contact {{site.data.var.ee}} Support.
 1. Support determines they need to see your code or database to reproduce the issue.
 1. You back up the code to a `.tar.gz` file.
 
@@ -55,7 +55,7 @@ For example, to create a code backup named `/var/www/html/magento2/var/log/mycod
 bin/magento support:backup:code --name mycodebackup -o /var/www/html/magento2/var/log
 ```
 
-After the command completes, provide the code backup to Magento Support.
+After the command completes, provide the code backup to {{site.data.var.ee}} Support.
 
 ## Create a database backup {#config-cli-spt-utils-db}
 
@@ -91,7 +91,7 @@ Sensitive data includes customer information from the following database tables:
 'sales_order_grid'
 ```
 
-After the command completes, provide the database backup to Magento Support.
+After the command completes, provide the database backup to {{site.data.var.ee}} Support.
 
 ## Troubleshooting: display utilities and paths {#config-cli-spt-utils-trouble}
 

src/guides/v2.3/config-guide/multi-master/multi-master_manual.md

@@ -10,7 +10,7 @@ functional_areas:
 
 ## Overview of manual split database configuration {#config-ee-multidb-manual-over}
 
-If the Magento application is already in production or if you've already installed custom code or components, you might need to configure split databases manually. Before continuing, contact Magento Support to see if this is necessary in your case.
+If the Magento application is already in production or if you've already installed custom code or components, you might need to configure split databases manually. Before continuing, contact {{site.data.var.ee}} Support to see if this is necessary in your case.
 
 Manually splitting databases involves:
 

src/guides/v2.3/install-gde/prereq/php-settings.md

@@ -178,7 +178,7 @@ To set `opcache.ini` options:
 
 ## Troubleshooting
 
-See the following Magento Support articles for help troubleshooting PHP problems:
+See the following {{site.data.var.ee}} Support articles for help troubleshooting PHP problems:
 
 -  [PHP version error or 404 error when accessing Magento in browser](https://support.magento.com/hc/en-us/articles/360033117152-PHP-version-error-or-404-error-when-accessing-Magento-in-browser)
 -  [PHP settings errors](https://support.magento.com/hc/en-us/articles/360034599631-PHP-settings-errors)

src/guides/v2.4/comp-mgr/cli/cli-upgrade.md

@@ -58,7 +58,7 @@ Complete the following prerequisites to prepare your environment before starting
 ## Manage packages
 
 {:.bs-callout-info}
-See the examples at the end of this section for help specifying different release levels. For example, minor release, quality patch, and security patch. {{site.data.var.ee}} customers can access patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot find them on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact Magento Support.
+See the examples at the end of this section for help specifying different release levels. For example, minor release, quality patch, and security patch. {{site.data.var.ee}} customers can access patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot find them on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact {{site.data.var.ee}} Support.
 
 1. Backup the `composer.json` file.
 

src/guides/v2.4/install-gde/prereq/php-settings.md

@@ -195,7 +195,7 @@ To set `opcache.ini` options:
 
 ## Troubleshooting
 
-See the following Magento Support articles for help troubleshooting PHP problems:
+See the following {{site.data.var.ee}} Support articles for help troubleshooting PHP problems:
 
 -  [PHP version error or 404 error when accessing Magento in browser](https://support.magento.com/hc/en-us/articles/360033117152-PHP-version-error-or-404-error-when-accessing-Magento-in-browser)
 -  [PHP settings errors](https://support.magento.com/hc/en-us/articles/360034599631-PHP-settings-errors)