Merge branch 'master' into db_bump_theme

Author: dobooth

src/_data/core-releases.json

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

src/_data/whats-new.yml

@@ -4,8 +4,50 @@ 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 17 15:38:41 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

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

@@ -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/config/redis-verify.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
 

src/cloud/cdn/cloud-vcl-custom-snippets.md

@@ -241,7 +241,7 @@ Use the Fastly API [create snippet](https://docs.fastly.com/api/config#snippet_4
 curl -H "Fastly-Key: $FASTLY_API_TOKEN" https://api.fastly.com/service/$FASTLY_SERVICE_ID/version/$FASTLY_EDIT_VERSION/snippet -H 'Content-Type: application/json' -X POST --data @<filename.json>
 ```
 
-The `<filename.vcl>` is the name of the file you prepared in the previous step. Repeat this command for each VCL snippet.
+The `<filename.json>` is the name of the file you prepared in the previous step. Repeat this command for each VCL snippet.
 
 If you receive a `500 Internal Server Error` response from the Fastly service, check the JSON file syntax to make sure you are uploading a valid file.
 

src/cloud/env/variables-build.md

@@ -108,26 +108,48 @@ stage:
 
 You can configure multiple locales per theme. This customization helps speed up the build process by reducing the number of unnecessary theme files. For example, you can build the _magento/backend_ theme in English and a custom theme in other languages.
 
-The following example builds the `magento/backend` theme with three locales:
+The following example builds the `Magento/backend` theme with three locales:
 
 ```yaml
 stage:
   build:
     SCD_MATRIX:
-      "magento/backend":
+      "Magento/backend":
         language:
           - en_US
           - fr_FR
           - af_ZA
 ```
+The following example builds three themes with three locales:
 
-Also, you can choose to _not_ deploy a theme:
+```yaml
+stage:
+  build:
+    SCD_MATRIX:
+      "Magento/backend":
+        language:
+          - en_US
+          - fr_FR
+          - af_ZA
+      "Magento/blank":
+        language:
+          - en_US
+          - fr_FR
+          - af_ZA
+      "Magento/luma":
+        language:
+          - en_US
+          - fr_FR
+          - af_ZA
+```
+
+Or, you can choose to _not_ deploy a theme:
 
 ```yaml
 stage:
   build:
     SCD_MATRIX:
-      "magento/backend": [ ]
+      "Magento/backend": [ ]
 ```
 
 ### `SCD_MAX_EXECUTION_TIME`

src/cloud/project/log-locations.md

@@ -19,7 +19,7 @@ You can view the logs from the file system, the project web UI, and the `magento
 -  **Magento Cloud CLI**—You can view logs using the `magento-cloud log` command.
 
 {:.bs-callout-tip}
-Automatic log rotation, compression, and removal are enabled in the Cloud environment. Each log file type has a rotating pattern and lifetime.
+For Pro environments, automatic log rotation, compression, and removal are enabled for log files with a fixed file name. Each log file type has a rotating pattern and lifetime. Starter environments do not have log rotation. Full details of the environment's log rotation and lifespan of compressed logs can be found in: `/etc/logrotate.conf` and `/etc/logrotate.d/<various>`
 
 ## Manage log data
 
@@ -152,7 +152,6 @@ For example, on Pro production environments a PHP access log for 21 days in the
 ```terminal
 /var/log/platform/<project_id>/php.access.log.22.gz
 ```
-
 The archived log files are always stored in the directory where the original file was located before compression.
 
 {:.bs-callout-info}

src/cloud/project/new-relic.md

@@ -43,7 +43,7 @@ The aggregated data includes information from the following logs:
 -  Logs for cloud services from the `var/log/platform/<project-ID>` directory
 -  Fastly CDN and WAF logs
 
-As soon as your project is connected to New Relic, you can use the New Relic Logs service to complete tasks like the following:
+When your project is connected to New Relic, you can use the New Relic Logs service to complete tasks like the following:
 
 -  Use [New Relic queries][New Relic query syntax for logs] to search aggregated log data
 -  Visualize log data through the New Relic Logs application
@@ -59,9 +59,9 @@ When Adobe provisions your {{site.data.var.ece}} project, the License Owner rece
 A New Relic account can have only one person assigned to the Owner role. If you must change the account owner, assign the Admin role to the current Owner, then assign the Owner role to another user. See [Update the account owner] in the New Relic documentation for instructions.
 
 {:.bs-callout-tip}
-Before assigning the Owner role to a user, verify that the user exists on the New Relic account for {{site.data.var.ece}}. If you need to add the user to that account and an existing account Owner or Admin cannot help, any user with access to the [Adobe Partnership Owner Account] for New Relic can add users on behalf of the customer.
+Before assigning the Owner role to a user, verify that the user exists on the New Relic account for {{site.data.var.ece}}. If you must add the user to that account and an existing account Owner or Admin cannot help, any user with access to the [Adobe Partnership Owner Account] for New Relic can add users on behalf of the customer.
 
-We recommend adding at least one Admin user to your New Relic account to manage all access, integrations, and tool usage. {{site.data.var.ece}} Project Owners and Admin users can add and remove users from the New Relic account.
+We recommend adding at least one **Admin** user to your New Relic account to manage all access, integrations, and tool usage. {{site.data.var.ece}} Project Owners and Admin users can add and remove users from the New Relic account. We also recommend that you do not create more than five full-access **Users**. Only grant full access to users that strictly require access to the complete feature set. There is no specific guidance on free **Restricted** users.
 
 {:.procedure}
 To add a user:

src/cloud/project/user-admin.md

@@ -36,7 +36,7 @@ When MFA enforcement is enabled on a {{site.data.var.ece}} project, all users wi
 You can add users and assign roles using the Magento Cloud CLI or the Project Web Interface.
 
 {:.bs-callout-tip}
-Changing user configuration on a {{site.data.var.ece}} environment triggers a site deployment, which takes your site offline until deployment completes. For Production environments, we recommend completing user administration tasks during off-peak hours to prevent service disruptions.
+Changing user configuration on an {{site.data.var.ece}} environment requires a site deployment for the changes to take effect, which takes your site offline until the deployment completes. For Production environments, we recommend completing user administration tasks during off-peak hours to prevent service disruptions.
 
 **Prerequisites:**
 

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

@@ -3,7 +3,6 @@ group: software-update-guide
 title: Commerce upgrade overview
 functional_areas:
   - Upgrade
-redirect_to: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html
 ---
 
 <!-- Topic variables