Merge branch '2.4-develop' of github.com:magento-gl/magento2ce into ACQE-functional-deployment-version13

Author: chandrakalahanchinal

app/code/Magento/AdminAnalytics/README.md

@@ -1 +1,3 @@
+# Magento_AdminAnalytics module
+
 The Magento\AdminAnalytics module gathers information about the features Magento administrators use. This information will be used to help improve the user experience on the Magento Admin.

app/code/Magento/AdminNotification/README.md

@@ -1,23 +1,23 @@
 # Magento_AdminNotification module
 
-The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
+This module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
 
 ## Installation details
 
-The Magento_AdminNotification module creates the following tables in the database:
+This module creates the following tables in the database:
 
 - `adminnotification_inbox`
 - `admin_system_messages`
 
 Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
 
-For information about module installation in Magento 2, see [Enable or disable modules](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/tutorials/manage-modules.html).
+For information about module installation, see [Enable or disable modules](https://experienceleague.adobe.com/en/docs/commerce-operations/installation-guide/tutorials/manage-modules).
 
 ## Extensibility
 
-Extension developers can interact with the Magento_AdminNotification module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
+Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
 
-[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_AdminNotification module.
+[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.
 
 ### Events
 
@@ -32,10 +32,10 @@ This module introduces the following layouts and layout handles in the `view/adm
 - `adminhtml_notification_index`
 - `adminhtml_notification_block`
 
-For more information about layouts in Magento 2, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).
+For more information about layouts, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).
 
 ### UI components
 
 You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
 
-For information about UI components in Magento 2, see [Overview of UI components](https://developer.adobe.com/commerce/frontend-core/ui-components/).
+For information about UI components, see [Overview of UI components](https://developer.adobe.com/commerce/frontend-core/ui-components/).

app/code/Magento/AdvancedPricingImportExport/README.md

@@ -1,9 +1,9 @@
 # Magento_AdvancedPricingImportExport module
 
-The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+This module handles the import and export of the advanced pricing.
 
 ## Extensibility
 
-Extension developers can interact with the Magento_AdvancedPricingImportExport module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
+Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
 
-[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_AdvancedPricingImportExport module.
+[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.

app/code/Magento/AdvancedSearch/README.md

@@ -1,6 +1,6 @@
 # Magento_AdvancedSearch module
 
-The Magento_AdvancedSearch module introduces advanced search functionality and provides interfaces that allow third-party search engines to implement this functionality.
+This module introduces advanced search functionality and provides interfaces that allow third-party search engines to implement this functionality.
 
 ## Installation details
 
@@ -9,21 +9,21 @@ Before disabling or uninstalling this module, note that the following modules de
 - Magento_Elasticsearch
 - Magento_Elasticsearch8
 
-For information about module installation in Magento 2, see [Enable or disable modules](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/tutorials/manage-modules.html).
+For information about module installation, see [Enable or disable modules](https://experienceleague.adobe.com/en/docs/commerce-operations/installation-guide/tutorials/manage-modules).
 
 ## Extensibility
 
-Extension developers can interact with the Magento_AdvancedSearch module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
+Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
 
-[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_AdvancedSearch module.
+[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.
 
 ### Events
 
 This module observes the following event:
 
 - `catalogsearch_query_save_after` in the `Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver` file.
 
-For information about an event in Magento 2, see [Events and observers](https://developer.adobe.com/commerce/php/development/components/events-and-observers/#events).
+For information about an event, see [Events and observers](https://developer.adobe.com/commerce/php/development/components/events-and-observers/#events).
 
 ### Layouts
 
@@ -37,4 +37,4 @@ The module interacts with the following layout handles in the `view/frontend/lay
 
 - `catalogsearch_result_index`
 
-For more information about layouts in Magento 2, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).
+For more information about layouts, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).

app/code/Magento/Amqp/README.md

@@ -1,9 +1,9 @@
 # Magento_Amqp module
 
-Magento_Amqp module provides functionality to publish/consume messages with the Advanced Message Queuing Protocol (AMQP).
+This module provides functionality to publish/consume messages with the Advanced Message Queuing Protocol (AMQP).
 
 ## Extensibility
 
-Extension developers can interact with the Magento_Amqp module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
+Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
 
-[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_Amqp module.
+[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.

app/code/Magento/Amqp/Setup/ConfigOptionsList.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\Amqp\Setup;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\TextConfigOption;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Deployment configuration options needed for Setup application
@@ -26,6 +26,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     public const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
     public const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
     public const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
+    public const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='queue-default-connection';
 
     /**
      * Path to the values in the deployment config
@@ -203,6 +204,11 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
             if (!$result) {
                 $errors[] = "Could not connect to the Amqp Server.";
             }
+
+            if (isset($options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION])
+                && $options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION] !== 'amqp') {
+                $errors = [];
+            }
         }
 
         return $errors;

app/code/Magento/Analytics/README.md

@@ -1,6 +1,6 @@
 # Magento_Analytics module
 
-The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://business.adobe.com/products/magento/business-intelligence.html) to use [Advanced Reporting](https://developer.adobe.com/commerce/php/development/advanced-reporting/modules/) functionality.
+This module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://business.adobe.com/products/magento/business-intelligence.html) to use [Advanced Reporting](https://developer.adobe.com/commerce/php/development/advanced-reporting/modules/) functionality.
 
 The module implements the following functionality:
 
@@ -15,7 +15,7 @@ The module implements the following functionality:
 
 ## Installation details
 
-Before disabling or uninstalling this module, note that the following modules depends on this module:
+Before disabling or uninstalling this module, note that the following modules depend on this module:
 
 - Magento_CatalogAnalytics
 - Magento_CustomerAnalytics
@@ -26,7 +26,7 @@ Before disabling or uninstalling this module, note that the following modules de
 
 ## Structure
 
-Beyond the [usual module file structure](https://developer.adobe.com/commerce/php/architecture/modules/overview/) the module contains a directory `ReportXml`.
+Beyond the [usual module file structure](https://developer.adobe.com/commerce/php/architecture/modules/overview/), this module contains a directory `ReportXml`.
 [Report XML](https://developer.adobe.com/commerce/php/development/advanced-reporting/report-xml/) is a markup language used to build reports for Advanced Reporting.
 The language declares SQL queries using XML declaration.
 

app/code/Magento/ApplicationPerformanceMonitor/README.md

@@ -1,9 +1,8 @@
-# ApplicationPerformanceMonitor
+# Magento_ApplicationPerformanceMonitor module
 
-Monitors the Performance of the Application
+This module monitors the performance of the application.
 
-To configure, edit app/etc/env.php
-Add these lines.
+To configure, edit `app/etc/env.php` and add these lines:
 
 ```php
 'application' => [
@@ -17,10 +16,10 @@ Add these lines.
 Use 0 or 1 as the value to enable or disable.
 Both `logger_output_enable` and `logger_output_verbose` default to 0.
 
-The option `logger_output_enable` enables outputting performance metrics to the logger using `debug` method of logger.
+The option `logger_output_enable` enables outputting performance metrics to the logger using the `debug` method of the logger.
 The option `logger_output_verbose` adds additional metrics.
 
-Example output in log file without verbose:
+Example output in the log file without verbose:
 
 ```log
 [2023-10-04T20:48:23.727037+00:00] report.ERROR: "Profile information": {
@@ -36,7 +35,7 @@ Example output in log file without verbose:
 }
 ```
 
-Example output in log file with verbose:
+Example output in the log file with verbose:
 
 ```log
 [2023-10-04T20:55:31.174304+00:00] report.ERROR: "Profile information": {
@@ -62,5 +61,5 @@ Example output in log file with verbose:
 }
 ```
 
-The additional options `newrelic_output_enable` and `newrelic_output_verbose` are only used if ApplicationPerformanceMonitorNewRelic module is also installed and enabled.
-See README.md in ApplicationPerformanceMonitorNewRelic for more details on that.
+The additional options `newrelic_output_enable` and `newrelic_output_verbose` are only used if the `ApplicationPerformanceMonitorNewRelic` module is also installed and enabled.
+See `README.md` in `ApplicationPerformanceMonitorNewRelic` for more details on that.

app/code/Magento/ApplicationPerformanceMonitorNewRelic/README.md

@@ -1,12 +1,11 @@
-# ApplicationPerformanceMonitorNewRelic
+# ApplicationPerformanceMonitorNewRelic module
 
-Monitors the Performance of the Application in New Relic
+This module monitors the performance of the application in New Relic.
 
-To use this module, it requires a New Relic account and the environment already by configured to use that account.
-For general New Relic PHP configuration information, see <https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/>.
+To use this module, you need a New Relic account and your environment must be configured to use that account.
+For general New Relic PHP configuration information, see [PHP agent configuration](https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/).
 
-To configure this module, edit `app/etc/env.php`.
-Add these lines.
+To configure this module, edit `app/etc/env.php` and add these lines:
 
 ```php
 'application' => [
@@ -21,6 +20,6 @@ Use 0 or 1 as the value to enable or disable.
 `newrelic_output_enable` defaults to 1, and `newrelic_output_verbose` defaults to 0.
 
 The option `newrelic_output_enable` enables outputting performance metrics to New Relic.
-The option `newrelic_output_verbose` adds additional metrics
+The option `newrelic_output_verbose` adds additional metrics.
 
-See README.md in ApplicationPerformanceMonitor for details about what metrics are in each.
+See README.md in ApplicationPerformanceMonitor for details about the metrics.

app/code/Magento/AsyncConfig/README.md

@@ -1,13 +1,13 @@
-# AsyncConfig
+# Magento_AsyncConfig module
 
-The _AsyncConfig_ module enables admin config save asynchronously, which saves configuration in a queue, and processes it in a first-in-first-out basis.
+This module enables admin config save asynchronously, which saves configuration in a queue, and processes it in a first-in-first-out basis.
 
 AsyncConfig values:
 
--  `0` — (_Default value_) Disable the AsyncConfig module and use the standard synchronous configuration save.  
--  `1` — Enable the AsyncConfig module for asynchronous config save.
+-  `0` — (_Default value_) Disable the module and use the standard synchronous configuration save.  
+-  `1` — Enable the module for asynchronous config save.
 
-To enable AsyncConfig, set the `config/async` variable in the `env.php` file. For example:
+To enable the module, set the `config/async` variable in the `env.php` file. For example:
 
 ```php
 <?php