Merge branch '2.4.1-develop' into 2.4.2-develop

Author: magento-docs

src/_data/mde.yml

@@ -284,8 +284,12 @@ pages:
         - label: Check the Magento version
           url: /extension-dev-guide/versioning/check-version.html
 
+        - label: Codebase changes
+          url: /extension-dev-guide/versioning/codebase-changes.html
+
         - label: Module version dependencies
           url: /extension-dev-guide/versioning/dependencies.html
 
-        - label: Codebase changes
-          url: /extension-dev-guide/versioning/codebase-changes.html
+        - label: MFTF test versioning and backward compatibility policy
+          url: /extension-dev-guide/versioning/mftf-tests-codebase-changes.html
+          exclude_versions: ["2.3"]

src/_data/toc/php-developer-guide.yml

@@ -30,6 +30,12 @@ pages:
         - label: Component Status
           url: /release-notes/component-status.html
 
+        - label: Magento Open Source 2.3.6 Release Notes
+          url: /release-notes/open-source-2-3-6.html
+
+        - label: Magento Commerce 2.3.6 Release Notes
+          url: /release-notes/commerce-2-3-6.html
+
         - label: Magento Open Source 2.3.5 Release Notes
           url: /release-notes/release-notes-2-3-5-open-source.html
 

src/_data/toc/release-notes.yml

@@ -1,11 +1,72 @@
 title: Whats New on Devdocs
-description: 
+description:
   This page contains recent changes that we think you'd like to know about.
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: /whats-new.html
 thread: /whatsnew-feed.xml
-updated: Mon Sep 14 12:24:21 2020
+updated: Wed Sep 30 17:41:53 2020
 entries:
+- description: Added a [warning](https://devdocs.magento.com/cloud/env/variables-deploy.html#redis_use_slave_connection)
+    about enabling the `REDIS_USE_SLAVE_CONNECTION` deploy variable for Cloud projects
+    that use split architecture.
+  versions: 2.x
+  type: Technical
+  date: September 30, 2020
+  link: https://github.com/magento/devdocs/pull/7964
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
+- description: Added the Import section to the [Contribution Guide](https://devdocs.magento.com/contributor-guide/contributing.html#import).
+  versions: 2.x
+  type: Major Update
+  date: September 24, 2020
+  link: https://github.com/magento/devdocs/pull/7886
+  contributor: sidolov
+  profile: https://github.com/sidolov
+- description: Added an optional step to show how to add default values in the [Creating
+    a dynamic row system config](https://devdocs.magento.com/guides/v2.4/ext-best-practices/tutorials/dynamic-row-system-config.html)
+    tutorial topic in the _Extension Best Practices_ guide.
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: September 23, 2020
+  link: https://github.com/magento/devdocs/pull/7918
+  contributor: BarnyShergold
+  profile: https://github.com/BarnyShergold
+- description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
+    for the 1.0.5 Magento Quality Patch (MQP) package release.
+  versions: 2.x
+  type: Major Update
+  date: September 22, 2020
+  link: https://github.com/magento/devdocs/pull/7913
+  contributor: Rykh
+  profile: https://github.com/Rykh
+- description: Added a new Magento [Lifecycle policy](https://devdocs.magento.com/release/lifecycle-policy.html)
+    topic.
+  versions: 2.x
+  type: New Topic
+  date: September 22, 2020
+  link: https://github.com/magento/devdocs/pull/7904
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
+- description: Updated Fastly set up and Site launch documentation in the Cloud Guide
+    to reflect change from shared certificates for Fastly for each project to have
+    a unique Domain-Validated SSL/TLS certificate issued by Let's Encrypt. Also, updated
+    DNS configuration instructions for adding domains, CNAME, and A records.<br/><br/>Moved
+    documentation for Fastly cache customization options to a new Custom cache configuration
+    topic. Added instructions for managing domains and enabling maintenance mode using
+    the Fastly CDN module for Magento 2. See Custom cache configuration.
+  versions: 2.x
+  type: Major Update
+  date: September 17, 2020
+  link: https://github.com/magento/devdocs/pull/7885
+  contributor: meker12
+  profile: https://github.com/meker12
+- description: Described how to disable [GraphQL introspection queries](https://devdocs.magento.com/guides/v2.3/graphql/queries/index.html#introspection-queries).
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: September 15, 2020
+  link: https://github.com/magento/devdocs/pull/7863
+  contributor: thiaramus
+  profile: https://github.com/thiaramus
 - description: Added the [Simple product data types](https://devdocs.magento.com/guides/v2.4/graphql/interfaces/simple-product.html)
     topic to the _GraphQL Developer Guide_.
   versions: 2.3.x, 2.4.x
@@ -2123,7 +2184,7 @@ entries:
   type: Major update
   date: October 1, 2019
   link: https://github.com/magento/devdocs/pull/5422
-- description: Added the "Disabling an Observer" section to the [Events and Observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html) 
+- description: Added the "Disabling an Observer" section to the [Events and Observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html)
     topic in the _PHP Developer Guide_.
   versions: 2.2.x, 2.3.x
   type: Major update
@@ -6281,4 +6342,4 @@ entries:
   versions: 2.x
   type: New
   date: Oct 7 2016
-  
+

src/_data/whats-new.yml

@@ -35,5 +35,10 @@ A sample follows:
 #~ MAGENTO END c5f9e5ed71cceaabc4d4fd9b3e827a2b
 ```
 
-{:.bs-callout-info}
-The `update/cron.php` file exists in [Composer](https://glossary.magento.com/composer)- and [archive-based](https://magento.com/tech-resources/download) Magento installations. It does not exist if you installed Magento by cloning the [Magento 2 git repository](https://github.com/magento/magento2/).
+{%
+include note.html
+type='info'
+content='The `update/cron.php` file has been removed in Magento 2.4.0, if this file exists on your installation, it can be safely removed.
+
+Any reference to `update/cron.php` and `bin/magento setup:cron:run` should also be removed from the crontab'
+%}

src/_includes/config/setup-cron_2.4_how-to.md

@@ -6,3 +6,8 @@
 *  {{ item[0] }}
   {% endif %}
 {% endfor %}
+{% unless page.guide_version == '2.3' %}
+
+*  ext-sockets
+
+{% endunless %}

src/_includes/install/php-extensions-template.md

@@ -25,8 +25,6 @@
     })();
 </script>
 
-<script type="text/javascript">_satellite.pageBottom();</script>
-
 {% endif %}
 
 <script type="text/javascript" src="{{ site.baseurl }}/common/js/glossary-link-enhancer.js"></script>

src/_includes/layout/footer-scripts.html

@@ -35,7 +35,7 @@ Fastly provides the following services to optimize and secure content delivery o
 
    -  **SSL/TLS certificates**–The Fastly service requires an SSL/TLS certificate to serve secure traffic over HTTPS. Magento provides a Domain-validated Let's Encrypt SSL/TLS certificate for each Staging and Production environment. Magento completes domain validation and certificate provisioning during the Fastly set up process. See [TLS and Fastly].
 
-   -  **Origin cloaking**–Magento can enable Origin Cloaking for all Magento Commerce projects hosted on the Cloud platform. This option hides the IP addresses of your origin servers to protect them from direct attack. When this feature is enabled, all traffic to your Cloud infrastructure must route through the Fastly CDN or another secure channel. Any traffic sent directly to the Origin servers is blocked. If you have traffic that does not require caching, you can customize the Fastly service configuration to allow requests to [bypass the Fastly cache].
+   -  **Origin cloaking**–Magento can enable Origin Cloaking for all Magento Commerce projects hosted on the Cloud platform. This option hides the IP addresses of your origin servers to protect them from direct access. When this feature is enabled, all traffic to your Cloud infrastructure must route through the Fastly CDN or another secure channel. Any traffic sent directly to the Origin servers is blocked. If you have traffic that does not require caching, you can customize the Fastly service configuration to allow requests to [bypass the Fastly cache].
 
 -  **Image optimization**—Offloads image processing and resizing load to the Fastly service freeing servers to process orders and conversions efficiently. See [Fastly image optimization].
 

src/_includes/release-notes/engcomm-2-4-1-partner.md

@@ -129,29 +129,9 @@ To review the back end setting configuration:
 
    ![Modify the back end]({{ site.baseurl }}/common/images/cloud/cloud_fastly-backend.png){:width="600px"}
 
-1. Select the **Shield** location (or datacenter) closest to your Cloud service region.
-
-   For example, if your project is hosted on AWS, then the Staging is on the west coast of the United States (`us-west-1`); therefore, you would select the `sjc-ca-us` Fastly shield location. This is the POP that provides caching services.
-
-   The following list shows which Fastly shield locations to use based on AWS regions:
-
-   -  ap-east-1 => hongkong-hk
-   -  ap-northeast-1 => tyo-tokyo-jp, hnd-tokyo-jp
-   -  ap-northeast-2 => tyo-tokyo-jp, hnd-tokyo-jp
-   -  ap-southeast-1 => singapore-sg
-   -  ap-southeast-2 => sydney-au
-   -  ap-south-1 => singapore-sg
-   -  ca-central-1 => yul-montreal-ca, iad-va-us, dca-dc-us, bwi-va-us
-   -  eu-central-1 => frankfurt-de, hhn-frankfurt-de
-   -  eu-north-1 => stockholm-bma
-   -  eu-west-1 => london-uk, london_city-uk
-   -  eu-west-2 => london-uk, london_city-uk
-   -  eu-west-3 => cdg-par-fr
-   -  sa-east-1 => gru-br-sa
-   -  us-east-1 => iad-va-us, dca-dc-us, bwi-va-us
-   -  us-east-2 => iad-va-us, dca-dc-us, bwi-va-us
-   -  us-west-1 => sjc-ca-us, pao-ca-us
-   -  us-west-2 => sea-wa-us
+1. Select the **Shield** location (or datacenter).
+
+   The default Fastly configuration for your project sets the location closest to your Cloud service region. If you need to change it, select a location close to the default location.
 
 1. Modify the timeout values (in microseconds) for the connection to the shield, time between bytes, and time for the first byte. We recommend keeping the default timeout settings.