Merge branch 'master' into em_prex-custattributes

Author: erikmarr

.github/ISSUE_TEMPLATE.md

@@ -111,7 +111,7 @@
                 "tagName":"2.3.0"
             }
         ],
-        "end-of-support": "2022-04-??"
+        "end-of-support": "2022-09-08"
     },
     "2.2": {
         "releases": [

src/_data/core-releases.json

@@ -83,6 +83,10 @@
     - label: Command-line Tools Reference
       url: /reference/cli/magento.html
 
+    - label: Tools
+      url: /quality-patches/tool.html
+      versionless: true
+
 - label: Development
   children:
 

src/_data/main-nav.yml

@@ -318,6 +318,11 @@ pages:
           edition: ee-only
           exclude_versions: ["2.3"]
 
+        - label: contactUs mutation
+          url: /graphql/mutations/contact-us.html
+          edition: pwa-only
+          exclude_versions: ["2.3"]
+
         - label: createBraintreeClientToken mutation
           url: /graphql/mutations/create-braintree-client-token.html
 

src/_data/toc/graphql.yml

@@ -69,19 +69,6 @@ pages:
     - label: Add or update components
       url: /install-gde/install/cli/dev_add-update.html
 
-    - label: Quality Patches Tool
-      url: /quality-patches/tool.html
-      versionless: true
-      children:
-
-        - label: Usage
-          url: /quality-patches/usage.html
-          versionless: true
-
-        - label: Release notes
-          url: /quality-patches/release-notes.html
-          versionless: true
-
     - label: Apply patches
       url: /comp-mgr/patching.html
       children:

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

@@ -0,0 +1,14 @@
+label: Tools
+pages:
+  - label: Quality Patches Tool
+    url: /quality-patches/tool.html
+    versionless: true
+    children:
+
+      - label: Usage
+        url: /quality-patches/usage.html
+        versionless: true
+
+      - label: Release notes
+        url: /quality-patches/release-notes.html
+        versionless: true

src/_data/toc/tools.yml

@@ -17,6 +17,7 @@ ce: Magento Open Source
 ee: Adobe Commerce
 b2b: B2B for Adobe Commerce
 mbi: Adobe Commerce Reporting
+pwa: PWA Studio
 
 # Cloud product name variables
 

src/_data/var.yml

@@ -4,8 +4,88 @@ 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 Jan 10 15:38:44 2022
+updated: Mon Jan 24 15:38:42 2022
 entries:
+- description: Restored 2.3.x [Upgrade Guide](https://devdocs.magento.com/guides/v2.3/comp-mgr/bk-compman-upgrade-guide.html)
+    topics and redirected only the 2.4.x topics to the migrated guide on [Experience
+    League](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html).
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: January 21, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2749
+  merge_commit: f73452c4b7575cfca7beb37dab422d1547a8a8ef
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - Major Update
+  - 2.3.x
+  - 2.4.x
+- description: Updated the Cloud guide to [clarify log rotation tip](https://devdocs.magento.com/cloud/project/log-locations.html),
+    [delete custom VCL snippets](http://devdocs.magento.com/cloud/cdn/fastly-vcl-bypass-to-origin.html#delete-the-custom-vcl-snippet),
+    and provide an additional example with multiple themes and locales for the [SCD_MATRIX
+    build variable](https://devdocs.magento.com/cloud/env/variables-build.html#scd_matrix).
+  versions: 2.x
+  type: Technical
+  date: January 20, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2736
+  merge_commit: bb55fd340360edd73af89dfc02628bb169843593
+  contributor: hguthrie
+  membership: true
+  labels:
+  - 2.x
+  - Technical
+  - imported
+- description: Added [extended support](https://devdocs.magento.com/release/lifecycle-policy.html)
+    date for 2.3.
+  versions: 2.3.x
+  type: Major Update
+  date: January 20, 2022
+  link: https://github.com/magento/devdocs/pull/9329
+  merge_commit: 9c12b816643b303e5bcf07252d3402a1b5115b33
+  contributor: misuadobe
+  membership: false
+  labels:
+  - Major Update
+  - 2.3.x
+  - 'Progress: done'
+- description: Added the [contactUs](https://devdocs.magento.com/guides/v2.4/graphql/mutations/contact-us.html)
+    mutation topic.
+  versions: 2.4.x
+  type: New Topic
+  date: January 14, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2737
+  merge_commit: 9b2b6d74a7e866d899ef83b4391de3d6c7e8b4ba
+  contributor: dobooth
+  membership: true
+  labels:
+  - New Topic
+  - 2.4.x
+- description: Redirected [Software Update Guide](https://devdocs.magento.com/guides/v2.4/comp-mgr/bk-compman-upgrade-guide.html)
+    topics to the new location on [Adobe Experience League](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html).
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: January 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2734
+  merge_commit: 9e570a8ea66876b5086ba909810e95f5d7d21b77
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - Major Update
+  - 2.3.x
+  - 2.4.x
+- description: Added a new Tools section to the top navigation and moved the [Quality
+    Patches Tool](https://devdocs.magento.com/quality-patches/tool.html) content to
+    the new section.
+  versions: 2.x
+  type: Major Update
+  date: January 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2735
+  merge_commit: dce1c7fdc03ffa7f88a12b26b8907320d1c8143a
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - 2.x
+  - Major Update
 - description: Added new supported versions of Elasticsearch, OpenSearch, Redis, RabbitMQ,
     and Varnish to the [system requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
     for 2.4.4 and 2.4.5

src/_data/whats-new.yml

@@ -15,19 +15,24 @@
 1. After the upload completes, refresh the cache according to the notification at the top of the page.
 
 {:.bs-callout-warning}
-The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must use the Fastly API to [manage custom snippets added through the API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
+The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must [manage custom VCL snippets using the Fastly API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
 
 ## Delete the custom VCL snippet
 
-You can delete custom VCL snippet code from your Fastly configuration by uploading an empty version of the snippet from the Admin UI, or delete it completely using the Fastly API.
+1. [Log in]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html#admin) to the Admin UI.
+
+1. Click **Stores** > **Settings** > **Configuration** > **Advanced** > **System**.
+
+1. Expand **Full Page Cache** > **Fastly Configuration** > **Custom VCL Snippets**.
+
+   ![Manage custom VCL snippets]
 
--  Upload an empty version of the snippet file to Fastly to remove the VCL logic from the active VCL version:
+1. In the _Action_ column, click the trash icon next to the snippet to delete.
 
-   -  Edit the snippet and delete the **VCL** snippet content.
-   -  Save the configuration.
-   -  Upload the VCL to Fastly to apply your changes.
+1. On the next modal window, click **DELETE** and activate a new version.
 
--  Use the Fastly API [Delete custom VCL snippet]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-vcl) operation to delete the snippet completely, or submit a support ticket to request deletion.
+{:.bs-callout-warning}
+The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must [manage custom VCL snippets using the Fastly API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
 
 [Manage custom VCL snippets]: {{site.baseurl}}/common/images/cloud/cloud-fastly-manage-snippets.png
-{:width="650px"}
+{:width="650px"}

src/_includes/cloud/cloud-fastly-manage-vcl-from-admin.md

@@ -52,7 +52,7 @@ If you use Redis for page caching, you'll see output similar to the following:
 
 ### Inspecting compressed data
 
-To inspect compressed Session data and Page Cache, the [Redis Desktop Manager](https://flathub.org/apps/details/dev.rdm.RDM) supports the automatic decompression of Magento 2 Session and Page cache and displays PHP session data in a human-readable form.
+To inspect compressed Session data and Page Cache, the [RESP.app](https://flathub.org/apps/details/app.resp.RESP) supports the automatic decompression of Magento 2 Session and Page cache and displays PHP session data in a human-readable form.
 
 ### Redis ping command