Merge branch 'master' into hg-phpblock

Author: hguthrie

src/cloud/cdn/configure-fastly.md

@@ -125,7 +125,7 @@ To upload the Fastly VCL:
 
 ## Provision SSL/TLS certificates
 
-Adobe provides a Domain-Validated Let's Encrypt SSL/TLS certificate to serve secure HTTPS traffic from Fastly. Adobe provides one certificate for each Pro Production, Staging, and Starter Production environment to secure all domains in that environment.
+Adobe provides a Domain-Validated Let's Encrypt SSL/TLS certificate to serve secure HTTPS traffic from Fastly. Adobe provides one certificate for each Pro Production, Staging, and Starter Production environment to secure all domains in that environment. See [Adobe SSL/TLS certificate requirements and clean up](https://support.magento.com/hc/en-us/articles/115004685333-Magento-SSL-TLS-certificate-requirements-and-clean-up) in the _Support knowledge base_.
 
 {:.bs-callout-info}
 You can provide your own TLS/SSL certificate instead of using the Let's Encrypt certificate provided by Adobe. However, this process requires additional work to set up and maintain. To choose this option, submit a [{{site.data.var.ee}} Support ticket](https://support.magento.com/hc/en-us/articles/360019088251) or work with your CTA to add custom hosted certificates to your Cloud environments.
@@ -291,3 +291,6 @@ After you verify Fastly services on the Staging site, repeat the upgrade process
 
 {:.bs-callout-warning}
 If you have added a custom VCL snippet that has the same name as a default snippet, you may need to verify and update those snippets after you upgrade the Fastly module. We do not recommend replacing existing default snippets with custom snippets of the same name. For details on custom VCL, see [Custom Fastly VCL snippets]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html).
+
+{:.bs-callout-tip}
+If you experience problems setting up your Fastly configuration, you can visit the _Support knowledge base_ and use the [Adobe Commerce Fastly troubleshooter](https://support.magento.com/hc/en-us/articles/360040759292-Magento-Fastly-troubleshooter).

src/cloud/env/variables-deploy.md

@@ -230,7 +230,7 @@ stage:
     ELASTICSUITE_CONFIGURATION:
       indices_settings:
         number_of_shards: 3
-        number_of_replicas: 3
+        number_of_replicas: 2
       _merge: true
 ```
 

src/cloud/live/stage-prod-migrate.md

@@ -289,7 +289,7 @@ To migrate a database:
    The following example references the gzip file created by the database dump operation:
 
    ```bash
-   zcat /tmp/database.sql.gz | mysql -h database.internal -u user main
+   zcat /tmp/database.sql.gz | mysql -h database.internal -u user -ppassword main
    ```
 
 ### Troubleshooting the database migration

src/guides/v2.3/extension-dev-guide/factories.md

@@ -86,6 +86,7 @@ The example below shows the construction of a `\Magento\Framework\FlagFactory` o
 ```php
 $flag = $this->flagFactory->create([
   'data' =>  ['flag_code' => 'something']
+]);
 ```
 
 The `Flag` class has a `$data` constructor parameter which corresponds to the data key in the `create` array above.

src/guides/v2.3/graphql/authorization-tokens.md

@@ -41,7 +41,7 @@ You can now use this token in the Authorization request header field for any que
 
 ![GraphQL Authorization Bearer]({{site.baseurl}}/common/images/graphql/graphql-authorization.png)
 
-If necessary, you also can [revoke the customer's token]({{ page.baseurl }}/graphql/mutations/revoke-customer-token.html
+If necessary, you also can [revoke the customer's token]({{page.baseurl}}/graphql/mutations/revoke-customer-token.html)
 
 By default, a customer token is valid for 1 hour. You can change these values from Admin by selecting **Stores** > **Settings** > **Configuration** > **Services** > **OAuth** > **Access Token Expiration** > **Customer Token Lifetime**.
 

src/guides/v2.3/graphql/functional-testing.md

@@ -55,6 +55,7 @@ class ProductAttributeTypeTest extends GraphQlAbstract
       attribute_code
       attribute_type
       entity_type
+      input_type
     }
   }
  }
@@ -75,7 +76,8 @@ QUERY;
             \Magento\Catalog\Api\Data\ProductInterface::class
         ];
         $attributeTypes = ['String', 'Int', 'Float','Boolean', 'Float'];
-        $this->assertAttributeType($attributeTypes, $expectedAttributeCodes, $entityType, $response);
+        $inputTypes = ['textarea', 'select', 'price', 'boolean', 'price'];
+        $this->assertAttributeType($attributeTypes, $expectedAttributeCodes, $entityType, $inputTypes, $response);
     }
 ```
 

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

@@ -47,6 +47,14 @@ After enabling and configuring 2FA for your Magento instance, Admin users need t
 
 The extension supports command line options for disabling, revoking, and resetting authenticators. Use these commands when you cannot access the Admin UI.
 
+### List all available 2FA providers
+
+If you need to know all the available 2FA providers, enter the following command.
+
+```bash
+bin/magento msp:security:tfa:providers
+```
+
 ### Disable authenticator
 
 If you have issues with 2FA, you can disable 2FA globally for the Magento instance.

src/guides/v2.4/graphql/mutations/generate-customer-token-as-admin.md

@@ -6,7 +6,7 @@ contributor_name: EY
 
 The `generateCustomerTokenAsAdmin` mutation generates a new customer token as an admin so that an administrator can perform remote shopping assistance on behalf of the customer. For example, if a customer has asked for help adding a product into their cart, you would specify the token returned by the `generateCustomerTokenAsAdmin` mutation in the header of your [`addProductsToCart` mutation]({{page.baseurl}}/graphql/mutations/add-products-to-cart.html).
 
-To run this mutation, the customer must have enabled the **Allow remote shopping assistance** feature. You can specify the `allow_remote_shopping_assistance` attribute in a [`customer` query]({{page.baseurl}}/graphql/queries/customer.html] to determine whether the customer enabled this feature.
+To run this mutation, the customer must have enabled the **Allow remote shopping assistance** feature. You can specify the `allow_remote_shopping_assistance` attribute in a [`customer` query]({{page.baseurl}}/graphql/queries/customer.html) to determine whether the customer enabled this feature.
 
 ## Syntax
 

src/guides/v2.4/performance-best-practices/software.md

@@ -77,7 +77,7 @@ realpath_cache_ttl=7200
 To get maximum speed out of Magento 2 on PHP 7, you must activate the OpCache module and properly configure it. These settings are recommended for the module:
 
 ```text
-opcache.memory_consumption=512MB
+opcache.memory_consumption=512
 opcache.max_accelerated_files=60000
 opcache.consistency_checks=0
 opcache.validate_timestamps=0

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

@@ -97,6 +97,14 @@ MFTF uses Google Authenticator to execute tests with 2FA enabled. The following
 
 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
+
+If you need to know all the available 2FA providers, enter the following command.
+
+```bash
+bin/magento security:tfa:providers
+```
+
 ### Reset authenticator per account
 
 If you need to manually reset a single user configuration, enter the following command. It restarts configuration and 2FA subscription for the user account.