Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit bde2487

Browse files
authored
Merge branch 'master' into origin/KB-1301-Set-Up-Fastly-Add-Links-To-KB
2 parents a638929 + 31ff2da commit bde2487

File tree

11 files changed

+45
-20
lines changed

11 files changed

+45
-20
lines changed

src/cloud/env/variables-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ stage:
230230
ELASTICSUITE_CONFIGURATION:
231231
indices_settings:
232232
number_of_shards: 3
233-
number_of_replicas: 3
233+
number_of_replicas: 2
234234
_merge: true
235235
```
236236

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ To migrate a database:
289289
The following example references the gzip file created by the database dump operation:
290290

291291
```bash
292-
zcat /tmp/database.sql.gz | mysql -h database.internal -u user main
292+
zcat /tmp/database.sql.gz | mysql -h database.internal -u user -ppassword main
293293
```
294294

295295
### Troubleshooting the database migration

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ The example below shows the construction of a `\Magento\Framework\FlagFactory` o
8686
```php
8787
$flag = $this->flagFactory->create([
8888
'data' => ['flag_code' => 'something']
89+
]);
8990
```
9091

9192
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can now use this token in the Authorization request header field for any que
4141

4242
![GraphQL Authorization Bearer]({{site.baseurl}}/common/images/graphql/graphql-authorization.png)
4343

44-
If necessary, you also can [revoke the customer's token]({{ page.baseurl }}/graphql/mutations/revoke-customer-token.html
44+
If necessary, you also can [revoke the customer's token]({{page.baseurl}}/graphql/mutations/revoke-customer-token.html)
4545

4646
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**.
4747

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class ProductAttributeTypeTest extends GraphQlAbstract
5555
attribute_code
5656
attribute_type
5757
entity_type
58+
input_type
5859
}
5960
}
6061
}
@@ -75,7 +76,8 @@ QUERY;
7576
\Magento\Catalog\Api\Data\ProductInterface::class
7677
];
7778
$attributeTypes = ['String', 'Int', 'Float','Boolean', 'Float'];
78-
$this->assertAttributeType($attributeTypes, $expectedAttributeCodes, $entityType, $response);
79+
$inputTypes = ['textarea', 'select', 'price', 'boolean', 'price'];
80+
$this->assertAttributeType($attributeTypes, $expectedAttributeCodes, $entityType, $inputTypes, $response);
7981
}
8082
```
8183

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ After enabling and configuring 2FA for your Magento instance, Admin users need t
4747

4848
The extension supports command line options for disabling, revoking, and resetting authenticators. Use these commands when you cannot access the Admin UI.
4949

50+
### List all available 2FA providers
51+
52+
If you need to know all the available 2FA providers, enter the following command.
53+
54+
```bash
55+
bin/magento msp:security:tfa:providers
56+
```
57+
5058
### Disable authenticator
5159

5260
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ contributor_name: EY
66

77
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).
88

9-
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.
9+
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.
1010

1111
## Syntax
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ realpath_cache_ttl=7200
7777
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:
7878

7979
```text
80-
opcache.memory_consumption=512MB
80+
opcache.memory_consumption=512
8181
opcache.max_accelerated_files=60000
8282
opcache.consistency_checks=0
8383
opcache.validate_timestamps=0

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ MFTF uses Google Authenticator to execute tests with 2FA enabled. The following
9797

9898
The extension supports command line options to revoke and reset authenticators. Use these commands when you cannot access the Magento _Admin_.
9999

100+
### List all available 2FA providers
101+
102+
If you need to know all the available 2FA providers, enter the following command.
103+
104+
```bash
105+
bin/magento security:tfa:providers
106+
```
107+
100108
### Reset authenticator per account
101109

102110
If you need to manually reset a single user configuration, enter the following command. It restarts configuration and 2FA subscription for the user account.

src/marketplace/eqp/v1/users.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ curl -X GET \
7373
"taxpayer_type": 2,
7474
"tax_review_status": 3,
7575
"tax_withhold_percent": 25,
76-
"extension_share_percent": 70,
77-
"theme_share_percent": 70,
76+
"extension_share_percent": 85,
77+
"theme_share_percent": 85,
7878
"install_share_percent": 100,
7979
"support_share_percent": 100,
8080
"privacy_policy_url": "https://www.example.com/privacy",

0 commit comments

Comments
 (0)