Merge branch 'master' into Q4-release-note-update-1025

Author: jfrontain

src/_data/toc/cloud-guide.yml

@@ -570,46 +570,14 @@ pages:
       versionless: true
       children:
 
-        - label: Troubleshoot deployment
-          url: /cloud/trouble/troubleshoot-deployment.html
-          versionless: true
-
-        - label: Incorrect credentials
-          url: /cloud/trouble/trouble_ce-creds.html
-          versionless: true
-
-        - label: Resolve issues with a new project
-          url: /cloud/trouble/trouble_proj-startover.html
-          versionless: true
-
         - label: Component deployment failure
           url: /cloud/trouble/trouble_comp-deploy-fail.html
           versionless: true
 
-        - label: Resolve issues with encryption key
-          url: /cloud/trouble/trouble-crypt-key-variable.html
-          versionless: true
-
-        - label: Resolve issues with HTML minification
-          url: /cloud/trouble/trouble-error-html-minification.html
-          versionless: true
-
-        - label: Resolve issues with Google Analytics during deployment
-          url: /cloud/trouble/trouble-google-analytics-deploy.html
-          versionless: true
-
-        - label: Site availability
-          url: /cloud/trouble/site-availability.html
-          versionless: true
-
         - label: Add site map and search engine robots
           url: /cloud/trouble/robots-sitemap.html
           versionless: true
 
-        - label: Theme troubleshooting
-          url: /cloud/trouble/theme-troubleshooting.html
-          versionless: true
-
     - label: Upgrades and patches
       url: /cloud/project/project-upgrade-parent.html
       versionless: true

src/_data/toc/product-recommendations.yml

@@ -12,7 +12,7 @@ pages:
   url: /recommendations/install-configure.html
   versionless: true
 
-- label: Recommendation Events
+- label: Data Collection for Recommendations
   url: /recommendations/events.html
   versionless: true
 

src/_data/toc/release.yml

@@ -9,6 +9,10 @@ pages:
     url: /release/
     versionless: true
 
+  - label: Beta program
+    url: /release/beta-program.html
+    versionless: true
+
   - label: Released versions
     url: /release/released-versions.html
     versionless: true

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

@@ -69,21 +69,22 @@ pages:
     - label: Add or update components
       url: /install-gde/install/cli/dev_add-update.html
 
-    - label: Apply patches
-      url: /comp-mgr/patching.html
+    - label: Quality Patches Tool
+      url: /quality-patches/tool.html
+      versionless: true
       children:
 
-       - label: Quality Patches Tool
-         url: /comp-mgr/patching/mqp.html
-         children:
+        - label: Usage
+          url: /quality-patches/usage.html
+          versionless: true
 
-           - label: Quality patches for Adobe Commerce
-             url: /quality-patches/release-notes-commerce.html
-             versionless: true
+        - label: Release notes
+          url: /quality-patches/release-notes.html
+          versionless: true
 
-           - label: Quality patches for Magento Open Source
-             url: /quality-patches/release-notes-open-source.html
-             versionless: true
+    - label: Apply patches
+      url: /comp-mgr/patching.html
+      children:
 
        - label: Command Line
          url: /comp-mgr/patching/command-line.html

src/_data/var.yml

@@ -21,24 +21,23 @@ mbi: Adobe Commerce Reporting
 # Cloud product name variables
 
 ece: Adobe Commerce on cloud infrastructure
-ece-release-date: July 29, 2021
 csuite: Cloud Suite for Commerce
 
 ct: ece-tools
 ct-repo: magento/ece-tools
-ct-release: 2002.1.7
+ct-release: 2002.1.8
 
 mcc-prod: Cloud Components of Commerce
 mcc-package: magento/magento-cloud-components
-mcc-release: 1.0.8
+mcc-release: 1.0.9
 
 mcd-prod: Cloud Docker for Commerce
 mcd-package: magento/magento-cloud-docker
-mcd-release: 1.2.4
+mcd-release: 1.3.0
 
 mcp-prod: Cloud Patches for Commerce
 mcp-package: magento/magento-cloud-patches
-mcp-release: 1.0.12
+mcp-release: 1.0.13
 
 # TIP: Use the following syntax to use a variable in the documentation source: {{site.data.var.xx}} where xx
 # is the variable value.

src/_data/whats-new.yml

@@ -4,8 +4,122 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Mon Oct 18 14:38:48 2021
+updated: Mon Nov 1 14:38:45 2021
 entries:
+- description: Moved the [Adobe Commerce Beta Program](https://devdocs.magento.com/release/beta-program.html)
+    topic from the `magento/magento2` GitHub wiki to devdocs.magento.com.
+  versions: 2.x
+  type: New Topic
+  date: November 1, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2564
+  merge_commit: af2a640a23703ea740a9819ac27503c082526635
+  contributor: dshevtsov
+  membership: true
+  labels:
+  - 2.x
+  - New Topic
+- description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
+    for the 1.1.5 Quality Patches Tool (QPT) package release.
+  versions: 2.x
+  type: Major Update
+  date: October 27, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2618
+  merge_commit: 4f9cf19e36c015ece29d6f550cc9f759af11575a
+  contributor: agorbivskyi
+  membership: true
+  labels:
+  - 2.x
+  - Major Update
+- description: Update the [Cloud guide PrivateLink service](https://devdocs.magento.com/cloud/project/privatelink-service.html)
+    prerequisites, clarifying some points and providing additional guidance for Azure
+    Private Link.
+  versions: 2.x
+  type: Major Update
+  date: October 26, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2593
+  merge_commit: 2da06e674511632801f969492b98ca35a8cbcb49
+  contributor: hguthrie
+  membership: true
+  labels:
+  - 2.x
+  - Major Update
+- description: 'Cloud Release for October 25: Updated release notes for all cloud
+    packages. See [Release notes for Cloud suite](https://devdocs.magento.com/cloud/release-notes/cloud-tools.html).'
+  versions: 2.x
+  type: Major Update
+  date: October 26, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2601
+  merge_commit: 5a325413c97a2a50a6a993f6dfa831708fdd1dca
+  contributor: hguthrie
+  membership: true
+  labels:
+  - 2.x
+  - Major Update
+- description: Added the "cache" and "system"  descriptions to the [env.php reference](https://devdocs.magento.com/guides/v2.4/config-guide/prod/config-reference-envphp.html)
+    topic.
+  versions: 2.4.x
+  type: Major Update
+  date: October 22, 2021
+  link: https://github.com/magento/devdocs/pull/9186
+  merge_commit: ecfce43befaea1054d0ed8451a208ea07de3d2b4
+  contributor: srsathish92
+  membership: false
+  labels:
+  - Major Update
+  - partners-contribution
+  - 2.4.x
+  - 'Progress: done'
+  - 'Partner: ITG Commerce'
+- description: "[Release notes](https://devdocs.magento.com/live-search/release-notes.html)
+    for Live Search 1.3.0"
+  versions: 2.4.x
+  type: Major Update
+  date: October 21, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2592
+  merge_commit: ecd524f562b0f03de9b65c06d849415617e53dd6
+  contributor: ccondra
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.x
+- description: The Composer `root-update-plugin` has been updated to be compatible
+    with Composer 2.1.6. [Upgrade Commerce](https://devdocs.magento.com/guides/v2.4/comp-mgr/cli/cli-upgrade.html)
+    provides details about upgrading Magento Open Source and Adobe Commerce with the
+    new version of the plugin.
+  versions: 2.4.4
+  type: Major Update
+  date: October 20, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2581
+  merge_commit: 5a9604f08dac24aaf84ecf423486d460798df5dd
+  contributor: keharper
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.4
+- description: Update [reference data for the backward incompatible changes](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html).
+    Covering entire products instead of the main source code repositories.
+  versions: 2.4.x
+  type: Major Update
+  date: October 20, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2598
+  merge_commit: 7c08bc0fb8369b1c524dca7abd027eb837aeb3a0
+  contributor: dshevtsov
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.x
+- description: Added a [public roadmap](https://devdocs.magento.com/release/roadmap.html)
+    for Magento Open Source.
+  versions: 2.x
+  type: New Topic
+  date: October 20, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2603
+  merge_commit: 5a0d39d531a142d92d97a6b0e7cec249aa03757e
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - 2.x
+  - New Topic
 - description: Reference data for the [2.4.3-p1](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html),
     [2.3.7-p1 and 2.3.7-p2](https://devdocs.magento.com/guides/v2.3/release-notes/backward-incompatible-changes/reference.html)
     backward incompatible changes.
@@ -265,7 +379,7 @@ entries:
   - Major Update
   - 2.4.3
 - description: Added [Community quality patches release notes](https://github.com/magento/quality-patches/blob/master/community-release-notes.md)
-    to a table of contents at [Commerce Quality Patches](https://devdocs.magento.com/guides/v2.4/comp-mgr/patching/mqp.html).
+    to a table of contents at [Commerce Quality Patches](https://devdocs.magento.com/quality-patches/usage.html).
   versions: 2.x
   type: Major Update
   date: August 27, 2021

src/_includes/cloud/backup-db.md

@@ -25,7 +25,7 @@ To back up your Staging or Production environment database before deploying:
 
 1. Use SSH to log in to the remote server.
 
-1. Create a database dump.
+1. Create a database dump. To choose a target directory for the DB dump, use the `--dump-directory` option.
 
    ```bash
    vendor/bin/ece-tools db-dump

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

@@ -1,5 +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 [Apply patches]({{ site.baseurl }}/quality-patches/usage.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.