Merge pull request #2716 from magento-commerce/1-5_integration

1 5 integration

Author: dobooth

src/guides/v2.3/extension-dev-guide/admin-grid.md

@@ -416,9 +416,9 @@ The resource model class translates to `app/code/Dev/Grid/Model/ResourceModel/Ca
 
 namespace Dev\Grid\Model\ResourceModel;
 
-use Magento\Catalog\Model\ResourceModel\Category;
+use Magento\Catalog\Model\ResourceModel\Category as BaseCategory;
 
-class Category extends Category
+class Category extends BaseCategory
 {
 }
 ```

src/guides/v2.3/howdoi/checkout/checkout_form.md

@@ -128,6 +128,7 @@ It should be similar to the following:
                                                                 <item name="custom-checkout-form-container" xsi:type="array">
                                                                     <!-- Add this item to configure your js file  -->
                                                                     <item name="component" xsi:type="string">VendorName_ModuleName/js/view/custom-checkout-form</item>
+                                                                    <item name="provider" xsi:type="string">checkoutProvider</item>
                                                                     <item name="config" xsi:type="array">
                                                                         <!-- And this to add your html template  -->
                                                                         <item name="template" xsi:type="string">VendorName_ModuleName/custom-checkout-form</item>
@@ -265,7 +266,7 @@ The following code sample shows the configuration of the `custom-checkout-form-c
 Dynamically defined, or dynamic, forms are the forms where the set or type of fields can change. For example, the fields displayed on the checkout form depend on the Admin settings: depending on the **Admin > Stores > Settings > Configuration > Customers > Customer Configuration > Name and Address Options**.
 
 For such forms, you must implement a [plugin]({{ page.baseurl }}/extension-dev-guide/plugins.html) for the `\Magento\Checkout\Block\Checkout\LayoutProcessor::process` method.
-A plugin can add custom fields definitions to layout at run-time. The format of the field definition is the same as for fields defined in layout.
+A plugin can add custom fields definitions to layout at runtime. The format of the field definition is the same as for fields defined in layout.
 
 For example:
 

src/guides/v2.3/howdoi/custom-attributes/text-field.md

@@ -155,7 +155,7 @@ There are five steps in developing a data patch. All the steps below are written
     ```php
     // Get the newly created attribute's model
     $attribute = $this->customerSetup->getEavConfig()
-        ->getAttribute(CustomerMetadataInterface::ENTITY, 'externalcorp_external_id');
+        ->getAttribute(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, 'externalcorp_external_id');
 
     // Make attribute visible in Admin customer form
     $attribute->setData('used_in_forms', [
@@ -214,7 +214,6 @@ namespace ExampleCorp\Customer\Setup\Patch\Data;
 use Exception;
 use Psr\Log\LoggerInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\ResourceModel\Attribute as AttributeResource;
 use Magento\Customer\Setup\CustomerSetup;
 use Magento\Customer\Setup\CustomerSetupFactory;
@@ -329,7 +328,7 @@ class ExternalId implements DataPatchInterface
 
             // Get the newly created attribute's model
             $attribute = $this->customerSetup->getEavConfig()
-                ->getAttribute(Customer::ENTITY, 'externalcorp_external_id');
+                ->getAttribute(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, 'externalcorp_external_id');
 
             // Make attribute visible in Admin customer form
             $attribute->setData('used_in_forms', [

src/guides/v2.3/ui_comp_guide/components/ui-datecolumn.md

@@ -33,7 +33,6 @@ This is an example of how the DateColumn component integrates with the [Listing]
             <settings>
                 <filter>dateRange</filter>
                 <dataType>date</dataType>
-                <dataType>date</dataType>
                 <label translate="true">Date Column Example 1</label>
             </settings>
         </column>

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

@@ -67,7 +67,7 @@ Two-Factor Authentication is implemented for Magento Web APIs with the following
 
 ## Magento Functional Testing Framework
 
-MFTF uses Google Authenticator to execute tests with 2FA enabled. The following steps summarize how to configure MFTF with an encoded shared secret. For more information, see [Configuring MFTF for Two-Factor Authentication (2FA)]({{ page.baseurl }}/security/two-factor-authentication.html#magento-functional-testing-framework).
+MFTF uses Google Authenticator to execute tests with 2FA enabled. The following steps summarize how to configure MFTF with an encoded shared secret.
 
 1. Select Google Authenticator as the 2FA provider:
 
@@ -95,7 +95,7 @@ MFTF uses Google Authenticator to execute tests with 2FA enabled. The following
 
 ## Troubleshooting
 
-The extension supports command line options to revoke and reset authenticators. Use these commands when you cannot access the Magento _Admin_.
+The extension supports command-line options to revoke and reset authenticators. Use these commands when you cannot access the Magento _Admin_.
 
 ### List all available 2FA providers