Merge pull request #2528 from magento-commerce/9-13_integration

dobooth · web-flow · commit ecfc3e69fbd7 · 2021-09-13T14:38:57.000-04:00
9 13 integration
diff --git a/src/guides/v2.3/coding-standards/code-standard-demarcation.md b/src/guides/v2.3/coding-standards/code-standard-demarcation.md
@@ -257,7 +257,7 @@ this.element.on('click', function() {
 ```js
 options {
  deleteAction:  '[data-action="delete"]',
- tooltip: '[data-role="tooltip]'
+ tooltip: '[data-role="tooltip"]'
 }
 ...
 this.element.find(this.options.deleteAction).on( ... );
diff --git a/src/guides/v2.3/comp-mgr/patching/mqp.md b/src/guides/v2.3/comp-mgr/patching/mqp.md
@@ -89,7 +89,7 @@ After upgrading to a new version of {{ site.data.var.ee }} or {{ site.data.var.c
 #### Apply individual patches
 
 {:.bs-callout-warning}
-We strongly recommend testing all patches in a staging or development environment before deploying to production. We also strongly recommend backing up your data before applying a patch. See [Back up and roll back the file system][].
+We strongly recommend testing all patches in a staging or development environment before deploying to production. We also strongly recommend backing up your data before applying a patch. See [Back up and roll back the file system]({{ page.baseurl }}/install-gde/install/cli/install-cli-backup.html).
 
 To apply a single patch, run the following command where `MAGETWO-XXXX` is the patch ID specified in the status table:
 
@@ -115,7 +115,7 @@ Consider keeping a list of applied patches in a separate location. You might nee
 #### Revert individual patches
 
 {:.bs-callout-warning}
-We strongly recommend testing all patches in a staging or development environment before deploying to production. We also strongly recommend backing up your data before applying a patch. See [Back up and roll back the file system][].
+We strongly recommend testing all patches in a staging or development environment before deploying to production. We also strongly recommend backing up your data before applying a patch. See [Back up and roll back the file system]({{ page.baseurl }}/install-gde/install/cli/install-cli-backup.html).
 
 To revert a single patch, run the following command where `MAGETWO-XXXX` is the patch ID specified in the status table:
 
diff --git a/src/guides/v2.3/migration/migration-overview-how.md b/src/guides/v2.3/migration/migration-overview-how.md
@@ -24,7 +24,7 @@ The Data Migration Tool splits the migration process into three phases or *modes
 
 ## Steps
 
-The Data Migration Tool uses a list of *steps* within each mode to migrate a particular type of data. For example, in the Settings mode, there are two steps used to migrate the all the settings data: the Stores step and the Settings step. Details about the specific data that is migrated in each of these steps (as well as for steps in the other modes), can be found in the [Data Migration Tool Technical Specification].
+The Data Migration Tool uses a list of *steps* within each mode to migrate a particular type of data. For example, in the Settings mode, there are two steps used to migrate all the settings data: the Stores step and the Settings step. Details about the specific data that is migrated in each of these steps (as well as for steps in the other modes), can be found in the [Data Migration Tool Technical Specification].
 
 ![Migration Overview]
 
diff --git a/src/guides/v2.4/release-notes/commerce-2-4-1.md b/src/guides/v2.4/release-notes/commerce-2-4-1.md
@@ -1052,7 +1052,7 @@ We have fixed hundreds of issues in the Magento 2.4.1 core code.
 
 <!-- ENGCOM-7732 7733-->
 
-*  GraphQL product search now considers configured category permissions. Previously, product search ignored the **Enable** setting (**Stores**  >  **Configuration**  >  **Catalog**  >  **Catalog** > **Category Permissions**). _Fix submitted by Petkovski Marjan in pull request [28757](https://github.com/magento/magento2/pull/28757) and pull request 271 in private repo `partners-magento2ee`_. [GitHub-28563](https://github.com/magento/magento2/issues/28563
+*  GraphQL product search now considers configured category permissions. Previously, product search ignored the **Enable** setting (**Stores**  >  **Configuration**  >  **Catalog**  >  **Catalog** > **Category Permissions**). _Fix submitted by Petkovski Marjan in pull request [28757](https://github.com/magento/magento2/pull/28757) and pull request 271 in private repo `partners-magento2ee`_. [GitHub-28563](https://github.com/magento/magento2/issues/28563)
 
 <!--- MC-31084-->
 
diff --git a/src/guides/v2.4/release-notes/commerce-2-4-3.md b/src/guides/v2.4/release-notes/commerce-2-4-3.md
@@ -1256,7 +1256,7 @@ We have fixed hundreds of issues in the Magento 2.4.3 core code.
 
 <!--- ENGCOM-9073-->
 
-*  `ramsey/uuid` has been updated for compatibility with PHP 8.0. [GitHub-31777](https://github.com/magento/magento2/issues/31777), [GitHub-826](https://github.com/magento/magento2-functional-testing-framework/issues/8260
+*  `ramsey/uuid` has been updated for compatibility with PHP 8.0. [GitHub-31777](https://github.com/magento/magento2/issues/31777), [GitHub-826](https://github.com/magento/magento2-functional-testing-framework/issues/826)
 
 <!--- ENGCOM-8997-->
 
diff --git a/src/guides/v2.4/release-notes/open-source-2-4-1.md b/src/guides/v2.4/release-notes/open-source-2-4-1.md
@@ -1384,7 +1384,7 @@ _Fix submitted by Michał Derlatka in pull request [29256](https://github.com/ma
 
 <!-- ENGCOM-7593 -->
 
-*  Test coverage has been added for these cases of the `updateCustomer` mutation: invalid date of birth, invalid email address, and empty customer last name. _Fix submitted by Alexander Taranovsky in pull request [28304](https://github.com/magento/magento2/pull/28304)_. [GitHub-28394](https://github.com/magento/magento2/issues/28394
+*  Test coverage has been added for these cases of the `updateCustomer` mutation: invalid date of birth, invalid email address, and empty customer last name. _Fix submitted by Alexander Taranovsky in pull request [28304](https://github.com/magento/magento2/pull/28304)_. [GitHub-28394](https://github.com/magento/magento2/issues/28394)
 
 <!--- MC-30844-->
 
diff --git a/src/guides/v2.4/release-notes/open-source-2-4-3.md b/src/guides/v2.4/release-notes/open-source-2-4-3.md
@@ -1036,7 +1036,7 @@ We have fixed hundreds of issues in the Magento 2.4.3 core code.
 
 <!--- ENGCOM-9073-->
 
-*  `ramsey/uuid` has been updated for compatibility with PHP 8.0. [GitHub-31777](https://github.com/magento/magento2/issues/31777), [GitHub-826](https://github.com/magento/magento2-functional-testing-framework/issues/8260
+*  `ramsey/uuid` has been updated for compatibility with PHP 8.0. [GitHub-31777](https://github.com/magento/magento2/issues/31777), [GitHub-826](https://github.com/magento/magento2-functional-testing-framework/issues/826)
 
 <!--- ENGCOM-8997-->
 
diff --git a/src/guides/v2.4/security/google-recaptcha.md b/src/guides/v2.4/security/google-recaptcha.md
@@ -12,9 +12,9 @@ Google reCAPTCHA provides a greater level of security for both the storefront an
 
 Google reCAPTCHA reduces potential user error when entering a Captcha code and encourages cart conversion without adding hurdles during checkout.
 
-## Install Mmdule
+## Install Module
 
-The Google reCAPTCHA extension is bundled and installed with {{site.data.var.ce}} and {{site.data.var.ee}} 2.3.x.
+The Google reCAPTCHA extension is bundled and installed with {{site.data.var.ce}} and {{site.data.var.ee}} 2.3.x or later.
 
 ## Configure reCAPTCHA
 

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ this.element.on('click', function() {`
`257`	`257`	```js
`258`	`258`	`options {`
`259`	`259`	`deleteAction: '[data-action="delete"]',`
`260`		`- tooltip: '[data-role="tooltip]'`
	`260`	`+ tooltip: '[data-role="tooltip"]'`
`261`	`261`	`}`
`262`	`262`	`...`
`263`	`263`	`this.element.find(this.options.deleteAction).on( ... );`