magento · dobooth · Aug 6, 2020 · Jul 27, 2020 · Jul 30, 2020 · Aug 3, 2020
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -72,6 +72,8 @@ The following guidelines may answer most of your questions and help you get star
 -  Review your work for basic typos, formatting errors, or ambiguous sentences before opening a pull request.
 -  Revise pull requests according to review feedback. We will close pull requests that require an inordinate amount of time to review and process (especially for minor changes) if you fail to make revisions according to review feedback.
 -  Do not directly contact DevDocs team members or maintainers on Slack to review your pull request unless it has been open for more than five days. We have a process and queue for pull requests that everyone must follow.
+-  Get recognized on the DevDocs web site for writing new topics! Add your name and a link to your company website or GitHub profile to the file metadata so that we can display it on the page. See [Edit metadata](#edit-metadata).
+-  We no longer recognize individual community members who contribute features to the Magento 2 codebase in the corresponding feature topic(s) on the DevDocs website. Magento recognizes these contributions in more appropriate channels (for example, the [Magento DevBlog](https://community.magento.com/t5/Magento-DevBlog/bg-p/devblog)).
 
 ## Tips for writing content
 
@@ -108,8 +110,10 @@ The Markdown (.md) file's metadata is a set of YAML key-value pairs. The metadat
 ```yaml
 
 ---
-group: install2
-title: Continue with your installation
+group:
+title:
+contributor_name:
+contributor_link:
 ---
 ```
 
@@ -119,6 +123,8 @@ title: Continue with your installation
 | ------------- | ---------- |
 | `group`       | Defines the topic's guide or section. Use the table of contents `.yml` file name. This loads your left-side navigation. We will help during the PR process to add new files to the `.yml` file. |
 | `title`       | Sets the title of the page in the HTML metadata and the main title on the page.  |
+| `contributor_name` | Sets the name of the contributor who wrote the topic and displays it on the page. |
+| `contributor_link` | Creates a link to the contributor's GitHub profile or company website. |
 
 ## Report an issue
 

diff --git a/src/cloud/docker/docker-development-debug.md b/src/cloud/docker/docker-development-debug.md
@@ -38,7 +38,7 @@ If you use Microsoft Windows, take the following steps before continuing:
        volumes:
          - 'mymagento-magento-sync:/app:nocopy'
        environment:
-         - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap socketssysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+         - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
        networks:
          magento:
            aliases:

diff --git a/src/cloud/project/new-relic.md b/src/cloud/project/new-relic.md
@@ -205,6 +205,8 @@ We recommend reviewing tracked data:
 
 All collected data details the time spent on an action transmitting data, queries, or _Redis_ data. If queries cause issues, New Relic provides information to track and respond to those issues.
 
+For details on using this data to troubleshoot Magento performance issues, see [Troubleshoot performance using New Relic][] in the _Magento Help Center_.
+
 {:.bs-callout-info}
 You can learn more about using the New Relic APM and Infrastructure agents to collect and analyze application data from the [New Relic APM] and [New Relic Infrastructure][New Relic infrastructure] documentation.
 
@@ -364,6 +366,7 @@ See [Alerts concepts and workflow] in the New Relic documentation for more detai
 [New Relic query syntax for logs]: https://docs.newrelic.com/docs/logs/new-relic-logs/ui-data/query-syntax-logs
 [New Relic reporting]: https://docs.magento.com/m2/ce/user_guide/configuration/general/new-relic-reporting.html
 [prerequisite steps]: https://docs.newrelic.com/docs/alerts/new-relic-alerts/managing-notification-channels/notification-channels-control-where-send-alerts#channel-types
+[Troubleshoot performance using New Relic]: https://support.magento.com/hc/en-us/articles/360042149832#low_user_satisfaction
 [reset the New Relic password]: https://rpm.newrelic.com/forgot_password
 [Update the account owner]: https://docs.newrelic.com/docs/accounts/accounts/roles-permissions/change-account-owner
 [Update policies or conditions]: https://docs.newrelic.com/docs/alerts/new-relic-alerts/configuring-alert-policies/update-or-disable-policies-conditions

diff --git a/src/cloud/project/project-patch.md b/src/cloud/project/project-patch.md
@@ -23,7 +23,10 @@ When you deploy changes to the remote environment, `{{site.data.var.ct}}` uses `
 1. Apply required patches from Magento included in the `{{site.data.var.mcp-package}}` package.
 1. Apply optional and custom patches in the `/m2-hotfixes` directory in alphabetical order by patch name.
 
-Also, you can apply patches manually in your local environment.
+{:.bs-callout-info}
+When you update `{{site.data.var.ct}}` or the `{{site.data.var.mcp-prod}}` package, the latest required patches are applied automatically the next time you deploy your project. You cannot skip [required patches](https://github.com/magento/magento-cloud-patches/tree/develop/patches) during the deployment process.
+
+You can also apply patches manually.
 
 {:.bs-callout-info}
 All patch file names must end with the `.patch` extension.

diff --git a/src/guides/v2.3/config-guide/config/config-create.md b/src/guides/v2.3/config-guide/config/config-create.md
@@ -131,4 +131,4 @@ Related topics
 
 *  [Module configuration files]({{ page.baseurl }}/config-guide/config/config-php.html)
 *  [Configuration file merge]({{ page.baseurl }}/config-guide/config/config-files.html#config-files-load-merge-merge)
-*  [Magento's deployment configuration]({{ page.baseurl }}/config-guide/config/config-php.html)
+*  [Magento's deployment configuration]({{ page.baseurl }}/config-guide/config/config-files.html)
diff --git a/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md b/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md
@@ -99,7 +99,7 @@ Example of a theme `composer.json` file:
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/theme-frontend-blank": "*"
     },

diff --git a/src/guides/v2.3/get-started/create-integration.md b/src/guides/v2.3/get-started/create-integration.md
@@ -92,7 +92,7 @@ To develop a module, you must:
         "name": "Vendor1_Module1",
         "description": "create integration from config",
         "require": {
-           "php": "~7.1.3|~7.2.0|~7.3.0",
+           "php": "~7.2.0|~7.3.0",
            "magento/framework": "2.0.0",
            "magento/module-integration": "2.0.0"
         },

diff --git a/src/guides/v2.3/javascript-dev-guide/bk-javascript-dev-guide.md b/src/guides/v2.3/javascript-dev-guide/bk-javascript-dev-guide.md
@@ -8,8 +8,6 @@ landing-page: JavaScript Developer Guide
 
 By default, the Magento application uses the [RequireJS file and module loader] to optimize the time of loading pages with included JavaScript files, and to manage dependencies of JavaScript resources.
 
-You can follow the same approach when customizing Magento JavaScript, or [disable all the default scripts and their load by RequireJS].
-
 For information about how JS resources are located and configured, see the [JavaScript resources] topic in the Configuration Guide.
 
 ## What's in this guide {#js_contents}
@@ -40,7 +38,6 @@ JavaScript automatic testing is described in a separate [JavaScript unit testing
 [jQuery Widget]: https://jqueryui.com/widget/
 
 [RequireJS file and module loader]: http://requirejs.org/
-[disable all the default scripts and their load by RequireJS]: {{page.baseurl}}/javascript-dev-guide/javascript/custom_js.html#disable_default_js
 [JavaScript resources]: {{page.baseurl}}/javascript-dev-guide/javascript/js-resources.html
 
 [JavaScript initialization]: {{page.baseurl}}/javascript-dev-guide/javascript/js_init.html

diff --git a/src/guides/v2.3/javascript-dev-guide/javascript/custom_js.md b/src/guides/v2.3/javascript-dev-guide/javascript/custom_js.md
@@ -135,23 +135,7 @@ define([
 });
 ```
 
-For information about initializing your custom JS component in a `.phtml` template, see the [JavaScript initialization] topic.
-
-## Disable default Magento JS {#disable_default_js}
-
-To disable the auto-loading of default Magento JS components and widget initialization:
-
-1. Create a `requirejs-config.js` file with the following content:
-
-   ```javascript
-   var config = { deps: [ ] };
-   ```
-
-1. Put the `requirejs-config.js` file in one of the following
-  locations:
-
-   -  Your custom theme files: `<theme_dir>`
-   -  Your custom module files: `<module_dir>/view/frontend`
+For information about initializing your custom JS component in a `.phtml` template, see the [JavaScript initialization]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html) topic.
 
 If you need to enable the loading of default Magento JS components and widget initialization on a certain stage, add the following code in your JS script:
 

diff --git a/src/guides/v2.3/javascript-dev-guide/javascript/js_overview.md b/src/guides/v2.3/javascript-dev-guide/javascript/js_overview.md
@@ -6,8 +6,6 @@ title: JavaScript
 
 By default, the Magento application uses the [RequireJS file and module loader] to optimize the time of loading pages with included JavaScript files, and to manage dependencies of JavaScript resources.
 
-You can follow the same approach when customizing Magento JavaScript, or [disable all the default scripts and their load by RequireJS].
-
 For information about how JS resources are located and configured, see [Configure JavaScript].
 
 ## What's in this chapter {#js_contents}
@@ -30,7 +28,6 @@ Topics of this chapter describe the following:
 | *jQuery widget*                       | Custom widget created using jQuery UI Widget Factory and decorated as AMD module. Many Magento JS components are jQuery widget. |
 
 [RequireJS file and module loader]: http://requirejs.org/
-[disable all the default scripts and their load by RequireJS]: {{page.baseurl}}/javascript-dev-guide/javascript/custom_js.html#disable_default_js
 [Configure JavaScript]: {{page.baseurl}}/javascript-dev-guide/javascript/js-resources.html
 [AMD module]: http://requirejs.org/docs/whyamd.html#amd
 [app/code/Magento/Ui/view]: {{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/Ui/view

diff --git a/src/guides/v2.4/extension-dev-guide/build/create_component.md b/src/guides/v2.4/extension-dev-guide/build/create_component.md
@@ -46,7 +46,7 @@ Refer to [Module version dependencies]({{ page.baseurl }}/extension-dev-guide/ve
     "name": "your-name/module-Acme",
     "description": "Test component for Magento 2",
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/module-store": "102.1",
         "magento/module-catalog": "102.1",
         "magento/module-catalog-inventory": "102.1",

diff --git a/src/guides/v2.4/release-notes/b2b-release-notes.md b/src/guides/v2.4/release-notes/b2b-release-notes.md
@@ -40,3 +40,8 @@ These release notes can include:
 -  {:.fix} Previously, using the API to save a quote item when backorder is set to "Allowed and Notify Customer" would fail. This API call now works as expected.
 -  {:.fix} The Fixed Product Tax is now displayed on the Quotes detail page.
 -  {:.fix} Previously, clicking on an attachment in the Comments tab of the My Quotes page would fail to download the file. This behavior now works as expected.
+
+### Known Issues
+
+-  If items in a purchase order are out-of-stock, or of insufficient quantity when the purchase order is converted into an actual order, an error will occur. If backorders are enabled, the order will be processed normally.
+-  If a discount code expires before a purchase order is approved, the PO continues to show the discounted amount. Once the PO is approved, the order is placed at the non-discounted total.
diff --git a/src/guides/v2.4/release-notes/release-notes-2-4-0-open-source.md b/src/guides/v2.4/release-notes/release-notes-2-4-0-open-source.md
@@ -668,10 +668,6 @@ We have fixed hundreds of issues in the Magento 2.4.0 core code.
 
 *  Magento no longer throws an error when you include an empty customer attribute field in the **Forms to Use In** field while creating a Company account on the storefront. Previously, Magento threw this error: `PHP Fatal error: Uncaught TypeError: Argument 2 passed to Magento\Eav\Model\Attribute\Data\Text::validateLength() must be of the type string, null given`.
 
-<!--- MC-32301-->
-
-*  Magento no longer throws an error when you include an empty customer attribute field in the **Forms to Use In** field while creating a Company account on the storefront. Previously, Magento threw this error: `PHP Fatal error: Uncaught TypeError: Argument 2 passed to Magento\Eav\Model\Attribute\Data\Text::validateLength() must be of the type string, null given`.
-
 ### Customer
 
 <!--- MC-29102-->

diff --git a/src/guides/v2.4/security/security-txt.md b/src/guides/v2.4/security/security-txt.md
@@ -15,6 +15,9 @@ Magento merchants can enter their contact information for [security issue report
 -  Contains a router to match application action class for requests to the `well-known/security.txt` and `.well-known/security.txt.sig` files.
 -  Serves the content of the `.well-known/security.txt` and `.well-known/security.txt.sig` files.
 
+{:.bs-calllout-info}
+**Magento Community Contribution** - Magento thanks [Kalpesh Mehta](https://github.com/kalpmehta) of [Corra](https://partners.magento.com/portal/details/partner/id/70/) for contributing this feature as part of the Magento Community Engineering program.
+
 A valid `security.txt` file might look like the following:
 
  ```bash

diff --git a/src/release/index.md b/src/release/index.md
@@ -22,12 +22,6 @@ The following table provides the dates for scheduled releases in 2020 and 2021 (
 
 _<sup>*</sup>There will not be a 2.4.5 release in 2021 Q4._
 
-## About security-only releases
-
-Security-only releases provide fixes for vulnerabilities that have been identified in previous quarterly patch releases. You can install time-sensitive security fixes without applying the hundreds of functional fixes and enhancements that a full quarterly patch release contains. These releases are appended with `-pN`, where N is the incremental patch version beginning with 1 (example: 2.3.5-p1, 2.3.5-p2). **These releases can also include hotfixes required to address critical issues that affect the Magento application.**
-
-For general information about security releases, see [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security patches, see [Install Magento using Composer]({{site.baseurl}}/guides/v2.3/install-gde/composer.html).
-
 ## Early access
 
 Pre-release is General Availability code that is available to {{site.data.var.ee}} merchants and all partners two weeks before General Availability. It allows for quicker deployment of code before General Availability.

diff --git a/src/release/policy/index.md b/src/release/policy/index.md
@@ -38,7 +38,7 @@ The following guidelines apply to patch releases:
 
 ## SECURITY release
 
-Security releases provide fixes for vulnerabilities that have been identified in previous quarterly patch releases. You can install time-sensitive security fixes without applying the hundreds of functional fixes and enhancements that a full quarterly patch release contains.
+Security releases provide fixes for vulnerabilities that have been identified in previous quarterly patch releases. You can install time-sensitive security fixes without applying the hundreds of functional fixes and enhancements that a full quarterly patch release contains. These releases are appended with `-pN`, where N is the incremental patch version beginning with 1 (for example, 2.3.5-p1). These releases can also include hotfixes required to address critical issues that affect the Magento application.
 
 For general information about security releases, see [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security patches, see [Install Magento using Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html).