Skip to content

Commit d7b8f58

Browse files
Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements
2 parents f15effe + b832b85 commit d7b8f58

File tree

14 files changed

+39
-37
lines changed

14 files changed

+39
-37
lines changed

app/code/Magento/ApplicationPerformanceMonitor/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
**ApplicationPerformanceMonitor**
1+
# ApplicationPerformanceMonitor
22

33
Monitors the Performance of the Application
44

55
To configure, edit app/etc/env.php
66
Add these lines.
77

8-
```
8+
```php
99
'application' => [
1010
'performance_monitor' => [
1111
'logger_output_enable' => 1,
@@ -21,7 +21,8 @@ The option `logger_output_enable` enables outputting performance metrics to the
2121
The option `logger_output_verbose` adds additional metrics.
2222

2323
Example output in log file without verbose:
24-
```
24+
25+
```log
2526
[2023-10-04T20:48:23.727037+00:00] report.ERROR: "Profile information": {
2627
"applicationClass": "Magento\ApplicationServer\App\Application\Interceptor",
2728
"applicationServer": "1",
@@ -36,7 +37,8 @@ Example output in log file without verbose:
3637
```
3738

3839
Example output in log file with verbose:
39-
```
40+
41+
```log
4042
[2023-10-04T20:55:31.174304+00:00] report.ERROR: "Profile information": {
4143
"applicationClass": "Magento\ApplicationServer\App\Application\Interceptor",
4244
"applicationServer": "1",

app/code/Magento/ApplicationPerformanceMonitorNewRelic/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
**ApplicationPerformanceMonitorNewRelic**
1+
# ApplicationPerformanceMonitorNewRelic
22

33
Monitors the Performance of the Application in New Relic
44

55
To use this module, it requires a New Relic account and the environment already by configured to use that account.
6-
For general New Relic PHP configuration information, see https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/ .
6+
For general New Relic PHP configuration information, see <https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/>.
77

8-
To configure this module, edit app/etc/env.php
8+
To configure this module, edit `app/etc/env.php`.
99
Add these lines.
1010

11-
```
11+
```php
1212
'application' => [
1313
'performance_monitor' => [
1414
'newrelic_output_enable' => 1,
1515
'newrelic_output_verbose' => 0,
1616
]
1717
]
1818
```
19+
1920
Use 0 or 1 as the value to enable or disable.
2021
`newrelic_output_enable` defaults to 1, and `newrelic_output_verbose` defaults to 0.
2122

app/code/Magento/CustomerGraphQl/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ You can get more information about [GraphQl In Magento 2](https://developer.adob
2727

2828
### GraphQl Query
2929

30-
- `customer` query - returns information about the logged-in customer, store credit history and customers wishlist
30+
- `customer` query - returns information about the logged-in customer, store credit history and customer's wishlist
3131
- `isEmailAvailable` query - checks whether the specified email has already been used to create a customer account. A value of true indicates the email address is available, and the customer can use the email address to create an account
3232

3333
[Learn more about customer query](https://developer.adobe.com/commerce/webapi/graphql/schema/customer/queries/customer/).
34-
[Learn more about isEmailAvailable query](https://developer.adobe.com/commerce/webapi/graphql/usage/is-email-available.html).
34+
[Learn more about isEmailAvailable query](https://developer.adobe.com/commerce/webapi/graphql/schema/customer/queries/is-email-available).

app/code/Magento/InstantPurchase/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Basic implementation is a good start point but it's recommended to provide own i
9696

9797
The `Magento_InstantPurchase` module does not introduce backward incompatible changes.
9898

99-
You can track [backward incompatible changes in patch releases](https://developer.adobe.com/commerce/php/development/backward-incompatible-changes/highlights/reference.html).
99+
You can track [backward incompatible changes in patch releases](https://developer.adobe.com/commerce/php/development/backward-incompatible-changes/highlights/).
100100

101101
***
102102

app/code/Magento/IntegrationGraphQl/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Magento_IntegrationGraphQl module
22

3-
This module provides GraphQl resolvers for Integartion module.
3+
This module provides GraphQl resolvers for Integration module.
44

55
## Installation
66

app/code/Magento/MediaGallery/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ Extension developers can interact with the Magento_MediaGallery module. For more
2222

2323
For information about significant changes in patch releases, see [2.4.x Release information](https://experienceleague.adobe.com/docs/commerce-operations/release/notes/overview.html).
2424

25-
[Learn more about New Media Gallery](https://experienceleague.adobe.com/docs/commerce-admin/content-design/media/gallery/media-gallery.html).
25+
[Learn more about New Media Gallery](https://experienceleague.adobe.com/en/docs/commerce-admin/content-design/wysiwyg/gallery/media-gallery).

app/code/Magento/MediaGalleryUi/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ For information about a UI component in Magento 2, see [Overview of UI component
4444

4545
For information about significant changes in patch releases, see [2.4.x Release information](https://experienceleague.adobe.com/docs/commerce-operations/release/notes/overview.html).
4646

47-
[Learn more about New Media Gallery](https://experienceleague.adobe.com/docs/commerce-admin/content-design/media/gallery/media-gallery.html).
47+
[Learn more about New Media Gallery](https://experienceleague.adobe.com/en/docs/commerce-admin/content-design/wysiwyg/gallery/media-gallery).

app/code/Magento/MediaGalleryUiApi/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ For information about module installation in Magento 2, see [Enable or disable m
1010

1111
For information about significant changes in patch releases, see [2.4.x Release information](https://experienceleague.adobe.com/docs/commerce-operations/release/notes/overview.html).
1212

13-
[Learn more about New Media Gallery](https://experienceleague.adobe.com/docs/commerce-admin/content-design/media/gallery/media-gallery.html).
13+
[Learn more about New Media Gallery](https://experienceleague.adobe.com/en/docs/commerce-admin/content-design/wysiwyg/gallery/media-gallery).

app/code/Magento/MediaStorage/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ Extension developers can interact with the Magento_MediaStorage module. For more
3737

3838
More information can get at articles:
3939

40-
- [Learn how to configure Media Storage Database](https://experienceleague.adobe.com/docs/commerce-admin/content-design/media/storage/media-storage-database.html).
40+
- [Learn how to configure Media Storage Database](https://experienceleague.adobe.com/en/docs/commerce-admin/content-design/wysiwyg/storage/media-storage-database).
4141
- [Learn how to Resize catalog images](https://developer.adobe.com/commerce/frontend-core/guide/themes/configure/#resize-catalog-images)

app/code/Magento/NewRelicReporting/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Extension developers can interact with the Magento_NewRelicReporting module. For
3131

3232
## Additional information
3333

34-
[Learn more about New Relic Reporting](https://experienceleague.adobe.com/docs/commerce-admin/start/reporting/new-relic-reporting.html).
34+
[Learn more about New Relic Reporting](https://experienceleague.adobe.com/en/docs/commerce-operations/tools/cli-reference/commerce-on-premises#newreliccreatedeploy-marker).
3535

3636
### Console commands
3737

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# Magento_OrderCancellationUi module
22

33
This module allows to cancel an order and specify the order cancellation reason in the storefront. Only orders in `RECEIVED`, `PENDING` or `PROCESSING` statuses can be cancelled. If the customer has paid for the order a refund is processed.
4-

app/code/Magento/QuoteGraphQl/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,37 +46,37 @@ You can get more information about [GraphQl In Magento 2](https://developer.adob
4646
[Learn more about applyCouponToCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/apply-coupon/).
4747

4848
- `removeCouponFromCart` mutation - removes a previously-applied coupon from the cart.
49-
[Learn more about removeCouponFromCart mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/remove-coupon.html).
49+
[Learn more about removeCouponFromCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/remove-coupon/).
5050

5151
- `updateCartItems` mutation - allows you to modify items in the specified cart.
52-
[Learn more about updateCartItems mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/update-cart-items.html).
52+
[Learn more about updateCartItems mutation]((https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/update-items/).
5353

5454
- `removeItemFromCart` mutation - deletes the entire quantity of a specified item from the cart.
55-
[Learn more about removeItemFromCart mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/remove-item.html).
55+
[Learn more about removeItemFromCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/remove-item/).
5656

5757
- `setShippingAddressesOnCart` mutation - sets one or more shipping addresses on a specific cart.
58-
[Learn more about setShippingAddressesOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/set-shipping-address.html).
58+
[Learn more about setShippingAddressesOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/set-shipping-address/).
5959

6060
- `setBillingAddressOnCart` mutation - sets the billing address for a specific cart.
61-
[Learn more about setBillingAddressOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/set-billing-address.html).
61+
[Learn more about setBillingAddressOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/set-billing-address/).
6262

6363
- `setShippingMethodsOnCart` mutation - sets one or more delivery methods on a cart.
64-
[Learn more about setShippingMethodsOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/set-shipping-method.html).
64+
[Learn more about setShippingMethodsOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/set-shipping-method/).
6565

6666
- `setPaymentMethodOnCart` mutation - defines which payment method to apply to the cart.
67-
[Learn more about setPaymentMethodOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/set-payment-method.html).
67+
[Learn more about setPaymentMethodOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/set-payment-method/).
6868

6969
- `setGuestEmailOnCart` mutation - assigns email to the guest cart.
70-
[Learn more about setGuestEmailOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/set-guest-email.html).
70+
[Learn more about setGuestEmailOnCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/set-guest-email/).
7171

7272
- `setPaymentMethodAndPlaceOrder` mutation - sets the cart payment method and converts the cart into an order. **This mutation has been deprecated**. Use the `setPaymentMethodOnCart` and `placeOrder` mutations instead.
73-
[Learn more about setPaymentMethodAndPlaceOrder mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/set-payment-place-order.html).
73+
[Learn more about setPaymentMethodAndPlaceOrder mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/set-payment-place-order/).
7474

7575
- `mergeCarts` mutation - transfers the contents of a guest cart into the cart of a logged-in customer.
76-
[Learn more about mergeCarts mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/merge-carts.html).
76+
[Learn more about mergeCarts mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/merge/).
7777

7878
- `placeOrder` mutation - converts the cart into an order and returns an order ID.
79-
[Learn more about placeOrder mutation](https://developer.adobe.com/commerce/webapi/graphql/mutations/place-order.html).
79+
[Learn more about placeOrder mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/place-order/).
8080

8181
- `addProductsToCart` mutation - adds any type of product to the shopping cart.
8282
[Learn more about addProductsToCart mutation](https://developer.adobe.com/commerce/webapi/graphql/schema/cart/mutations/add-products/).

app/code/Magento/WishlistGraphQl/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ For more information about the Magento_WishlistGraphQl queries and mutations see
3333

3434
### Queries
3535

36-
- [`wishlist`](https://developer.adobe.com/commerce/webapi/graphql/usage/wishlist.html)
36+
- [`wishlist`](https://developer.adobe.com/commerce/webapi/graphql/schema/wishlist/queries/wishlist/)
3737

3838
### Mutations
3939

4040
- [`addProductsToWishlist`](https://developer.adobe.com/commerce/webapi/graphql/schema/wishlist/mutations/add-products/)
41-
- [`removeProductsFromWishlist`](https://developer.adobe.com/commerce/webapi/graphql/mutations/remove-products-from-wishlist.html)
42-
- [`updateProductsInWishlist`](https://developer.adobe.com/commerce/webapi/graphql/mutations/update-products-in-wishlist.html)
41+
- [`removeProductsFromWishlist`](https://developer.adobe.com/commerce/webapi/graphql/schema/wishlist/mutations/remove-products/)
42+
- [`updateProductsInWishlist`](https://developer.adobe.com/commerce/webapi/graphql/schema/wishlist/mutations/update-products/)

dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<label>Payments Pro</label>
7575
<attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
7676
<group id="configuration_details">
77-
<comment>https://docs.magento.com/user-guide/payment/paypal-payments-pro.html</comment>
77+
<comment>https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/payments/paypal/paypal-payments-pro</comment>
7878
</group>
7979
<group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
8080
<field id="enable_paypal_payflow">
@@ -94,7 +94,7 @@
9494
<comment>Accept credit card and PayPal payments securely.</comment>
9595
<attribute type="activity_path">payment/wps_express/active</attribute>
9696
<group id="configuration_details">
97-
<comment>https://docs.magento.com/user-guide/payment/paypal-payments-standard.html</comment>
97+
<comment>https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/payments/paypal/paypal-payments-standard</comment>
9898
</group>
9999
<group id="express_checkout_required">
100100
<group id="express_checkout_required_express_checkout">
@@ -162,7 +162,7 @@
162162
<comment>Accept credit card and PayPal payments securely.</comment>
163163
<attribute type="activity_path">payment/wps_express/active</attribute>
164164
<group id="configuration_details">
165-
<comment>https://docs.magento.com/user-guide/payment/paypal-payments-standard.html</comment>
165+
<comment>https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/payments/paypal/paypal-payments-standard</comment>
166166
</group>
167167
<group id="express_checkout_required">
168168
<group id="express_checkout_required_express_checkout">
@@ -233,7 +233,7 @@
233233
<comment>Accept credit card and PayPal payments securely.</comment>
234234
<attribute type="activity_path">payment/wps_express/active</attribute>
235235
<group id="configuration_details">
236-
<comment>https://docs.magento.com/user-guide/payment/paypal-payments-standard.html</comment>
236+
<comment>https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/payments/paypal/paypal-payments-standard</comment>
237237
</group>
238238
<group id="express_checkout_required">
239239
<group id="express_checkout_required_express_checkout">
@@ -278,7 +278,7 @@
278278
<label>Website Payments Pro</label>
279279
<attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
280280
<group id="configuration_details">
281-
<comment>https://docs.magento.com/user-guide/payment/paypal-payments-pro.html</comment>
281+
<comment>https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/payments/paypal/paypal-payments-pro</comment>
282282
</group>
283283
<group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
284284
<group id="paypal_payflow_api_settings">

0 commit comments

Comments
 (0)