[DOC-299] More global branding updates

magento · May 19, 2021 · a2b34ee · a2b34ee
1 parent 3f91446
commit a2b34ee
Show file tree

Hide file tree

Showing 32 changed files with 585 additions and 555 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # Adobe Commerce Developer Documentation
 
-Welcome! This site contains the latest Commerce developer documentation for ongoing Magento 2.x releases (now Adobe Commerce). For additional information, see our [Contribution Guide](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md).
+Welcome! This site contains the latest Adobe Commerce and Magento Open Source developer documentation for ongoing releases of both products. For additional information, see our [Contribution Guide](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md).
 
 ## Contributors
 
-Our goal is to provide the Commerce community with comprehensive and quality technical documentation. We believe that to accomplish that goal we need experts from the community to share their knowledge with us and each other. We are thankful to all of our contributors for improving Commerce documentation.
+Our goal is to provide the Commerce and Open Source communities with comprehensive and quality technical documentation. We believe that to accomplish that goal we need experts from the community to share their knowledge with us and each other. We are thankful to all of our contributors for improving the documentation.
 
 ![](https://raw.githubusercontent.com/wiki/magento/magento2/images/dev_docs_contributors.png)
 
@@ -144,7 +144,7 @@ exclude:
 
 ## Building old versions
 
-The published website contains documentation for the latest Commerce releases only. For cases, when you need to view the content as it was for an earlier release, we created [tags](https://github.com/magento/devdocs/tags) in this repository. Typically, they point at the commit when the release notes were finalized and published.
+The published website contains documentation for the most current Adobe Commerce and Magento Open Source releases only. For cases, when you need to view the content as it was for an earlier release, we created [tags](https://github.com/magento/devdocs/tags) in this repository. Typically, they point at the commit when the release notes were finalized and published.
 
 To view the list of available tags:
 

diff --git a/_config.yml b/_config.yml
@@ -53,14 +53,14 @@ defaults:
       github_link: true
       # Enables the 'Give us feedback' appearances on pages
       feedback_link: true
-  
-  - 
+
+  -
     scope:
       path: guides/v2.3
     values:
       guide_version: '2.3'
-  
-  - 
+
+  -
     scope:
       path: guides/v2.4
     values:
@@ -74,7 +74,7 @@ defaults:
       github_link: false
       feedback_link: false
 
-  - 
+  -
     scope:
       path: mbi
     values:
@@ -101,7 +101,7 @@ defaults:
       github_repo: https://github.com/magento/magento2-functional-testing-framework/
       functional_areas:
         - Test
-  - 
+  -
     scope:
       path: page-builder
     values:
@@ -110,7 +110,7 @@ defaults:
       feedback_link: false
       ee_only: true
 
-  - 
+  -
       scope:
         path: page-builder-migration
       values:
@@ -126,7 +126,7 @@ defaults:
       group: module-reference-guide-2_3
       github_link: false
       feedback_link: false
-  
+
   -
     scope:
       path: guides/v2.4/mrg
@@ -135,13 +135,13 @@ defaults:
       github_link: false
       feedback_link: false
 
-  - 
+  -
     scope:
       path: guides/v2.3/install-gde
     values:
       group: installation-guide
-  
-  - 
+
+  -
     scope:
       path: guides/v2.4/install-gde
     values:
@@ -166,7 +166,7 @@ plugins:
 optional_front_matter:
   remove_originals: true
 
-# Configuration options for the jekyll-relative-links plugin. 
+# Configuration options for the jekyll-relative-links plugin.
 # Exclude all .md directories and files except page-builder/ to prevent painfully long build times.
 
 relative_links:

diff --git a/src/_data/codebase/v2_3/mrg/ce/Analytics.yml b/src/_data/codebase/v2_3/mrg/ce/Analytics.yml
@@ -5,13 +5,13 @@ release: 2.3.7
 github_path: app/code/Magento/Analytics/README.md
 last_modified_at: '2019-09-15 22:49:37 +0100'
 content: |-
-  The Magento_Analytics module integrates your Magento instance with the [Adobe Commerce Reporting (ACR)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.3/advanced-reporting/modules.html) functionality.
+  The Magento_Analytics module integrates your Magento instance with the [Adobe Commerce Reporting](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.3/advanced-reporting/modules.html) functionality.
 
   The module implements the following functionality:
 
-  - Enabling subscription to Adobe Commerce Reporting (ACR) and automatic re-subscription
+  - Enabling subscription to Adobe Commerce Reporting and automatic re-subscription
   - Declaring the configuration schemas for report data collection
-  - Collecting the Magento instance data as reports for ACR
+  - Collecting the Magento instance data as reports for Commerce Reporting
   - Introducing API that provides the collected data
   - Extending Magento configuration with the module parameters:
       - Subscription status (enabled/disabled)
@@ -36,7 +36,7 @@ content: |-
 
   ## Subscription Process
 
-  The subscription to the ACR service is enabled during the installation process of the Analytics module. Each administrator will be notified of these new features upon their initial login to the Admin Panel.
+  The subscription to the Commerce Reporting service is enabled during the installation process of the Analytics module. Each administrator will be notified of these new features upon their initial login to the Admin Panel.
 
   ## Analytics Settings
 

diff --git a/src/_data/codebase/v2_4/mrg/ce/Analytics.yml b/src/_data/codebase/v2_4/mrg/ce/Analytics.yml
@@ -5,13 +5,13 @@ release: 2.4.2
 github_path: app/code/Magento/Analytics/README.md
 last_modified_at: '2020-12-10 20:10:41 -0600'
 content: |-
-  The Magento_Analytics module integrates your Magento instance with the [Adobe Commerce Reporting (ACR)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html) functionality.
+  The Magento_Analytics module integrates your Magento instance with the [Adobe Commerce Reporting](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html) functionality.
 
   The module implements the following functionality:
 
-  - Enabling subscription to Adobe Commerce Reporting (ACR) and automatic re-subscription
+  - Enabling subscription to Adobe Commerce Reporting and automatic re-subscription
   - Declaring the configuration schemas for report data collection
-  - Collecting the Magento instance data as reports for ACR
+  - Collecting the Magento instance data as reports for Commerce Reporting
   - Introducing API that provides the collected data
   - Extending Magento configuration with the module parameters:
     - Subscription status (enabled/disabled)
@@ -37,7 +37,7 @@ content: |-
 
   ## Subscription Process
 
-  The subscription to the ACR service is enabled during the installation process of the Analytics module. Each administrator will be notified of these new features upon their initial login to the Admin Panel.
+  The subscription to the Commerce Reporting service is enabled during the installation process of the Analytics module. Each administrator will be notified of these new features upon their initial login to the Admin Panel.
 
   ## Analytics Settings
 

diff --git a/src/_data/main-nav.yml b/src/_data/main-nav.yml
@@ -47,7 +47,7 @@
 
     - label: Functional Testing
       children:
-        - label: Commerce application testing
+        - label: Application testing
           url: /cloud/docker/docker-mftf.html
           versionless: true
 
@@ -61,7 +61,7 @@
     - label: Installation Guide
       url: /install-gde/install-flow-diagram.html
 
-    - label: Commerce Extensions Guide
+    - label: Extensions Guide
       url: /extensions/
       versionless: true
 
@@ -136,7 +136,7 @@
     - label: API
       children:
 
-        - label: Get Started with Commerce Web APIs
+        - label: Get Started with our Web APIs
           url: /get-started/bk-get-started-api.html
 
         - label: REST API Reference
@@ -152,15 +152,15 @@
           url: /marketplace/eqp/v1/api.html
           versionless: true
 
-        - label: Business Intelligence API
+        - label: Commerce Reporting API
           url: /mbi/docs/getting-started.html
           versionless: true
 
 
 - label: Testing
   children:
 
-    - label: Commerce Testing Guide
+    - label: Application Testing Guide
       url: /test/testing.html
 
     - label: Functional Acceptance Testing (MFTF)
@@ -231,7 +231,7 @@
     - label: Customize Checkout
       url: /howdoi/checkout/checkout_overview.html
 
-    - label: Commerce Support
+    - label: Support
       url: /community/resources/support.html
       versionless: true
 

diff --git a/src/_data/toc/architecture-guide.yml b/src/_data/toc/architecture-guide.yml
@@ -25,7 +25,7 @@ pages:
 
         - label: Persistence layer
           url: /architecture/archi_perspectives/persist_layer.html
-        
+
         - label: Presentation layer
           url: /architecture/archi_perspectives/present_layer.html
 
@@ -35,7 +35,7 @@ pages:
     - label: Coding Standards
       url: /coding-standards/bk-coding-standards.html
 
-    - label: Commerce Framework
+    - label: Commerce and Magento Framework
       url: /architecture/archi_perspectives/framework.html
 
     - label: Modules and Extensibility

diff --git a/src/_data/toc/cloud-guide.yml b/src/_data/toc/cloud-guide.yml
@@ -130,15 +130,15 @@ pages:
           url: /cloud/before/before-workspace.html
           versionless: true
           children:
-            - label: Install Commerce prerequisites
+            - label: Install prerequisites
               url: /cloud/before/before-workspace-magento-prereqs.html
               versionless: true
 
             - label: Enable SSH keys
               url: /cloud/before/before-workspace-ssh.html
               versionless: true
 
-            - label: Set up the Commerce file system owner
+            - label: Set up the file system owner
               url: /cloud/before/before-workspace-file-sys-owner.html
               versionless: true
 
@@ -177,16 +177,16 @@ pages:
         - label: Upgrade
           url: /cloud/docker/docker-upgrade.html
           versionless: true
-              
+
         - label: Use Docker
           url: /cloud/docker/docker-launch.html
           versionless: true
 
-          children: 
+          children:
             - label: Production mode
               url: /cloud/docker/docker-mode-production.html
               versionless: true
- 
+
             - label: Developer mode
               url: /cloud/docker/docker-mode-developer.html
               versionless: true
@@ -214,30 +214,30 @@ pages:
             - label: Xdebug for Docker
               url: /cloud/docker/docker-development-debug.html
               versionless: true
-  
+
             - label: Extend Docker
               url: /cloud/docker/docker-extend.html
               versionless: true
 
             - label: Add Blackfire.io service
               url:  /cloud/docker/docker-config-blackfire-io.html
               versionless: true
-              
+
         - label: Docker container architecture
           url: /cloud/docker/docker-containers.html
           versionless: true
           children:
             - label: Service containers
               url: /cloud/docker/docker-containers-service.html
               versionless: true
-    
+
             - label: CLI containers
               url: /cloud/docker/docker-containers-cli.html
               versionless: true
 
         - label: Functional Testing
           children:
-            - label: Commerce application testing
+            - label: Application testing
               url: /cloud/docker/docker-test-app-mftf.html
               versionless: true
 
@@ -252,7 +252,7 @@ pages:
         - label: Get support for Cloud Docker
           url: /cloud/docker/docker-troubleshooting.html
           versionless: true
-        
+
     - label: Integrations
       url: /cloud/integrations/cloud-integrations.html
       versionless: true
@@ -277,11 +277,11 @@ pages:
       url: /cloud/setup/first-time-setup-import-first-steps.html
       versionless: true
       children:
-        - label: Prepare your existing Adode Commerce system
+        - label: Prepare your existing system
           url: /cloud/setup/first-time-setup-import-prepare.html
           versionless: true
 
-        - label: Import Adode Commerce code
+        - label: Import code
           url: /cloud/setup/first-time-setup-import-import.html
           versionless: true
 
@@ -297,7 +297,7 @@ pages:
           url: /cloud/live/paypal-onboarding.html
           versionless: true
 
-        - label: Set up B2B for Adobe Commerce
+        - label: Set up B2B
           url: /cloud/configure/setup-b2b.html
           versionless: true
 
@@ -335,7 +335,7 @@ pages:
             - label: Customize error and maintenance pages
               url: /cloud/cdn/cloud-fastly-custom-response.html
               versionless: true
-              
+
         - label: Web Application Firewall
           url: /cloud/cdn/fastly-waf-service.html
           versionless: true
@@ -445,7 +445,7 @@ pages:
             - label: Set up Elasticsearch service
               url: /cloud/project/services-elastic.html
               versionless: true
-    
+
             - label: Set up RabbitMQ service
               url: /cloud/project/services-rabbit.html
               versionless: true
@@ -570,7 +570,7 @@ pages:
       url: /cloud/trouble/trouble.html
       versionless: true
       children:
-        
+
         - label: Troubleshoot deployment
           url: /cloud/trouble/troubleshoot-deployment.html
           versionless: true
@@ -623,7 +623,7 @@ pages:
           url: /cloud/project/project-patch.html
           versionless: true
 
-        - label: Upgrade Commerce version
+        - label: Upgrade version
           url: /cloud/project/project-upgrade.html
           versionless: true
 

diff --git a/src/_data/toc/compliance.yml b/src/_data/toc/compliance.yml
@@ -14,7 +14,7 @@ pages:
       url: /compliance/industry-compliance.html
 
     - label: Privacy Regulations
-    
+
       children:
 
         - label: CCPA
@@ -37,6 +37,6 @@ pages:
       versionless: true
       children:
 
-        - label: Commerce Privacy JavaScript Library
+        - label: Privacy JavaScript Library
           versionless: true
           url: /compliance/privacy/magento-privacy-js-library.html