Merge branch 'master' into 2.4.1-develop

Author: magento-docs

src/_data/codebase/cloud/magento-cloud.json

@@ -193,7 +193,7 @@
     - label: Checkout
       url: /howdoi/checkout/checkout_overview.html
 
-    - label: Extensions Marketplace
+    - label: Magento Marketplace
       url: /marketplace/sellers/getting-started.html
       versionless: true
 

src/_data/codebase/v2_3/cloud/composer_lock.json

@@ -41,6 +41,10 @@ pages:
     url: /mftf/docs/guides/cicd.html
     versionless: true
 
+  - label: Interactive Pause
+    url: /mftf/docs/interactive-pause.html
+    versionless: true
+
   - label: Merge points for extensions
     url: /mftf/docs/merge_points/introduction.html
     versionless: true

src/_data/codebase/v2_3/commerce/composer_lock.json

@@ -229,6 +229,9 @@ pages:
         - label: Adding an admin grid
           url: /extension-dev-guide/admin-grid.html
 
+        - label: Price adjustments
+          url: /extension-dev-guide/price-adjustments.html
+
         - label: Searching with repositories
           url: /extension-dev-guide/searching-with-repositories.html
 

src/_data/codebase/v2_3/open-source/composer_lock.json

@@ -69,9 +69,6 @@ pages:
         - label: Reference
           url: /release-notes/backward-incompatible-changes/reference.html
 
-    - label: B2B
-      url: /release-notes/b2b-release-notes.html
-
     - label: Packages
       children:
 
@@ -84,6 +81,9 @@ pages:
         - label: Magento Commerce Cloud packages
           url: /release-notes/packages-cloud.html
 
+    - label: B2B
+      url: /release-notes/b2b-release-notes.html
+
     - label: GraphQL
       url: /graphql/release-notes.html
 

src/_data/codebase/v2_4/cloud/composer_lock.json

@@ -4,8 +4,142 @@ description:
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: /whats-new.html
 thread: /whatsnew-feed.xml
-updated: Mon Jul 27 11:43:37 2020
+updated: Tue Aug 18 11:56:55 2020
 entries:
+- description: Changed data sources and content structure for [Packages](https://devdocs.magento.com/guides/v2.4/release-notes/packages-open-source.html).
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: August 17, 2020
+  link: https://github.com/magento/devdocs/pull/7740
+  contributor: dshevtsov
+  profile: https://github.com/dshevtsov
+- description: The section "Extend configuration data" has been moved from the `storeConfig
+    query` to the [Extend an existing GraphQL schema](https://devdocs.magento.com/guides/v2.3/graphql/develop/extend-existing-schema.html)
+    topic.
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: August 11, 2020
+  link: https://github.com/magento/devdocs/pull/7719
+  contributor: keharper
+  profile: https://github.com/keharper
+- description: Updated the [Marketplace EQP API](https://devdocs.magento.com/marketplace/eqp/v1/api.html)
+    documentation as part of the roll-out of the sandbox environment. Other enhancements
+    include a new page on how to self-serve API access keys, and a general reorganization
+    of several topics.
+  versions: ''
+  type: New Topic
+  date: August 7, 2020
+  link: https://github.com/magento/devdocs/pull/7640
+  contributor: mikeweis
+  profile: https://github.com/mikeweis
+- description: Added PrivateLink limitation on establishing HTTPS connections to Magento.
+    See  [PrivateLink limitations](https://devdocs.magento.com/cloud/project/privatelink-service.html#limitations)
+    topic in the _Cloud Guide_ .
+  versions: 2.x
+  type: Technical
+  date: August 7, 2020
+  link: https://github.com/magento/devdocs/pull/7694
+  contributor: ttunga
+  profile: https://github.com/ttunga
+- description: Published release notes and documentation updates for the June 2020
+    Magento Cloud packages release:<br/>- [ece-tools package 2002.1.2](https://devdocs.magento.com/cloud/release-notes/ece-release-notes.html#v200211)<br/>-
+    [Magento Cloud Patches 1.0.6](https://devdocs.magento.com/cloud/release-notes/mcp-release-notes.html#v106)<br/>-
+    [Magento Cloud Docker 1.1.1](https://devdocs.magento.com/cloud/release-notes/mcd-release-notes.html#v111)<br/>-
+    [Magento Cloud Components 1.0.6](https://devdocs.magento.com/cloud/release-notes/mcc-release-notes.html#v106)
+  versions: 2.x
+  type: Major Update
+  date: August 5, 2020
+  link: https://github.com/magento/devdocs/pull/7669
+  contributor: meker12
+  profile: https://github.com/meker12
+- description: Extended MFTF reference documentation for [functional tests](https://devdocs.magento.com/guides/v2.4/reference/mftf/functional-tests.html)
+    and [action groups](https://devdocs.magento.com/guides/v2.4/reference/mftf/action-groups.html)
+    with data from Commerce specific and B2B specific modules.
+  versions: 2.4.0
+  type: Major Update
+  date: August 4, 2020
+  link: https://github.com/magento/devdocs/pull/7653
+  contributor: dshevtsov
+  profile: https://github.com/dshevtsov
+- description: Updated the list of MSI modules that must be disabled to use Connector and OMS together in the [Install Inventory Management topic](https://devdocs.magento.com/extensions/inventory-management/).
+  versions: 2.4.x
+  type: Major Update
+  date: July 30, 2020
+  link: https://github.com/magento/devdocs/pull/7611
+  contributor: shrielenee
+  profile: https://github.com/shrielenee
+- description: Added data for reference documentation covering [functional tests](https://devdocs.magento.com/guides/v2.4/reference/mftf/functional-tests.html)
+    and [action groups](https://devdocs.magento.com/guides/v2.4/reference/mftf/action-groups.html).
+  versions: 2.4.0
+  type: Major Update
+  date: July 30, 2020
+  link: https://github.com/magento/devdocs/pull/7637
+  contributor: dshevtsov
+  profile: https://github.com/dshevtsov
+- description: Updated [reference documentation](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html)
+    covering backward incompatible changes for 2.3.0-2.4.0 versions delta.
+  versions: ''
+  type: Major Update
+  date: July 29, 2020
+  link: https://github.com/magento/devdocs/pull/7607
+  contributor: devops-devdocs
+  profile: https://github.com/devops-devdocs
+- description: Added the GA version of the Magento 2.4.0 Release Notes. See [Magento
+    Commerce 2.4.0 Release Notes](https://devdocs.magento.com/guides/v2.4/release-notes/release-notes-2-4-0-commerce.html)<br/>and
+    [Magento Open Source 2.4.0 Release Notes](https://devdocs.magento.com/guides/v2.4/release-notes/release-notes-2-4-0-open-source.html)
+  versions: 2.4.0
+  type: Major Update
+  date: July 28, 2020
+  link: https://github.com/magento/devdocs/pull/7585
+  contributor: jfrontain
+  profile: https://github.com/jfrontain
+- description: Added documentation for aggregated logs and the New Relic Logs service
+    for Pro Production and Staging environments.  See [New Relic services](https://devdocs.magento.comcloud/project/new-relic.html).
+  versions: 2.x
+  type: Major Update
+  date: July 28, 2020
+  link: https://github.com/magento/devdocs/pull/7604
+  contributor: meker12
+  profile: https://github.com/meker12
+- description: Updated information about [packages](https://devdocs.magento.com/guides/v2.4/release-notes/packages-open-source.html)
+    and [PHP settings](https://devdocs.magento.com/guides/v2.4/install-gde/prereq/php-settings.html).
+  versions: 2.4.0
+  type: Major Update
+  date: July 28, 2020
+  link: https://github.com/magento/devdocs/pull/7608
+  contributor: dshevtsov
+  profile: https://github.com/dshevtsov
+- description: Updated `bin/magento` commands reference at [Magento OpenSource](https://devdocs.magento.com/guides/v2.4/reference/cli/magento.html)
+    and [Magento Commerce](https://devdocs.magento.com/guides/v2.4/reference/cli/magento-commerce.html).
+  versions: 2.4.0
+  type: Major Update
+  date: July 28, 2020
+  link: https://github.com/magento/devdocs/pull/7612
+  contributor: dshevtsov
+  profile: https://github.com/dshevtsov
+- description: Added Module Reference Guide topics at the [2.4 version](https://devdocs.magento.com/guides/v2.4/mrg/intro.html).
+  versions: 2.4.0
+  type: Major Update
+  date: July 28, 2020
+  link: https://github.com/magento/devdocs/pull/7610
+  contributor: dshevtsov
+  profile: https://github.com/dshevtsov
+- description: Added a known issue about the `inventory_cleanup_reservations` cron
+    job not working properly in the [Inventory 1.2.0 release notes](https://devdocs.magento.com/guides/v2.4/inventory/release-notes.html).
+  versions: 2.4.0
+  type: Technical
+  date: July 27, 2020
+  link: https://github.com/magento/devdocs/pull/7596
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
+- description: Standardized [release terminology](https://devdocs.magento.com/release/policy/)
+    related to patch releases, hotfixes, invdividual fixes, and custom patches.
+  versions: 2.4.0
+  type: Major Update
+  date: July 27, 2020
+  link: https://github.com/magento/devdocs/pull/7602
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
 - description: Added a known issue about the `inventory_cleanup_reservations` cron
     job not working properly in the [Inventory 1.2.0 release notes](https://devdocs.magento.com/guides/v2.4/inventory/release-notes.html).
   versions: 2.4.0

src/_data/codebase/v2_4/commerce/composer_lock.json

@@ -147,6 +147,8 @@ Warning errors indicate a problem with the Magento Commerce Cloud project config
 | 2023 | install-update:split-db | Enabling a split database will be skipped. |  |
 | 2024 | install-update:split-db | The SPLIT_DB variable is missing the configuration for split connection types. |  |
 | 2025 | install-update:split-db | Slave connection not set. |  |
+| 2026 | pre-deploy:restore-writable-dirs | Failed to restore some data generated during the build phase to the mounted directories | Check the `cloud.log` for more information. |
+| 2027 | validate-config:mage-mode-variable | Mode value for MAGE_MODE environment variable not supported | Remove the MAGE_MODE environment variable, or change its value to "production". Magento Cloud supports "production" mode only. |
 
 ### Post-deploy stage
 
@@ -156,6 +158,7 @@ Warning errors indicate a problem with the Magento Commerce Cloud project config
 | 3001 | validate-config | Debug logging is enabled in Magento | To save disk space, do not enable debug logging for your production environments. |
 | 3002 | warm-up | Can not fetch store urls |  |
 | 3003 | warm-up | Can not fetch store url |  |
+| 3004 | backup | Cannot create backup files |  |
 
 ### General
 

src/_data/codebase/v2_4/open-source/composer_lock.json

@@ -21,7 +21,7 @@ If you attempt to enable or disable a module that depends on other modules, the
 {:.bs-callout-info}
 It's possible that module A's `composer.json` declares a conflict with module B but not vice versa.
 
-*Command line [module enable or disable subcommand]({{ page.baseurl }}/install-gde/install/cli/install-cli-subcommands-enable.html) only:* To force a module to be enabled or disabled regardless of its dependencies, use the optional`--force` argument.
+*Command line [module enable or disable subcommand]({{ page.baseurl }}/install-gde/install/cli/install-cli-subcommands-enable.html) only:* To force a module to be enabled or disabled regardless of its dependencies, use the optional `--force` argument.
 
 {:.bs-callout-info}
 Using `--force` can disable your Magento store and cause problems accessing the Magento Admin.

src/_data/main-nav.yml

@@ -1,5 +1,7 @@
-{% for item in platform-req %}
-  {% unless item[0] == 'php' %}
+{% assign product = packages | where_exp: 'package', "package.name contains 'magento/product-'" | first %}
+
+{% for item in product.require %}
+  {% if item[0] contains 'ext-' %}
 * {{ item[0] }}
-  {% endunless %}
-{% endfor %}
+  {% endif %}
+{% endfor %}

src/_data/toc/mftf.yml

@@ -0,0 +1,6 @@
+Magento supports PHP 7.3.
+
+{:.bs-callout-warning}
+PHP 7.1 has reached [End of Life](https://www.php.net/supported-versions.php). To maintain PCI compliance, Magento should not be run on unsupported software.
+Installing from GitHub will no longer work with Magento 2.3.4/PHP 7.1.
+The only way to install 2.3.4 with PHP 7.1.x is with Composer.

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

@@ -0,0 +1,4 @@
+Magento supports PHP 7.4.0. You can install Magento 2.4.0 with 7.3, but it is not tested or recommended. It is intended for upgrading from Magento 2.3.x to Magento 2.4.0.
+
+{:.bs-callout-warning}
+There is a [bug](https://bugs.php.net/bug.php?id=79174) in PHP 7.4.2 which causes some messages to not render properly. Magento recommends using other versions of 7.4.

src/_data/toc/release-notes.yml

@@ -1,2 +1,2 @@
 {:.bs-callout-info}
-{{site.data.var.ee}} customers can access 2.3.x and 2.2.x patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot access pre-releases on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact Magento Support.
+{{site.data.var.ee}} customers can access 2.4.x and 2.3.x patches two weeks before the General Availability (GA) date. Pre-release packages are available through Composer only. You cannot access pre-releases on the Magento Portal or GitHub until GA. If you cannot find these packages in Composer, contact Magento Support.

src/_data/whats-new.yml

@@ -20,7 +20,7 @@ bin/magento sampledata:remove
 
 The complete list of sample data modules follows:
 
-{% include install/sampledata/sample-data_list-of-modules.md %} -->
+{% include install/sampledata/sample-data_list-of-modules.md %}
 
 ## Prepare to update sample data   {#inst-sample-reset}
 

src/_includes/cloud/error-codes.md

@@ -1,52 +1,53 @@
 The Magento application uses Composer to manage PHP packages.
-The `composer.json` file declares the list of packages, whereas the `composer.lock` file stores a complete list of the packages (a full version of each package and its dependencies) used to build a release version of the Magento application. The following tables list packages from the `composer.lock` file for {{ edition }} {{page.guide_version}}.
 
-## Magento packages
-
-This section contains information about the `magento` dependencies for the latest {{ edition }} {{page.guide_version}} release.
-Click the **Name** links to view the repository and the license agreement.
-
-{% if packages %}
-
-### Required packages
-
-| Name | Version |  License | Description |
-| --- | --- | --- | --- |{% for package in packages %}{% if package.name contains 'magento/' %}
-| [{{ package.name }}]({{ package.source.url }}) | {{ package.version }} | {{ package.license }} | {{ package.description }} |{% endif %}{% endfor %}
-
-{% assign magento-packages-dev = packages-dev | where_exp: "package", "package.name contains 'magento/'" %}
-
-{% unless magento-packages-dev == empty %}
-
-### Supported packages for development
-
-| Name | Version |  License | Description |
-| --- | --- | --- | --- |{% for package in magento-packages-dev %}
-| [{{ package.name }}]({{ package.source.url }}) | {{ package.version }} | {{ package.license }} | {{ package.description }} |{% endfor %}
+The `composer.json` file declares the list of packages, whereas the `composer.lock` file stores a complete list of the packages (a full version of each package and its dependencies) used to build an installation of the Magento application.
+
+The following reference documentation is generated from the `composer.lock` file, and it covers required packages included in {{ edition }} {{ product.version }}.
+
+## Dependencies
+
+`{{ product.name }} {{ product.version }}` has the following dependencies:
+
+```config
+{%- for dependency in product.require %}
+{{ dependency[0] }}: {{ dependency[1] }}
+{%- endfor %}
+```
+
+{% assign packages_by_license = packages | group_by:"license" | sort: 'name' %}
+
+## Third-party licenses
+
+{% for group in packages_by_license %}
+{% unless group.name == "" %}
+
+### {{ group.name | remove: '[' | remove: '"' | remove: ']'}}
+
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Type</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+  {% for package in group.items %}
+    {% unless package.name contains 'magento/' %}
+  <tr>
+    <td>
+    {% if package.source.url contains '://'%}
+      <a href="{{ package.source.url }}">{{ package.name }}</a>
+    {% else %}
+      {{ package.name }}
+    {% endif %}
+    </td>
+    <td>{{ package.type }}</td>
+    <td>{{ package.description }}</td>
+  </tr>
+    {%endunless%}
+  {% endfor %}
+  </tbody>
+</table>
 {% endunless %}
-
-## Third party packages
-
-This section contains information about third party packages for the latest {{ edition }} {{page.guide_version}} release.
-Click the **Name** links to view the repository and the license agreement.
-
-### Required packages
-
-| Name | Version |  License | Description |
-| --- | --- | --- | --- |{% for package in packages %}{% unless package.name contains 'magento/' %}
-| {% if package.source.url contains '://' %}[{{ package.name }}]({{ package.source.url }}) {% else %}{{ package.name }}{% endif %} | {{ package.version }} | {{ package.license }} | {{ package.description }} |{% endunless %}{% endfor %}
-
-{% unless packages-dev == empty %}
-
-### Supported packages for development
-
-| Name | Version |  License | Description |
-| --- | --- | --- | --- |{% for package in packages-dev %}{% unless package.name contains 'magento/' %}
-| {% if package.source.url contains '://' %}[{{ package.name }}]({{ package.source.url }}) {% else %}{{ package.name }}{% endif %} | {{ package.version }} | {{ package.license }} | {{ package.description }} |{% endunless %}{% endfor %}
-{% endunless %}
-
-{% else %}
-
-There is no data available for this reference at the moment.
-
-{% endif %}
+{% endfor %}

src/_includes/install/enable-disable-modules.md

@@ -93,7 +93,7 @@ DDOS protection is built-in to the Fastly CDN service. After you enable and conf
 
 -  For attacks targeting layer 3 or 4, the Fastly service filters out traffic based on port and protocol, inspecting only HTTP or HTTPS requests. ICMP, UDP, and other network born attacks are dropped at our network edge. This includes reflection and amplification attacks, which use UDP services like SSDP or NTP. By providing this level of protection, we effectively block  multiple common attacks like Ping of Death, Smurf attacks, as well as other ICMP-based floods.  Fastly manages the TCP level attacks at the cache layer, addressing the necessary scale and context per client to deal with SYN flood and its many variants, including TCP stack, resource attacks, and TLS attacks within the Fastly systems.
 
--  The Fastly service protects against Layer 7 attacks by applying custom rules (using VCLs) that can inspect for and filter out malicious requests based on header, payload, or the combination of attributes that identify attack traffic.
+-  Fastly also provides protection against Layer 7 attacks.  If your Magento store is experiencing performance issues and you suspect a Layer 7 DDoS attack, submit a Magento support ticket. Magento can create and apply custom rules to the Fastly service to inspect for and filter out malicious requests based on header, payload, or the combination of attributes that identify the attack traffic. See [Checking for DDoS attacks](https://support.magento.com/hc/en-us/articles/360030941932) in the *Magento Help Center*.
 
 ## Fastly and 503 timeouts {#timeouts}