Branding and misc fixes

Final pass for Magento and Magneto Fix some sub-headings Remove old include file for Google channel
geryduyck · Sep 16, 2021 · 6311d73 · 6311d73
1 parent f889ba4
commit 6311d73
Show file tree

Hide file tree

Showing 73 changed files with 174 additions and 185 deletions.
diff --git a/src/_data/main-nav.yml b/src/_data/main-nav.yml
@@ -185,7 +185,7 @@
   url: /stores/configuration.html
   children:
 
-  - label: Magento Modes
+  - label: Commerce Modes
     url: "/magento/installation-modes.html"
 
   - label: General

diff --git a/src/_data/toc/config-ref.yml b/src/_data/toc/config-ref.yml
@@ -1,7 +1,7 @@
 ---
 label: Configuration Reference
 pages:
-- label: Magento Modes
+- label: Commerce Modes
   url: "/magento/installation-modes.html"
 - label: General
   url: "/configuration/general.html"
@@ -190,7 +190,7 @@ pages:
 - label: Services
   url: "/configuration/services.html"
   children:
-  - label: Magento Web API
+  - label: Web API
     url: "/configuration/services/magento-web-api.html"
   - label: Commerce Services
     url: "/configuration/services/saas.html"

diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml
@@ -317,7 +317,7 @@ entries:
   - Major update
   - New topic
 - description: Updated [Security Scan](https://docs.magento.com/user-guide/magento/security-scan.html)
-    for a new feature added to the Magento Scan Tool that enables merchants to submit
+    for a new feature added to the Scan Tool that enables merchants to submit
     PWA stores for scanning.
   versions: 2.4.x
   type: Major update
@@ -883,7 +883,7 @@ entries:
   date: December 2, 2020
   link: https://github.com/magento/merchdocs/pull/874
 - description: Updated the [Gift Options configuration reference](https://docs.magento.com/user-guide/configuration/sales/sales.html#gift-options)
-    to include additional fields available in Magento Commerce.
+    to include additional fields available in Adobe Commerce.
   versions: 2.4.x
   type: Major update
   date: November 30, 2020
@@ -983,7 +983,7 @@ entries:
   link: https://github.com/magento/merchdocs/pull/719
 - description: The [Site-Wide Analysis Tool](https://docs.magento.com/user-guide/reports/site-wide-analysis-tool.html)
     (SWAT) provides 24/7 real-time performance monitoring, reports and recommendations
-    to ensure the security and operability of Magento Commerce Cloud installations.
+    to ensure the security and operability of Adobe Commerce on cloud infrastructure.
   versions: 2.4.1
   type: New topic
   date: October 15, 2020

diff --git a/src/_includes/backup-deprecated.md b/src/_includes/backup-deprecated.md
@@ -1,8 +1,8 @@
 {:.bs-callout-info}
-**Disabled feature:** Magento backup is disabled by default. Enabling this function may require developer assistance. See the following Magento DevDocs topic to enable backups: [Back up and roll back the file system, media, and database][1].
+**Disabled feature:** Backup is disabled by default. Enabling this function may require developer assistance. See the following developer documentation topic to enable backups: [Back up and roll back the file system, media, and database][1].
 
 {:.bs-callout-info}
-**Deprecation Notice!** Magento backup features are deprecated as of v2.3.0. We recommend that all merchants investigate additional backup technologies and binary backup tools (such as [Percona XtraBackup][2]).
+**Deprecation Notice!** Backup features are deprecated as of v2.3.0. We recommend that all merchants investigate additional backup technologies and binary backup tools (such as [Percona XtraBackup][2]).
 
 [1]: {{ site.devdocs_url }}/guides/v{{ site.version }}/install-gde/install/cli/install-cli-backup.html
 [2]: https://www.percona.com/software/mysql-database/percona-xtrabackup
diff --git a/src/_includes/flush-cache.md b/src/_includes/flush-cache.md
@@ -1,3 +1,3 @@
 {:.bs-callout-info}
 **Important:**
-Always [flush the cache]({% link system/cache-management.md %}) after installing or upgrading Magento, or any extensions and modules.
+Always [flush the cache]({% link system/cache-management.md %}) after installing or upgrading Commerce, or any extensions and modules.
diff --git a/src/_includes/product-approval-links.md b/src/_includes/product-approval-links.md
diff --git a/src/_includes/web-setup-deprecate.md b/src/_includes/web-setup-deprecate.md
@@ -1,2 +1,2 @@
 {:.bs-callout-warning}
-Starting with Adobe Commerce and Magento Open Source 2.4.0, the Web Setup Wizard is removed, and you must use the command line to [install]({{ site.devdocs_url }}/guides/v{{ site.version }}/install-gde/install/cli/install-cli.html) or [upgrade]({{ site.devdocs_url }}/guides/v{{ site.version }}/comp-mgr/cli/cli-upgrade.html) Magento, as well as [modules]({{ site.devdocs_url }}/guides/v{{ site.version }}/comp-mgr/upgrade-module.html) and [extensions]({{ site.devdocs_url }}/extensions/install/).
+Starting with Adobe Commerce and Magento Open Source 2.4.0, the Web Setup Wizard is removed, and you must use the command line to [install]({{ site.devdocs_url }}/guides/v{{ site.version }}/install-gde/install/cli/install-cli.html) or [upgrade]({{ site.devdocs_url }}/guides/v{{ site.version }}/comp-mgr/cli/cli-upgrade.html) your instance, as well as [modules]({{ site.devdocs_url }}/guides/v{{ site.version }}/comp-mgr/upgrade-module.html) and [extensions]({{ site.devdocs_url }}/extensions/install/).
diff --git a/src/configuration/advanced/admin.md b/src/configuration/advanced/admin.md
@@ -73,9 +73,9 @@ Stores > Settings > [Configuration]({% link stores/configuration.md %}) > [Adva
 
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
-|Use Custom Admin URL|Global|Determines if a custom URL is used to access the Magento Admin. Options: Yes / No|
-|Custom Admin URL|Global|Specifies a custom URL to access the Magento Admin. By default, the Admin URL is the same as the base URL.<br/>**Important:** The Admin URL must be in the same Magento installation, and have the same document root as the storefront.|
-|Use Custom Admin Path|Global|Determines if a custom path is used to access the Magento Admin. The default path is `admin`. Options: Yes / No|
+|Use Custom Admin URL|Global|Determines if a custom URL is used to access the Admin. Options: Yes / No|
+|Custom Admin URL|Global|Specifies a custom URL to access the Admin. By default, the Admin URL is the same as the base URL.<br/>**Important:** The Admin URL must be in the same Commerce installation, and have the same document root as the storefront.|
+|Use Custom Admin Path|Global|Determines if a custom path is used to access the Admin. The default path is `admin`. Options: Yes / No|
 |Custom Admin Path|Global|Changes the name of the default Admin path to something hard to guess. Enter the custom path name in lowercase characters. For example: `aardvark`|
 
 ## Security
@@ -115,7 +115,7 @@ Stores > Settings > [Configuration]({% link stores/configuration.md %}) > [Adva
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
 |Enable CAPTCHA in Admin|Website|Enables CAPTCHA for the Admin login. Options: Yes / No|
-|Font|Website|Determines the font that is used to display the CAPTCHA. To add your own font, put the font file in the same directory as your Magento instance, and add the declaration to the config.xml file at `app/code/Magento/Captcha/etc` Default font: LinLibertine|
+|Font|Website|Determines the font that is used to display the CAPTCHA. To add your own font, put the font file in the same directory as your Commerce instance, and add the declaration to the config.xml file at `app/code/Magento/Captcha/etc` Default font: LinLibertine|
 |Forms|Website|Determines the form(s) where CAPTCHA is used. Options: Admin Login / Admin Forgot Password|
 |Displaying Mode|Website|Determines when the CAPTCHA appears. Options: <br/>**Always** - CAPTCHA is always required to log in. <br/>**After number of attempts to login** - Displays the Number of Unsuccessful Attempts to Login field. Enter the number of login attempts allowed. A value of 0 (zero) is similar to setting Displaying Mode to Always. This option does not cover the Forgot Password and Create User forms. If CAPTCHA is enabled and set to appear, it is always included on the form.<br />**Note**: To track the number of unsuccessful login attempts, each attempt to log in under one email address and from one IP-address is counted. The maximum number of login attempts allowed from the same IP-address is 1,000. This limitation applies only when CAPTCHA is enabled.|
 |Number of Unsuccessful Attempts to Login|Global|Determines the number of times a person can try to login before the account is locked. To track the number of unsuccessful attempts to log in, the system tracks the login attempts from one email address from a single IP-address. The maximum number of attempts allowed from the same IP address is 1,000. This limitation applies only if CAPTCHA is enabled.|

diff --git a/src/configuration/advanced/system.md b/src/configuration/advanced/system.md
@@ -54,7 +54,7 @@ _MySQL Message Queue Cleanup_
 [_Mail Sending Settings_]({% link system/email-communications.md %})
 
 {:.bs-callout-warning}
-**Security Notice!** We recommend that all merchants immediately set their mail sending configuration to protect against a recently identified potential remote code execution exploit. Until this issue is resolved, we highly recommend that you avoid using [Sendmail][1]{:target="_blank"} for email communications.  In the Mail Sending Settings, make sure that Set Return Path is set to "No". To learn more, see the [Magento Security Center posting][2]{:target="_blank"}.
+**Security Notice!** We recommend that all merchants immediately set their mail sending configuration to protect against a recently identified potential remote code execution exploit. Until this issue is resolved, we highly recommend that you avoid using [Sendmail][1]{:target="_blank"} for email communications.  In the Mail Sending Settings, make sure that Set Return Path is set to "No". To learn more, see the [Security Center posting][2]{:target="_blank"}.
 
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
@@ -71,7 +71,7 @@ _MySQL Message Queue Cleanup_
 
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
-|Installed Currencies|Global|Indicates the currencies that are currently available to the Magento installation. Options include all available currencies, with installed currencies selected.|
+|Installed Currencies|Global|Indicates the currencies that are currently available to the Commerce installation. Options include all available currencies, with installed currencies selected.|
 
 ## Security
 
@@ -103,8 +103,8 @@ _MySQL Message Queue Cleanup_
 
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
-|Enable Scheduled Backup|Global|Determines if the Magento installation is automatically backed up on a regular schedule. Options: Yes / No|
-|Backup Type|Global|Determines the elements of the Magento installation that are included in the backup. Options: Database, Database and Media, System, System (excluding Media)|
+|Enable Scheduled Backup|Global|Determines if the Commerce instance is automatically backed up on a regular schedule. Options: Yes / No|
+|Backup Type|Global|Determines the elements of the Commerce instance that are included in the backup. Options: Database, Database and Media, System, System (excluding Media)|
 |Start Time|Global|Specifies the hour, minute, and second that the scheduled backup begins.|
 |Frequency|Global|Determines how often the scheduled backup takes place. Options: Daily, Weekly, Monthly|
 |Maintenance Mode|Global|Determines if the store is put in Maintenance Mode during the scheduled backup. Options: Yes / No|
@@ -158,7 +158,7 @@ Varnish Caching - Recommended for the production environment.
 [_Storage Configuration for Media - Database_]({% link cms/media-storage.md %})
 
 {:.bs-callout-warning}
-The database media storage method has been deprecated as of Magento 2.4.3.
+The database media storage method has been deprecated as of Adobe Commerce and Magento Open Source 2.4.3.
 
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
@@ -202,7 +202,7 @@ The database media storage method has been deprecated as of Magento 2.4.3.
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
 |Quality|Global|Determines the JPG quality for the resized image. Lower quality reduces the file size. We recommend 80-90% to help reduce file size with high quality.Default: 80|
-|Enable Frontend Resize|Global|Enable to allow Magento to resize large, oversized images you may upload for the Product Details Page. Magento resizing the image files using JavaScript prior to uploading the file. When the image is resized, it keeps the exact proportions, meeting and not exceeding the largest size for Maximum Width or Maximum Height. Default: Yes|
+|Enable Frontend Resize|Global|Enable to allow Commerce to resize large, oversized images you may upload for the Product Details Page. Commerce resizes the image files using JavaScript prior to uploading the file. When the image is resized, it keeps the exact proportions, meeting and not exceeding the largest size for Maximum Width or Maximum Height. Default: Yes|
 |Maximum Width|Global|Determines the maximum pixel width for the image. When the image is resized, it does not exceed this width. Default: 1920|
 |Maximum Height|Global|Determines the maximum pixel height for the image. When the image is resized, it does not exceed this height. Default: 1200|
 
@@ -214,7 +214,7 @@ _Adobe Stock Integration_
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
 |Enabled Adobe Stock|Global|Enables or disables the Adobe Stock Integration.|
-|API Key (Client ID)|Global|An API key is required to connect your Magento store to the Adobe Stock service. For more information about generating this key and configuring this integration, see [Adobe Stock Integration]({% link cms/adobe-stock.md %}).|
+|API Key (Client ID)|Global|An API key is required to connect your store to the Adobe Stock service. For more information about generating this key and configuring this integration, see [Adobe Stock Integration]({% link cms/adobe-stock.md %}).|
 |Client Secret|Global|The Client Secret for your Adobe Stock integration is required. For more information about retrieving this secret and configuring this integration, see [Adobe Stock Integration]({% link cms/adobe-stock.md %}).|
 |Test Connection||Runs a test to verify that the API key is valid for use with the Adobe Stock service.|
 

diff --git a/src/configuration/dotdigital/data-mapping.md b/src/configuration/dotdigital/data-mapping.md
@@ -87,7 +87,7 @@ Stores > Settings > [Configuration]({% link stores/configuration.md %}) > [dotd
 
 ## Custom Attributes
 
-Gives you the ability to create custom mappings to dotdigital, based on the following Magento attributes:
+Gives you the ability to create custom mappings to dotdigital, based on the following attributes:
 
 - Is Confirmed
 - Create In

diff --git a/src/configuration/general/web.md b/src/configuration/general/web.md
@@ -65,7 +65,7 @@ Stores > Settings > [Configuration]({% link stores/configuration.md %}) > [Gene
 {: .field-table }
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
-|Default Web URL|Store View|Indicates the landing page that is associated with the base URL. This is set by default to “cms” to indicate a page from Magento’s content management system. You can also use a different type of landing page, such as a blog. For example, if a blog is installed on the server at magento/blog, you can enter the name of the “blog” folder as a relative path to the selection of pages.|
+|Default Web URL|Store View|Indicates the landing page that is associated with the base URL. This is set by default to “cms” to indicate a page from the Commerce content management system. You can also use a different type of landing page, such as a blog. For example, if a blog is installed on the server at `magento/blog`, you can enter the name of the “blog” folder as a relative path to the selection of pages.|
 |CMS Home Page|Store View|To choose the home page for the store, simply select the CMS page from the list. By default, the CMS Home Page lists the entire selection of CMS pages that are available for your store.|
 |Default No-route URL|Store View|Contains the URL of the default page that you want to appear when a `404 Page not Found` error occurs. The default value is `cms/noroute/index`.|
 |CMS No Route Page|Store View|Identifies a specific CMS page that you want to appear when a 404 Page Not Found error occurs. The default page is 404 Not Found.|

diff --git a/src/configuration/sales-channels/global-settings.md b/src/configuration/sales-channels/global-settings.md
@@ -12,6 +12,6 @@ _Sales Channel Settings_
 |Field|[Scope]({% link configuration/scope.md %})|Description|
 |--- |--- |--- |
 |Clear Log History|Global|Options:<br/><br/>**Once Daily**: Select this option to clear your store's activity history once daily.<br/><br/>**Once Weekly**: Select this option to clear your store's activity history once weekly.<br/><br/>**Once Monthly**: (Default) Select this option to clear your store's activity history once monthly.|
-|Background Tasks (CRON) Source|Global|Select `Magento CRON` in the drop-down. This tells Amazon Sales Channel to used your Magento Cron settings to determine communication and data sync intervals with Amazon Seller Central.|
-|Enable Debug Logging|Global|Select `Enabled` to collect additional synchronization data when troubleshooting is needed.<br/><br/>This option is disabled by default and should only be enabled when needed for troubleshooting, as continued logging will negatively impact performance. If enabled for troubleshooting, it should be disabled when complete.<br/><br/>**Note**: Amazon Sales Channel logging is written to the `{Magento Root}/var/log/channel_amazon.log` file and can be viewed in [developer mode]({% link magento/installation-modes.md %}).|
+|Background Tasks (CRON) Source|Global|Select `Magento CRON` in the drop-down. This tells Amazon Sales Channel to use your Commerce cron settings to determine communication and data sync intervals with Amazon Seller Central.|
+|Enable Debug Logging|Global|Select `Enabled` to collect additional synchronization data when troubleshooting is needed.<br/><br/>This option is disabled by default and should only be enabled when needed for troubleshooting, as continued logging will negatively impact performance. If enabled for troubleshooting, it should be disabled when complete.<br/><br/>**Note**: Amazon Sales Channel logging is written to the `{Commerce Root}/var/log/channel_amazon.log` file and can be viewed in [developer mode]({% link magento/installation-modes.md %}).|
 |Read-Only Mode|Global|Select `Enabled` to block all outgoing state-changing API requests. Potential changes are saved, but not sent, until Read-Only Mode is disabled. To start the data transfers again, select `Disabled`.<br/><br/>When a database is migrated to a new copy of the instance (detected when a store's URL changes in the configuration), Read-Only Mode is automatically enabled.<br/><br/>Read-Only Mode is designed to be used on copies of the Production instance, like Staging or QA, and should not be used on the Production instance.<br/><br/>**Note**: Configuration cache must be cleared for Read-Only Mode to enable.|