Merge pull request #2566 from magento-commerce/10-6_integration

10 6 integration

Author: dobooth

src/cloud/project/services-rabbit.md

@@ -116,13 +116,13 @@ For debugging purposes, it is useful to directly connect to a service instance i
 1. Enable local port forwarding to RabbitMQ.
 
    ```bash
-   ssh -L <port-number>:mq.internal:<port-number> <project-ID>-<branch-ID>@ssh.us.magentosite.cloud
+   ssh -L <port-number>:rabbitmq.internal:<port-number> <project-ID>-<branch-ID>@ssh.us.magentosite.cloud
    ```
 
    An example for accessing the RabbitMQ management web interface at `http://localhost:15672` is:
 
    ```bash
-   ssh -L 15672:localhost:15672 <project-ID>-<branch-ID>@ssh.us.magentosite.cloud
+   ssh -L 15672:rabbitmq.internal:15672 <project-ID>-<branch-ID>@ssh.us.magentosite.cloud
    ```
 
 1. While the session is open, you can start a RabbitMQ client of your choice from your local workstation, configured to connect to the `localhost:<portnumber>` using the port number, username, and password information from the MAGENTO_CLOUD_RELATIONSHIPS variable.

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

@@ -229,22 +229,22 @@ class ExternalId implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private ModuleDataSetupInterface $moduleDataSetup;
+    private $moduleDataSetup;
 
     /**
      * @var CustomerSetup
      */
-    private CustomerSetup $customerSetup;
+    private $customerSetup;
 
     /**
      * @var AttributeResource
      */
-    private AttributeResource $attributeResource;
+    private $attributeResource;
 
     /**
      * @var LoggerInterface
      */
-    private LoggerInterface $logger;
+    private $logger;
 
     /**
      * Constructor

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

@@ -63,6 +63,16 @@ If you need to manually reset a single user configuration, enter the following c
 bin/magento msp:security:tfa:reset <username> <provider>
 ```
 
+For example:
+
+```bash
+bin/magento msp:security:tfa:reset admin google
+```
+
+```bash
+bin/magento msp:security:tfa:reset admin u2fkey
+```
+
 ### Advanced emergency steps
 
 {:.bs-callout-warning}

src/guides/v2.4/security/google-recaptcha.md

@@ -30,3 +30,9 @@ The extension supports a command line option for disabling reCAPTCHA. Use this c
 ```bash
 bin/magento security:recaptcha:disable-for-user-login
 ```
+
+You can disable Google reCAPTCHA for the Admin reset password page from the command line:
+
+```bash
+bin/magento security:recaptcha:disable-for-user-forgot-password
+```

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

@@ -105,6 +105,16 @@ If you need to manually reset a single user configuration, enter the following c
 bin/magento security:tfa:reset <user> <provider>
 ```
 
+For example:
+
+```bash
+bin/magento msp:security:tfa:reset admin google
+```
+
+```bash
+bin/magento msp:security:tfa:reset admin u2fkey
+```
+
 ### Advanced emergency steps
 
 {:.bs-callout-warning}