Merge branch 'master' into imported-chuongnh3atgmaildotcom-devdocs-9415

magento · Apr 19, 2022 · 1a6d70a · 1a6d70a
2 parents b47b150 + 4444e2a
commit 1a6d70a
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 10 deletions.
diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml
@@ -4,8 +4,63 @@ 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 Apr 11 14:38:41 2022
+updated: Mon Apr 18 16:08:10 2022
 entries:
+- description: The [Site-Wide Analysis Tool](https://devdocs.magento.com/tools/site-wide-analysis.html)
+    installation topic has moved to [Adobe Experience League](https://experienceleague.adobe.com/docs/commerce-operations/tools/site-wide-analysis-tool/installation.html).
+  versions: 2.4.x
+  type: Technical
+  date: April 13, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2913
+  merge_commit: e3cc7b1a1aa0811ff7313cb98dc5f0917dce9bb3
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - Technical
+  - 2.4.x
+- description: Cloud guide updates:<br/>- Updated the [Upgrade version topic](https://devdocs.magento.com/cloud/project/project-upgrade.html)
+    to include instructions for 2.4.4 template.<br/>- Added a new topic for [OpenSearch
+    setup](https://devdocs.magento.com/cloud/project/services-opensearch.html). This
+    is an early version; more to come.<br/>- Updated the [Application Properties topic](https://devdocs.magento.com/cloud/project/magento-app-properties.html)
+    to include 2.4.4 settings and clarified the Composer 2 install.
+  versions: 2.4.4
+  type: Major Update
+  date: April 13, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2908
+  merge_commit: 5362c1b1392eee3cbf18eafe4f17fa79845fd041
+  contributor: hguthrie
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.4
+- description: Updated the autogenerated topics and the semi-automated topics that
+    use release data such as [Module reference guide](https://devdocs.magento.com/guides/v2.4/mrg/intro.html),
+    [Packages](https://devdocs.magento.com/guides/v2.4/release-notes/packages-open-source.html),
+    [Backwards incompatible changes](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html),
+    [Required PHP extensions](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html#php-extensions),
+    [bin/magento CLI](https://devdocs.magento.com/guides/v2.4/reference/cli/magento.html).
+  versions: 2.4.4
+  type: Major Update
+  date: April 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2907
+  merge_commit: 81e9594ffa9c24a761ebd3a3c7c076078443f1e5
+  contributor: dshevtsov
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.4
+- description: Updated the Cloud integration topics to remove the delete remote step
+    and add a note about default remote names.
+  versions: 2.x
+  type: Technical
+  date: April 11, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2894
+  merge_commit: b584117fd3a6324049c59da591fb2b3cf14b05b6
+  contributor: hguthrie
+  membership: true
+  labels:
+  - 2.x
+  - Technical
 - description: Added a new topic to the _Performance Best Practices_ guide titled
     [High-throughput Order Processing](https://devdocs.magento.com/guides/v2.4/performance-best-practices/high-throughput-order-processing.html),
     which describes how you can improve performance by optimizing the order placement

diff --git a/src/cloud/docker/docker-development-debug.md b/src/cloud/docker/docker-development-debug.md
@@ -37,7 +37,7 @@ If you use Microsoft Windows, take the following steps before continuing:
    ```yaml
     fpm_xdebug:
       hostname: fpm_xdebug.magento2.docker
-      image: 'magento/magento-cloud-docker-php:7.4-fpm-1.2.0'
+      image: 'magento/magento-cloud-docker-php:7.4-fpm-1.3.2'
       extends: generic
       volumes:
         - '.:/app:ro,delegated'
@@ -72,28 +72,28 @@ If you use Microsoft Windows, take the following steps before continuing:
 1. Change any Xdebug configuration using the `XDEBUG_CONFIG` option. For example, to change the xdebug.remote_port option:
 
    ```bash
-   XDEBUG_CONFIG='remote_host=host.docker.internal remote_port=9002'
+   XDEBUG_CONFIG='client_host=host.docker.internal client_port=9002'
    ```
    On Linux systems, use the following command instead:
    ```bash
-   XDEBUG_CONFIG=remote_host=host.docker.internal remote_port=9002
+   XDEBUG_CONFIG=client_host=host.docker.internal client_port=9002
    ```
 
 {:.procedure}
 To configure PhpStorm to work with Xdebug:
 
 1. In your PhpStorm project, open the settings panel.
 
-   -  _Mac OS X_—Select **File** > **Preferences**.
+   -  _Mac OS X_—Select **PhpStorm** > **Preferences**.
    -  _Windows/Linux_—Select **File** > **Settings**.
 
-1. In the _Settings_ panel, expand and locate the **Languages & Frameworks** > **PHP** > **Servers** section.
+1. In the _Settings_ panel, expand and locate the **PHP** > **Servers** section.
 
 1. Click the **+** to add a `PHP Remote Debug` server configuration. The project name is in grey at the top.
 
 1. Configure the following settings for the new server configuration:
 
-   -  **Name**—Enter the name used for the `serverName` option from `PHP_IDE_CONFIG` value.
+   -  **Name**—Enter the name used for the `serverName` option from `PHP_IDE_CONFIG` value. By default, MCD use this value: `serverName=magento_cloud_docker`
    -  **Host**—Enter `localhost`.
    -  **Port**—Enter `80`.
    -  **Debugger**—Select `Xdebug`.
@@ -102,7 +102,7 @@ To configure PhpStorm to work with Xdebug:
 
 1. In the **Absolute path on the server** column, click ![Edit]({{ site.baseurl }}/common/images/cloud/cloud-install_docker_php-storm-edit.png){:width="15px"} and add a value to the `MAGENTO_ROOT` option. The default value is `/app`
 
-1. Change the Xdebug port to 9001 in the **Languages & Frameworks** > **PHP** > **Debug** > **Xdebug** > **Debug Port** panel.
+1. Change the Xdebug port to 9001 in the **PHP** > **Debug** > **Xdebug** > **Debug Port** panel.
 
 1. Click **Apply**.
 
@@ -135,7 +135,7 @@ To debug CLI commands:
       -  _Windows_—Select **TCP socket** and update **Engine Api Url** with `tcp://localhost:2375`.
       -  _Mac OS X_—Select **Docker for Mac**. [_default_]
 
-1. In the **Languages & Frameworks** > **PHP** > **Cli Interpreter** panel, click **[...]**.
+1. In the **PHP** > **Cli Interpreter** panel, click **[...]**.
 
 1. Click **[+]** to add and configure a new Cli Interpreter from your Docker image. Update the following settings:
 

diff --git a/src/release/lifecycle-policy.md b/src/release/lifecycle-policy.md
@@ -16,7 +16,7 @@ For {{ site.data.var.ee }} 2.4 and subsequent releases:
 | Release                          | Release Date  | End of Software Support<sup>1</sup> | Dependent PHP Version       |
 |----------------------------------|---------------|-------------------------------------|-----------------------------|
 | {{site.data.var.ee}} 2.3         | November 2018 | September 8, 2022<sup>2</sup>          | PHP 7.3 and 7.4<sup>3</sup> |
-| {{site.data.var.ee}} 2.4.0-2.4.3 | July 2020     | November 2022                       | PHP 7.4                     |
+| {{site.data.var.ee}} 2.4.0-2.4.3 | July 2020     | November 28, 2022                      | PHP 7.4                     |
 | {{site.data.var.ee}} 2.4.4-2.4.6 | TBA           | November 2024                       | PHP 8.1                     |
 
 <sup>1 End of Software Support includes both end of quality fixes and end of security fixes.</sup><br>