Merge pull request magento-commerce/devdocs#2457 from magento-devdocs/ds_DOC-351

Add Community MQP release notes

Author: jeff-matthews

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

@@ -73,12 +73,16 @@ pages:
       url: /comp-mgr/patching.html
       children:
 
-       - label: Commerce Quality Patches
+       - label: Quality Patches Tool
          url: /comp-mgr/patching/mqp.html
          children:
 
-           - label: MQP release notes
-             url: /quality-patches/release-notes.html
+           - label: Quality patches for Adobe Commerce
+             url: /quality-patches/release-notes-commerce.html
+             versionless: true
+
+           - label: Quality patches for Magento Open Source
+             url: /quality-patches/release-notes-open-source.html
              versionless: true
 
        - label: Command Line

src/_data/whats-new.yml

@@ -2518,7 +2518,7 @@ entries:
   link: https://github.com/magento/devdocs/pull/7785
   contributor: dshevtsov
   profile: https://github.com/dshevtsov
-- description: Added information about the Magento Quality Patches package in the
+- description: Added information about the Quality Patches tool in the
     [Software Upgrade Guide](https://devdocs.magento.com/guides/v2.4/comp-mgr/patching.html)
     and [Cloud Guide](https://devdocs.magento.com/cloud/project/project-patch.html).
   versions: 2.3.x, 2.4.x

src/_includes/install/patch/quality-patch-intro.md

@@ -0,0 +1,5 @@
+The [Quality Patches Tool](https://github.com/magento/quality-patches) delivers individual patches developed by Adobe and the {{ site.data.var.ce }} community. It allows you to apply, revert, and view general information about all individual patches that are available for the installed version of {{ site.data.var.ee }} or {{ site.data.var.ce }}. You can apply patches to {{site.data.var.ee}} and {{site.data.var.ce}} projects regardless of who developed the patch. For example, you can apply a patch developed by the community to {{site.data.var.ee}} projects.
+
+{:.bs-callout-info}
+See [Apply patches]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) for instructions on applying patches to your {{ site.data.var.ee }} or {{ site.data.var.ce }} projects.
+See [Patches available in the Quality Patches Tool](https://support.magento.com/hc/en-us/sections/360010506631-Patches-available-in-MQP-tool-) for additional patch details.

src/cloud/project/project-patch.md

@@ -6,20 +6,20 @@ functional_areas:
   - Upgrade
 ---
 
-[{{ site.data.var.mcp-prod }}](https://github.com/magento/magento-cloud-patches) and [Magento Quality Patches](https://github.com/magento/quality-patches) deliver patches to your installed Magento application.
+[{{ site.data.var.mcp-prod }}](https://github.com/magento/magento-cloud-patches) and the [Quality Patches Tool](https://github.com/magento/quality-patches) deliver patches to your installed Adobe Commerce application.
 
 -  {{ site.data.var.mcp-prod }} delivers required patches with critical fixes
--  Magento Quality Patches delivers optional, low-impact quality fixes as [individual patches]({{ site.baseurl }}/release/policy/#individual-patch), which do not contain backward incompatible changes.
+-  Quality Patches deliver optional, low-impact quality fixes as [individual patches]({{ site.baseurl }}/release/policy/#individual-patch), which do not contain backward incompatible changes.
 
 Both packages improve the integration of all {{site.data.var.ee}} versions with Cloud environments and support quick delivery of critical, optional, and custom fixes. You can use these packages to apply, revert, and view general information about all individual patches that are available for Magento.
 
 {:.bs-callout-tip}
-You can use the [Magento Quality Patches]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) and [{{ site.data.var.mcp-prod }}](#standalone) packages as stand-alone packages for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects. We recommend using the Magento Quality Patches package for non-Cloud projects.
+You can use the [Quality Patches Tool]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) and [{{ site.data.var.mcp-prod }}](#standalone) packages as stand-alone packages for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects. We recommend using the Quality Patches Tool for non-Cloud projects.
 
 When you deploy changes to the remote environment, `{{site.data.var.ct}}` uses {{ site.data.var.mcp-package }} and `magento/quality-patches` to check for pending patches and applies them automatically in the following order:
 
 1. Apply all required Magento patches included in the {{ site.data.var.mcp-prod }} package.
-1. Apply selected optional Magento patches included in the Magento Quality Patches package.
+1. Apply selected optional Magento patches included in the Quality Patches Tool.
 1. Apply custom patches in the `/m2-hotfixes` directory in alphabetical order by patch name.
 
 {:.bs-callout-info}
@@ -29,7 +29,7 @@ When you update `{{ site.data.var.ct }}` or the {{ site.data.var.mcp-prod }} pac
 
 {% include cloud/note-upgrade.md %}
 
-The Magento Quality Patches package is a dependency for the {{ site.data.var.mcp-prod }} and {{site.data.var.ct}} packages. To apply the latest patches, you must have [the latest version of {{ site.data.var.ct }}]({{site.baseurl}}/cloud/project/ece-tools-update.html) installed. The minimum required version of {{site.data.var.ct}} is 2002.1.2.
+The Quality Patches Tool is a dependency for the {{ site.data.var.mcp-prod }} and {{site.data.var.ct}} packages. To apply the latest patches, you must have [the latest version of {{ site.data.var.ct }}]({{site.baseurl}}/cloud/project/ece-tools-update.html) installed. The minimum required version of {{site.data.var.ct}} is 2002.1.2.
 
 ## View available patches and status
 
@@ -82,7 +82,7 @@ Magento 2 Enterprise Edition, version 2.3.5.0
 The status table contains the following types of information:
 
 -  **Type**:
-   -  `Optional`—All patches from the MQP package and the [Magento Cloud Patches]({{ site.baseurl }}/cloud/project/project-patch.html) package are optional for {{ site.data.var.ee }} and {{ site.data.var.ce }} installations. For {{ site.data.var.ece }}, all MQP patches are optional.
+   -  `Optional`—All patches from the Quality Patches Tool and the [Magento Cloud Patches]({{ site.baseurl }}/cloud/project/project-patch.html) package are optional for {{ site.data.var.ee }} and {{ site.data.var.ce }} installations. For {{ site.data.var.ece }}, all MQP patches are optional.
    -  `Required`—All patches from the {{ site.data.var.mcp-prod }} package are required for Cloud customers.
    -  `Deprecated`—The individual patch is marked as deprecated and we recommend reverting it if you have applied it. After you revert a deprecated patch, it will no longer be displayed in the status table.
    -  `Custom`—All patches from the 'm2-hotfixes' directory.
@@ -201,7 +201,7 @@ To apply and test a custom patch on a Cloud environment:
 
 ## Apply patches to a non-Cloud project {#standalone}
 
-Use the [Magento Quality Patches]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) package for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects.
+Use the [Quality Patches Tool]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects.
 
 ## Revert a patch in a local environment
 
@@ -221,4 +221,4 @@ This command reverts all patches in the following order:
 
 ## Logging
 
-The Magento Quality Patches package logs all operations to the `<Project_root>/var/log/patch.log` file.
+The Quality Patches Tool logs all operations to the `<Project_root>/var/log/patch.log` file.

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

@@ -76,7 +76,7 @@ See [Upgrades and patches]({{ site.baseurl }}/cloud/project/project-upgrade-pare
 
 -  {:.new}Added support for Elasticsearch 7.9 and Redis 6 for compatibility with upcoming {{site.data.var.ee}} releases.<!--MCLOUD-7191-->
 
--  {:.fix}Updated the ece-tools `composer.json` to add a required dependency for the Quality Patches Tool package. This fixes a circular dependency that existed between the ece-tools and magento-cloud-patches packages.<!--MCLOUD-6910-->
+-  {:.fix}Updated the ece-tools `composer.json` to add a required dependency for the Quality Patches Tool. This fixes a circular dependency that existed between the ece-tools and magento-cloud-patches packages.<!--MCLOUD-6910-->
 
 **Validation and log improvements**–
 

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

@@ -37,7 +37,7 @@ Hot fixes can contain backward incompatible changes.
 
 Individual patches contain low-impact quality fixes for a specific issue. These fixes are applied to the most recently supported minor version of Magento (for example, 2.4.x), but could be missing from the previous supported minor version of Magento (for example, 2.3.x). Magento releases individual patches as needed.
 
-Use the [Magento Quality Patches (MQP) package][MQP] to apply individual patches.
+Use the [Quality Patches Tool][] to apply individual patches.
 
 {:.bs-callout-info}
 Individual patches do not contain backward incompatible changes.
@@ -81,7 +81,7 @@ index c8a6fef58d31..7d01c195791e 100644
 
 You can apply patches using any of the following methods:
 
--  [Magento Quality Patch (MQP) package][MQP]
+-  [Quality Patches Tool][]
 -  [Command line][]
 -  [Composer][]
 
@@ -103,4 +103,4 @@ To apply a patch to a {{site.data.var.ece}} project, see [Apply patches][].
 [Apply patches]:{{ site.baseurl }}/cloud/project/project-patch.html
 [Command line]:{{ page.baseurl }}/comp-mgr/patching/command-line.html
 [Composer]:{{ page.baseurl }}/comp-mgr/patching/composer.html
-[MQP]: {{ page.baseurl }}/comp-mgr/patching/mqp.html
+[Quality Patches Tool]: {{ page.baseurl }}/comp-mgr/patching/mqp.html

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

@@ -1,19 +1,19 @@
 ---
 group: software-update-guide
-title: Commerce Quality Patches
+title: Quality Patches Tool
 functional_areas:
   - Upgrade
 ---
 
-The [Magento Quality Package package][] delivers individual patches developed by Magento and allows you to apply, revert, and view general information about all individual patches that are available for the installed version of {{ site.data.var.ee }} or {{ site.data.var.ce }}. See the [Apply Patches]({{ site.baseurl }}/cloud/project/project-patch.html) topic in the _Cloud Guide_ for details on installing and using  MQP for {{ site.data.var.ece }}.
+{% include install/patch/quality-patch-intro.md %}
 
 {:.bs-callout-warning}
-We do not recommend using the MQP package to apply large numbers of patches because it increases the complexity of your code, which makes upgrading to a new version of Magento more difficult.
+We do not recommend using the Quality Patches Tool to apply large numbers of patches because it increases the complexity of your code, which makes upgrading to a new version of {{ site.data.var.ee }} or {{ site.data.var.ce }} more difficult.
 
-#### Install the MQP package
+#### Install
 
 {:.bs-callout-info}
-If it is not already installed, you must install [Git](https://github.com/git-guides/install-git) or [Patch](https://man7.org/linux/man-pages/man1/patch.1.html) before installing the MQP package.
+If it is not already installed, you must install [Git](https://github.com/git-guides/install-git) or [Patch](https://man7.org/linux/man-pages/man1/patch.1.html) before installing the Quality Patches Tool.
 Add the `magento/quality-patches` Composer package to your `composer.json` file:
 
 ```bash
@@ -22,7 +22,7 @@ composer require magento/quality-patches
 
 #### View individual patches
 
-To view the list of individual patches available for your version of Magento:
+To view the list of individual patches available for your version of {{ site.data.var.ee }} or {{ site.data.var.ce }}:
 
 ```bash
 ./vendor/bin/magento-patches status
@@ -70,21 +70,21 @@ Magento 2 Enterprise Edition, version 2.3.5.0
 The status table contains the following types of information:
 
 -  **Type**:
-   -  `Optional`—All patches from the MQP package and the [Magento Cloud Patches]({{ site.baseurl }}/cloud/project/project-patch.html) package are optional for {{ site.data.var.ee }} and {{ site.data.var.ce }} installations.
-   -  `Deprecated`—Magento has deprecated the individual patch. If you have applied the patch, we recommend that you revert it. The revert operation also removes the patch from the status table.
+   -  `Optional`—All patches from the Quality Patches Tool and the [Magento Cloud Patches]({{ site.baseurl }}/cloud/project/project-patch.html) package are optional for {{ site.data.var.ee }} and {{ site.data.var.ce }} installations.
+   -  `Deprecated`—Adobe has deprecated the individual patch. If you have applied the patch, we recommend that you revert it. The revert operation also removes the patch from the status table.
 
 -  **Status**:
    -  `Applied`—The patch has been applied.
    -  `Not applied`—The patch has not been applied.
    -  `N/A`—The status of the patch cannot be defined due to conflicts.
 
 -  **Details**:
-   -  `Affected components`—The list of affected Magento modules.
+   -  `Affected components`—The list of affected modules.
    -  `Required patches`—The list of patches that must be applied for an indicated patch to work properly (dependencies).
    -  `Recommended replacement`—The patch that is a recommended replacement for a deprecated patch.
 
 {:.bs-callout-info}
-After upgrading to a new version of Magento, you must re-apply patches if the patches are not included in the new version. See [Re-apply patches after an upgrade](#upgrade).
+After upgrading to a new version of {{ site.data.var.ee }} or {{ site.data.var.ce }}, you must re-apply patches if the patches are not included in the new version. See [Re-apply patches after an upgrade](#upgrade).
 
 #### Apply individual patches
 
@@ -110,7 +110,7 @@ You must clean the cache after applying patches to see changes in the Magento ap
 ```
 
 {:.bs-callout-info}
-Consider keeping a list of applied patches in a separate location. You might need to re-apply some of them after upgrading to a new version of Magento. See [Re-apply patches after an upgrade](#upgrade).
+Consider keeping a list of applied patches in a separate location. You might need to re-apply some of them after upgrading to a new version of {{ site.data.var.ee }} or {{ site.data.var.ce }}. See [Re-apply patches after an upgrade](#upgrade).
 
 #### Revert individual patches
 
@@ -143,7 +143,7 @@ You must clean the cache after reverting patches to see changes in the Magento a
 
 #### Get updates
 
-Magento periodically releases new individual patches. You must update the MQP package to get new individual patches:
+Magento periodically releases new individual patches. You must update the Quality Patches Tool to get new individual patches:
 
 ```bash
 composer update magento/quality-patches
@@ -160,12 +160,12 @@ New add patches display at the bottom of the table.
 
 #### Re-apply patches after an upgrade {#upgrade}
 
-When you upgrade to a new version of Magento, you must re-apply patches if the patches are not included in the new version.
+When you upgrade to a new version of {{ site.data.var.ee }} or {{ site.data.var.ce }}, you must re-apply patches if the patches are not included in the new version.
 
 {:procedure}
 To re-apply patches:
 
-1. Update the MQP package:
+1. Update the Quality Patches Tool:
 
    ```bash
    composer update magento/quality-patches.
@@ -192,8 +192,4 @@ To re-apply patches:
 
 #### Logging
 
-The MQP package logs all operations in the `<Magento_root>/var/log/patch.log` file.
-
-<!-- Link Definitions -->
-
-[Magento Quality Package package]: https://github.com/magento/quality-patches
+The Quality Patches Tool logs all operations in the `<Magento_root>/var/log/patch.log` file.

src/quality-patches/release-notes.md renamed to src/quality-patches/release-notes-commerce.md

@@ -1,24 +1,23 @@
 ---
 group: software-update-guide
-title: Magento Quality Patches release notes
+title: Quality patches for Adobe Commerce
 functional_areas:
   - Setup
   - Configuration
   - Upgrade
+redirect_from: /quality-patches/release-notes.html
 ---
 
-The [Magento Quality Patches](https://github.com/magento/quality-patches) package delivers individual patches developed by Magento and allows you to apply, revert, and view general information about all individual patches that are available for the installed version of {{ site.data.var.ee }} or {{ site.data.var.ce }}.
+{% include install/patch/quality-patch-intro.md %}
+
+For information about quality patches created by the community for {{site.data.var.ce}}, see the [release notes](https://github.com/magento/quality-patches/blob/master/community-release-notes.md).
 
 <!-- The release notes include:
 
 -  {:.new}New features
 -  {:.fix}Fixes and improvements
 -  {:.bug}Known issues -->
 
-{:.bs-callout-info}
-See [Apply patches]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) for instructions on applying patches to your Magento projects.
-See [Patches available in MQP tool](https://support.magento.com/hc/en-us/sections/360010506631-Patches-available-in-MQP-tool-) for additional patch details.
-
 ## v1.1.1
 
 -  **MDVA-36021** _(for Adobe Commerce and Magento Open Source `>=2.4.0 <2.4.4`)_-Fixes the issue where the 'Call to a member function getId()' error is displayed on the order details page in the Admin.

src/quality-patches/release-notes-open-source.md

@@ -0,0 +1,14 @@
+---
+group: software-update-guide
+title: Quality patches for Magento Open Source
+functional_areas:
+  - Setup
+  - Configuration
+  - Upgrade
+---
+
+{% include install/patch/quality-patch-intro.md %}
+
+For information about quality patches created by the community for {{site.data.var.ce}}, see the [release notes](https://github.com/magento/quality-patches/blob/master/community-release-notes.md).
+
+For information about quality patches created by Adobe for {{site.data.var.ee}}, see the [release notes]({{ site.baseurl }}/quality-patches/release-notes-commerce.html).