Merge branch 'master' into GITHUB_MCLOUD_DOCKER-155

Author: arhiopterecs

.github/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at DL-Magento-Doc-Feedback@magento.com. All
+reported by contacting the project team in [Slack](https://magentocommeng.slack.com/messages/CAN932A3H). All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

.github/CONTRIBUTING.md

@@ -151,6 +151,5 @@ Have a question? Need help? Magento DevDocs, Maintainers, and other Contributors
 
 -  [Slack](https://magentocommeng.slack.com/messages/CAN932A3H) ([Join us](http://tinyurl.com/engcom-slack))
 -  [Twitter @MagentoDevDocs](https://twitter.com/MagentoDevDocs)
--  [E-mail](mailto:[email protected])
 
 Thank you for contributing your brilliance to Magento DevDocs!!

README.md

@@ -169,4 +169,3 @@ If you have questions, open an issue and ask us. We're looking forward to hearin
 
 -  [Visit our wiki](https://github.com/magento/devdocs/wiki)
 -  <a href="https://twitter.com/MagentoDevDocs" class="twitter-follow-button" data-show-count="false">Follow @MagentoDevDocs</a>
--  [E-mail us](mailto:[email protected])

rakelib/build.rake

@@ -16,7 +16,7 @@ namespace :build do
   end
 
   desc 'Build the site for staging'
-  task :stage do
+  task stage: %w[init] do
     print 'Building the site for staging: $ '.magenta
     sh 'bin/jekyll',
        'build',

src/_data/mde.yml

@@ -249,7 +249,7 @@ extensions:
           2.3.3: compatible
           2.3.4: compatible
           2.3.5-p1: compatible
-          2.4.0: compatible
+          2.4.0: not supported
 
       -
         name: 3.0.2
@@ -260,7 +260,7 @@ extensions:
           2.3.3: compatible
           2.3.4: compatible
           2.3.5-p1: compatible
-          2.4.0: compatible
+          2.4.0: not supported
       -
         name: 3.0.1
         support:
@@ -270,7 +270,7 @@ extensions:
           2.3.3: compatible
           2.3.4: compatible
           2.3.5-p1: compatible
-          2.4.0: compatible
+          2.4.0: not supported
       -
         name: 3.0.0
         support:

src/_data/toc/php-developer-guide.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/rest-api.yml

@@ -40,15 +40,15 @@ pages:
           children:
 
             - label: Admin REST endpoints
-              url: https://magento.redoc.ly/2.4-admin/
+              url: https://magento.redoc.ly/2.4.0-admin/
               include_versions: ["2.4"]
 
             - label: Customer REST endpoints
-              url: https://magento.redoc.ly/2.4-customer/
+              url: https://magento.redoc.ly/2.4.0-customer/
               include_versions: ["2.4"]
 
             - label: Guest REST endpoints
-              url: https://magento.redoc.ly/2.4-guest/
+              url: https://magento.redoc.ly/2.4.0-guest/
               include_versions: ["2.4"]
 
         - label: Generate a local API reference

src/_data/whats-new.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/_includes/config/setup-cron_2.4_how-to.md

@@ -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/install/php-extensions-template.md

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

src/_includes/layout/footer-scripts.html

@@ -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/cloud/cdn/cloud-fastly.md

@@ -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/cloud/cdn/configure-fastly-customize-cache.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.
 

src/cloud/env/variables-deploy.md

@@ -408,6 +408,9 @@ If you specify `\Magento\Framework\Cache\Backend\RemoteSynchronizedCache` as the
 -  **Default**—`false`
 -  **Version**—Magento 2.1.16 and later
 
+{:.bs-callout-warning}
+Do not enable this variable on scaled architecture (split architecture) projects. It causes Redis connection errors. Redis slaves are still active but will not be used for Redis reads. As an alternative, we recommend the following: use Magento 2.3.5 or later on Cloud projects with a scaled architecture, implement a new Redis backend configuration, and implement L2 caching for Redis.
+
 Magento can read multiple Redis instances asynchronously. Set to `true` to automatically use a _read-only_ connection to a Redis instance to receive read-only traffic on a non-master node. This improves performance through load balancing, because only one node needs to handle read-write traffic. Set to `false` to remove any existing read-only connection array from the `env.php` file.
 
 ```yaml

src/cloud/howtos/debug.md

@@ -13,7 +13,7 @@ functional_areas:
 Xdebug is an extension for debugging your PHP. The following explains how to configure Xdebug and PhpStorm to debug in your local environment. You can use the IDE of your choice. See the vendor documentation for those applications for further configuration information.
 
 {:.bs-callout-info}
-You can configure Xdebug to run in the {{site.data.var.mcd-prod}} environment for local debugging without changing your {{site.data.var.ece}} project configuration. See [Configure Xdebug for Docker]{{site.baseurl}}/cloud/docker/docker-development-debug.html).
+You can configure Xdebug to run in the {{site.data.var.mcd-prod}} environment for local debugging without changing your {{site.data.var.ece}} project configuration. See [Configure Xdebug for Docker]({{site.baseurl}}/cloud/docker/docker-development-debug.html).
 
 To set up Xdebug, you need to [configure](#configure-xdebug) a file in your Git repository, configure your IDE, and set up port forwarding. You can configure settings in the `magento.app.yaml` file. After editing, you can push the Git changes across all Starter environments and Pro Integration environments to enable Xdebug. To push these settings to Pro plan Staging and Production environments, you must enter a ticket.
 

src/cloud/project/magento-app-php-application.md

@@ -16,7 +16,7 @@ type: php:<version>
 
 ### PHP extensions
 
-You can enable additional PHP extensions in the `runtime:extension` section. Also, the extensions specified become available in the Docker PHP containers.
+You can enable or disable PHP extensions in the `runtime:extension` section. Also, the extensions specified become available in the Docker PHP containers.
 
 > .magento.app.yaml
 
@@ -41,96 +41,18 @@ php -m
 
 For details about a specific PHP extension, see the [PHP Extension List](https://www.php.net/manual/en/extensions.alphabetical.php).
 
-{{site.data.var.ece}} supports the following extensions:
+The following table shows the supported PHP extensions when deploying {{site.data.var.ee}} on the Cloud platform.
 
--  Default extensions:
-   -  `bcmath`
-   -  `bz2`
-   -  `calendar`
-   -  `exif`
-   -  `gd`
-   -  `gettext`
-   -  `intl`
-   -  `mysqli`
-   -  `pcntl`
-   -  `pdo_mysql`
-   -  `soap`
-   -  `sockets`
-   -  `sysvmsg`
-   -  `sysvsem`
-   -  `sysvshm`
-   -  `opcache`
-   -  `zip`
+{:.php-plugins-table}
+| Default extensions | Installed extensions<br>that cannot be uninstalled | Extensions that can be installed<br> and uninstalled as needed|
+|--------------------|---------------------|---------------------|
+| `bcmath`<br> `bz2`<br> `calendar`<br> `exif`<br> `gd`<br> `gettext`<br> `intl`<br> `mysqli`<br> `pcntl`<br> `pdo_mysql`<br> `soap`<br> `sockets`<br>  `sysvmsg`<br> `sysvsem`<br> `sysvshm`<br> `opcache`<br> `zip` |`ctype`<br> `curl`<br> `date`<br> `dom`<br> `fileinfo`<br> `filter`<br> `ftp`<br> `hash`<br> `iconv`<br> `json`<br> `mbstring`<br> `mysqlnd`<br> `openssl`<br> `pcre`<br> `pdo`<br> `pdo_sqlite`<br> `phar`<br> `posix`<br> `readline`<br> `session`<br> `sqlite3`<br> `tokenizer`<br> `xml`<br> `xmlreader`<br> `xmlwriter`<br> |`geoip`<br>`gmp`<br> `igbinary`<br> `imagick`<br> `imap`<br>`ioncube`<br> `ldap`<br> `mailparse`<br> `mcrypt`<br> `msgpack`<br> `mysqli`<br> `oauth`<br> `pdo_mysql`<br> `propro`<br> `pspell`<br> `raphf`<br> `recode`<br> `redis`<br> `shmop` `sockets`<br> `sodium`<br> `ssh2`<br>`tidy`<br> `xdebug`<br> `xmlrpc`<br> `xsl`<br> `yaml`|
 
--  Extensions that are installed and cannot be uninstalled:
-   -  `ctype`
-   -  `curl`
-   -  `date`
-   -  `dom`
-   -  `fileinfo`
-   -  `filter`
-   -  `ftp`
-   -  `hash`
-   -  `iconv`
-   -  `json`
-   -  `mbstring`
-   -  `mysqlnd`
-   -  `openssl`
-   -  `pcre`
-   -  `pdo`
-   -  `pdo_sqlite`
-   -  `phar`
-   -  `posix`
-   -  `readline`
-   -  `session`
-   -  `sqlite3`
-   -  `tokenizer`
-   -  `xml`
-   -  `xmlreader`
-   -  `xmlwriter`
-
--  Extensions that can be installed and uninstalled as needed:
-   -  `bcmath`
-   -  `bz2`
-   -  `calendar`
-   -  `exif`
-   -  `gd`
-   -  `geoip`
-   -  `gettext`
-   -  `gmp`
-   -  `igbinary`
-   -  `imagick`
-   -  `imap`
-   -  `intl`
-   -  `ioncube`
-   -  `ldap`
-   -  `mailparse`
-   -  `mcrypt`
-   -  `msgpack`
-   -  `mysqli`
-   -  `oauth`
-   -  `opcache`
-   -  `pdo_mysql`
-   -  `propro`
-   -  `pspell`
-   -  `raphf`
-   -  `recode`
-   -  `redis`
-   -  `shmop`
-   -  `soap`
-   -  `sockets`
-   -  `sodium`
-   -  `ssh2`
-   -  `sysvmsg`
-   -  `sysvsem`
-   -  `sysvshm`
-   -  `tidy`
-   -  `xdebug`
-   -  `xmlrpc`
-   -  `xsl`
-   -  `yaml`
-   -  `zip`
-   -  `pcntl`
+The PHP module requirements for {{ site.data.var.ee }} are tied to the Magento version. See [PHP requirements]({{ site.baseurl }}/guides/v2.4/install-gde/prereq/php-settings.html).
 
 {:.bs-callout-warning}
 PHP compiled with debug is not supported and the Probe may conflict with XDebug or XHProf. Disable those extensions when enabling the Probe. The Probe conflicts with some PHP extensions like Pinba or IonCube.
+
+### Custom PHP configuration
+
+You can customize the PHP settings for a Cloud environment by adding a `php.ini` file to your project. See [Customize PHP.INI]({{ site.baseurl }}/cloud/project/magento-app-php-ini.html).