Merge branch 'master' into hg-mc1329-orphan

Author: bdenham

src/_data/toc/software-update-guide.yml

@@ -21,26 +21,26 @@ pages:
         - label: Update and upgrade checklist
           url: /comp-mgr/prereq/prereq_compman-checklist.html
 
-    - label: Safe Upgrade Tool
-      url: /safe-upgrade-tool/introduction.html
+    - label: Upgrade Compatibility Tool
+      url: /upgrade-compatibility-tool/introduction.html
       versionless: true
       edition: ee-only
       children:
 
         - label: Prerequisites
-          url: /safe-upgrade-tool/prerequisites.html
+          url: /upgrade-compatibility-tool/prerequisites.html
           versionless: true
 
         - label: Install
-          url: /safe-upgrade-tool/install.html
+          url: /upgrade-compatibility-tool/install.html
           versionless: true
 
         - label: Run the tool
-          url: /safe-upgrade-tool/run.html
+          url: /upgrade-compatibility-tool/run.html
           versionless: true
 
         - label: Developer information
-          url: /safe-upgrade-tool/developer.html
+          url: /upgrade-compatibility-tool/developer.html
           versionless: true
 
     - label: Magento Marketplace example

src/_data/whats-new.yml

@@ -30,7 +30,7 @@ entries:
   link: https://github.com/magento/devdocs/pull/8547
   contributor: dobooth
   profile: https://github.com/dobooth
-- description: Added the [Safe Upgrade Tool](https://devdocs.magento.com/safe-upgrade-tool/introduction.html)
+- description: Added the [Upgrade Compatibility Tool](https://devdocs.magento.com/upgrade-compatibility-tool/introduction.html)
     topics to the Software Update Guide section.
   versions: ''
   type: Major Update, New Topic
@@ -272,7 +272,7 @@ entries:
   contributor: jeff-matthews
   profile: https://github.com/jeff-matthews
 - description: Reorganized the [system requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
-    pages in the Magento Installation Guide to to make it more coherent.
+    pages in the Magento Installation Guide to make it more coherent.
   versions: 2.3.x, 2.4.x
   type: Major Update
   date: November 5, 2020

src/_includes/layout/page-header.html

@@ -42,9 +42,9 @@ <h2 class="page-subtitle no_toc">{{ page.subtitle }}</h2>
   </div>
   {% endif %}
 
-  {% if page.url contains "safe-upgrade-tool/" %}
+  {% if page.url contains "upgrade-compatibility-tool/" %}
   <div class="message-banner">
-    This tool is an ALPHA version with limited scope, available for all Magento Commerce merchants, and only validating PHP Magento APIs and GraphQL schema. If you are a Magento Commerce user you can download it at the <a href="https://repo.magento.com/">Magento repo</a>.
+    The Upgrade Compatibility Tool is an ALPHA version with limited scope, available for all Magento Commerce merchants, and only validating PHP Magento APIs and GraphQL schema. If you are a Magento Commerce user you can download it at the <a href="https://repo.magento.com/">Magento repo</a>.
   </div>
   {% endif %}
 

src/cloud/project/privatelink-service.md

@@ -154,7 +154,7 @@ To test the connection to the VPC endpoint service:
    ```
    {:.no-copy}
 
-1. Run the following command to to ensure the service is listening on VM:
+1. Run the following command to ensure the service is listening on VM:
 
    ```bash
    netstat -na |grep <port>

src/cloud/project/project-upgrade.md

@@ -16,18 +16,20 @@ You can upgrade the core {{site.data.var.ee}} code base to a newer version. Befo
 
 Review the [{{site.data.var.ece}} service versions][version compatibility matrix] information for the latest software version requirements. Your upgrade tasks may include the following:
 
--  Update your PHP version Elasticsearch version, and other services
--  Convert an older configuration management file
--  Update the `.magento.app.yaml` file with new settings for hooks and environment variables
--  Upgrade third-party extensions to the latest supported version
--  Update the `.gitignore` file
+-  Update PHP, Elasticsearch, and other services for compatibility with new Magento version. See [Change service version].
+-  Convert an older configuration management file.
+-  Update the `.magento.app.yaml` file with new settings for hooks and environment variables.
+-  Upgrade third-party extensions to the latest supported version.
+-  Update the `.gitignore` file.
 
 {:.bs-callout-info}
 If you upgrade the PHP version, you must also submit a Support ticket to update the New Relic service.
 
 ### Configuration management
 
-If you are upgrading from 2.1.4 or later to 2.2.x or later and use [Configuration Management], you need to migrate the `config.local.php` file. Older versions used a `config.local.php` file for Configuration Management, but version 2.2.0 and later use the `config.php` file. This file works exactly like the `config.local.php` file, but it has different configuration settings that include a list of your enabled modules and additional configuration options.
+Older versions of {{site.data.var.ee}}, such as 2.1.4 or later to 2.2.x or later, used a `config.local.php` file for Configuration Management. {{site.data.var.ee}} version 2.2.0 and later use the `config.php` file, which works exactly like the `config.local.php` file, but it has different configuration settings that include a list of your enabled modules and additional configuration options.
+
+When upgrading from an older version, you must migrate the `config.local.php` file to use the newer `config.php` file. Use the following steps to backup your configuration file and create a new one.
 
 {:.procedure}
 To create a temporary `config.php` file:
@@ -302,6 +304,7 @@ To resolve the error:
 <!--Link definitions-->
 [.magento.app.yaml]: {{site.baseurl}}/cloud/project/magento-app.html
 [Configuration Management]: {{site.baseurl}}/cloud/live/sens-data-over.html
+[Change service version]: {{site.baseurl}}/cloud/project/services.html#change-service-version
 [Examine the logs]: {{site.baseurl}}/cloud/project/log-locations.html
 [extensions section of the .magento.app.yaml file]: {{site.baseurl}}/cloud/project/magento-app.html#configure-php-options
 [Fastly CDN module for Magento 2]: {{site.baseurl}}/cloud/cdn/cloud-fastly.html#fastly-cdn-module-for-magento-2

src/cloud/release-notes/mcd-release-notes.md

@@ -155,7 +155,7 @@ The release notes include:
 
       -  Added the ability to customize the [Elasticsearch container configuration]({{ site.baseurl }}/cloud/docker/docker-containers-service.html#elasticsearch-container) when you generate the Docker compose configuration file.<!--MCLOUD-3059-->
 
-      -  Added the `--no-es` option to the service configuration options for generating the Docker Compose configuration file. Use this option to skip the Elasticsearch container installation and and use MySQL search instead. This option is supported only for Magento versions 2.3.5 and earlier.<!--MCLOUD-3766-->
+      -  Added the `--no-es` option to the service configuration options for generating the Docker Compose configuration file. Use this option to skip the Elasticsearch container installation and use MySQL search instead. This option is supported only for Magento versions 2.3.5 and earlier.<!--MCLOUD-3766-->
 
    -  {:.new}**FPM-XDEBUG container**—Added a service configuration option to install and configure Xdebug for debugging PHP in your Cloud Docker environment. See [Configure Xdebug]({{site.baseurl}}/cloud/docker/docker-development-debug.html).<!--MCLOUD-4098-->
 

src/guides/v2.3/b2b/negotiable-checkout.md

@@ -601,7 +601,7 @@ An order ID, such as `83`
 
 ### Return payment information
 
-This call returns returns payment information and all information from the `totals` object.
+This call payment information and all information from the `totals` object.
 
 **Sample Usage:**
 

src/guides/v2.3/comp-mgr/bk-compman-upgrade-guide.md

@@ -54,7 +54,7 @@ Related topics
 Complete the tasks discussed in [Prerequisites].
 
  {:.bs-callout-info}
-See the [Safe Upgrade Tool ALPHA]({{site.baseurl}}/safe-upgrade-tool/introduction.html) for more information about the new Magento CLI tool that helps you update your Magento software.
+See the [Upgrade Compatibility Tool ALPHA]({{site.baseurl}}/upgrade-compatibility-tool/introduction.html) page for more information about the new Magento command line tool that helps you update your Magento software.
 
 <!-- ABBREVIATIONS -->
 

src/guides/v2.3/extension-dev-guide/framework/datetime.md

@@ -48,4 +48,5 @@ use Magento\Framework\Stdlib\DateTime;
     {
     return $this->dataTime->formatDate(time());
     }
+...
 ```

src/guides/v2.3/extension-dev-guide/xss-protection.md

@@ -171,7 +171,7 @@ parentElement.appendChild(newDiv);
 
 #### UI component data providers
 
-UI component data providers pass dynamic (user generated) data to UI components. The data they return is being rendered in order to support component dynamic linking. Since user data is supposed to be treated a a literal value which is not refering to any other component, rendering of these properties must be disabled. See [UI component data providers](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.html) to read more about data providers and component linking.
+UI component data providers pass dynamic (user generated) data to UI components. The data they return is being rendered in order to support component dynamic linking. Since user data is supposed to be treated as a literal value which is not refering to any other component, rendering of these properties must be disabled. See [UI component data providers](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.html) to read more about data providers and component linking.
 
 ```php
 $uiData = ['linkProperty' => '${ $.otherComponent.value }'];