Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023

Author: magento-devops-queue-mgr-svc

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
 This contribution model has contributors maintaining their own fork of the Magento 2 repository.
-The forked repository is then used to submit a request to the base repository to “pull” a set of changes.
+The forked repository is then used to submit a request to the base repository to "pull" a set of changes.
 For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
 
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
@@ -19,11 +19,11 @@ For more detailed information on contribution please read our [beginners guide](
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/HEAD/.github/PULL_REQUEST_TEMPLATE.md) for more information.
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
-3. PRs which include new logic or new features must be submitted along with:
-* Unit/integration test coverage
-* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
-4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
-5. All automated tests must pass.
+5. PRs which include new logic or new features must be submitted along with:
+   * Unit/integration test coverage
+   * Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
+6. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
+7. All automated tests must pass.
 
 ## Contribution process
 

README.md

@@ -26,7 +26,7 @@ However, for those who need a full-featured eCommerce solution, we recommend [Ad
 
 ## Contribute
 
-Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://developer.adobe.com/commerce/docs/) and [end-users](https://docs.magento.com/user-guide/), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
+Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://developer.adobe.com/commerce/docs/) and [end-users](https://experienceleague.adobe.com/docs/commerce-admin/user-guides/home.html), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
 
 - [Contribute to the code](https://developer.adobe.com/commerce/contributor/guides/code-contributions/)
 - [Report an issue](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report)

app/code/Magento/Analytics/etc/config.xml

@@ -15,7 +15,7 @@
                 <otp>https://advancedreporting.rjmetrics.com/otp</otp>
                 <report>https://advancedreporting.rjmetrics.com/report</report>
                 <notify_data_changed>https://advancedreporting.rjmetrics.com/report</notify_data_changed>
-                <documentation>https://docs.magento.com/user-guide/reports/advanced-reporting.html</documentation>
+                <documentation>https://experienceleague.adobe.com/docs/commerce-admin/start/reporting/business-intelligence.html#advanced-reporting</documentation>
             </url>
             <integration_name>Magento Analytics user</integration_name>
             <general>

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -20,7 +20,7 @@ class Switcher extends \Magento\Backend\Block\Template
     /**
      * URL for store switcher hint
      */
-    public const HINT_URL = 'https://docs.magento.com/user-guide/configuration/scope.html';
+    public const HINT_URL = 'https://experienceleague.adobe.com/docs/commerce-admin/start/setup/websites-stores-views.html#scope-settings'; // @codingStandardsIgnoreLine
 
     /**
      * Name of website variable

app/code/Magento/Backup/README.md

@@ -4,7 +4,7 @@ The Magento_Backup module allows administrators to perform backups and rollbacks
 
 The Magento_Backup module does not affect the storefront.
 
-For more information about this module, see [Magento Backups](https://docs.magento.com/user-guide/system/backups.html)
+For more information about this module, see [Backups](https://experienceleague.adobe.com/docs/commerce-admin/systems/tools/backups.html)
 
 ## Extensibility
 

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -394,7 +394,7 @@ protected function customizeNameListeners(array $meta)
 
         $urlKeyConfig = [
             'tooltip' => [
-                'link' => 'https://docs.magento.com/user-guide/catalog/catalog-urls.html',
+                'link' => 'https://experienceleague.adobe.com/docs/commerce-admin/catalog/catalog/catalog-urls.html',
                 'description' => __(
                     'The URL key should consist of lowercase characters with hyphens to separate words.'
                 ),

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

@@ -165,7 +165,7 @@ protected function getFieldsForFieldset()
         $websitesList = $this->getWebsitesList();
         $isNewProduct = !$this->locator->getProduct()->getId();
         $tooltip = [
-            'link' => 'https://docs.magento.com/user-guide/configuration/scope.html',
+            'link' => 'https://experienceleague.adobe.com/docs/commerce-admin/start/setup/websites-stores-views.html#scope-settings', // @codingStandardsIgnoreLine
             'description' => __(
                 'If your Magento installation has multiple websites, ' .
                 'you can edit the scope to use the product on specific sites.'

app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml

@@ -133,7 +133,7 @@
                 </validation>
                 <dataType>number</dataType>
                 <tooltip>
-                    <link>https://docs.magento.com/user-guide/configuration/scope.html</link>
+                    <link>https://experienceleague.adobe.com/docs/commerce-admin/start/setup/websites-stores-views.html#scope-settings</link>
                     <description>What is this?</description>
                 </tooltip>
                 <label translate="true">Websites</label>

app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml

@@ -125,7 +125,7 @@
                 </validation>
                 <dataType>int</dataType>
                 <tooltip>
-                    <link>https://docs.magento.com/user-guide/configuration/scope.html</link>
+                    <link>https://experienceleague.adobe.com/docs/commerce-admin/start/setup/websites-stores-views.html#scope-settings</link>
                     <description>What is this?</description>
                 </tooltip>
                 <label translate="true">Store View</label>

app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml

@@ -209,7 +209,7 @@
                 </validation>
                 <dataType>int</dataType>
                 <tooltip>
-                    <link>https://docs.magento.com/user-guide/configuration/scope.html</link>
+                    <link>https://experienceleague.adobe.com/docs/commerce-admin/start/setup/websites-stores-views.html#scope-settings</link>
                     <description>What is this?</description>
                 </tooltip>
                 <label translate="true">Store View</label>