Merge pull request #2774 from magento-commerce/2-4_integration

2 4 integration

Author: dobooth

src/_includes/install/php-ext-commerce.md

@@ -1,25 +1 @@
--  ext-bcmath
--  ext-ctype
--  ext-curl
--  ext-dom
--  ext-fileinfo
--  ext-gd
--  ext-hash
--  ext-iconv
--  ext-intl
--  ext-json
--  ext-libxml
--  ext-mbstring
--  ext-openssl
--  ext-pcre
--  ext-pdo_mysql
--  ext-simplexml
--  ext-soap
--  ext-sockets
--  ext-sodium
 -  ext-spl
--  ext-xmlwriter
--  ext-xsl
--  ext-zip
--  lib-libxml
--  lib-openssl

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

@@ -1,5 +1,5 @@
-{{ site.data.var.ce }}:
+{{ site.data.var.ce }} and {{ site.data.var.ee }}:
 {% include install/php-ext-opensource.md %}
 
-{{ site.data.var.ee }}:
+Additionally {{ site.data.var.ee }} requires:
 {% include install/php-ext-commerce.md %}

src/guides/v2.3/config-guide/prod/config-reference-configphp.md

@@ -55,7 +55,7 @@ Contains an array of scope configuration values. It has the following subnodes:
     ]
   ],
   'groups' => [
-    [
+    0 => [
       'group_id' => '0',
       'website_id' => '0',
       'code' => 'default',

src/guides/v2.3/config-guide/prod/config-reference-most.md

@@ -115,7 +115,7 @@ These configuration values are available in the Admin in **Stores** > Settings >
 Name  | Config path | EE only? |
 |--------------|--------------|--------------|
 Enable Contact Us | `contact/contact/enabled` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
-Send Emails To | `contact/contact/recipient_email` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
+Send Emails To | `contact/email/recipient_email` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Email Sender | `contact/email/sender_email_identity` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Email Template | `contact/email/email_template` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 

src/guides/v2.4/config-guide/prod/config-reference-most.md

@@ -115,7 +115,7 @@ These configuration values are available in the Admin in **Stores** > Settings >
 Name  | Config path | EE only? |
 |--------------|--------------|--------------|
 Enable Contact Us | `contact/contact/enabled` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
-Send Emails To | `contact/contact/recipient_email` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
+Send Emails To | `contact/email/recipient_email` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Email Sender | `contact/email/sender_email_identity` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Email Template | `contact/email/email_template` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 

src/guides/v2.4/security/two-factor-authentication.md

@@ -58,7 +58,7 @@ The 2FA provider for Magento Headless can be selected with the `config:set` comm
 
 Two-Factor Authentication is implemented for Magento Web APIs with the following changes:
 
--  `AdminTokenServiceInterface::createAdminAccessToken()` throws an exception when the _Admin_ user doesn’t have personal 2FA configured, and also indicates that the confirmationh email has been sent.
+-  `AdminTokenServiceInterface::createAdminAccessToken()` throws an exception when the _Admin_ user doesn’t have personal 2FA configured, and also indicates that the confirmation email has been sent.
 -  `AdminTokenServiceInterface::createAdminAccessToken()` throws an exception that indicates which provider is configured for the user and suggests a provider-specific login endpoint.
 -  2FA provider-specific endpoints allow each _Admin_ user to configure a personal 2FA and provides tokens for username, password, and OTP (2FA code).