From 2c1c470edfd1585bc25db2aedebf5e0efd765cfa Mon Sep 17 00:00:00 2001 From: Dan Mooney <30629803+danmooney2@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:03:29 -0500 Subject: [PATCH 1/4] Update config-remote-storage-aws-s3.md Fix incorrect options for setting remote storage access key and secret. It conflicts with the correct options page it links to https://devdocs.magento.com/guides/v2.4/config-guide/remote-storage/config-remote-storage.html#remote-storage-options. --- .../config-guide/remote-storage/config-remote-storage-aws-s3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.4/config-guide/remote-storage/config-remote-storage-aws-s3.md b/src/guides/v2.4/config-guide/remote-storage/config-remote-storage-aws-s3.md index c6fc267fdc6..05c59ac4b66 100644 --- a/src/guides/v2.4/config-guide/remote-storage/config-remote-storage-aws-s3.md +++ b/src/guides/v2.4/config-guide/remote-storage/config-remote-storage-aws-s3.md @@ -22,7 +22,7 @@ To enable remote storage with the AWS S3 adapter: 1. Configure Magento to use the private bucket. See [Remote storage options][options] for a full list of parameters. ```bash - bin/magento setup:config:set --remote-storage-driver="aws-s3" --remote-storage-bucket="" --remote-storage-region="" --remote-storage-prefix="" --access-key= --secret-key= -n + bin/magento setup:config:set --remote-storage-driver="aws-s3" --remote-storage-bucket="" --remote-storage-region="" --remote-storage-prefix="" --remote-storage-key= --remote-storage-secret= -n ``` ## Configure Nginx From 517cbe14691c765719f4c34da6291907bf8fd443 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Thu, 1 Apr 2021 16:34:03 +0700 Subject: [PATCH 2/4] Add note to clarify when using guest endpoint --- src/guides/v2.3/rest/tutorials/orders/order-create-order.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md index f0bc035b21b..9d240e24734 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md @@ -25,6 +25,8 @@ When you submit payment information, Magento creates an order and sends an order {:.bs-callout-info} Use the `V1/guest-carts//payment-information` endpoint to set the payment information on behalf of a guest. Do not include an authorization token. +Also, when using this guest-carts endpoint, it's required to include `email` field in the payload (same level as `paymentMethod` and `billing_address`) + **Endpoint:** `POST /rest//V1/carts/mine/payment-information` From 182bd790a186be1515453f49f6d6414a773bb427 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Sat, 3 Apr 2021 13:55:57 +0700 Subject: [PATCH 3/4] Fix typo --- src/guides/v2.3/config-guide/db-profiler/db-profiler.md | 2 +- .../v2.3/config-guide/prod/config-reference-envphp.md | 6 +++--- src/guides/v2.4/config-guide/db-profiler/db-profiler.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/guides/v2.3/config-guide/db-profiler/db-profiler.md b/src/guides/v2.3/config-guide/db-profiler/db-profiler.md index 4a6e548cb6e..8b46b54a4aa 100644 --- a/src/guides/v2.3/config-guide/db-profiler/db-profiler.md +++ b/src/guides/v2.3/config-guide/db-profiler/db-profiler.md @@ -53,7 +53,7 @@ An example follows: ## Step 2: Configure the output -Configure the output in your Magento application boostrap file; this might be `/index.php` or it could be located in a web server virtual host configuration. +Configure the output in your Magento application bootstrap file; this might be `/index.php` or it could be located in a web server virtual host configuration. The following example displays results in a three-column table: diff --git a/src/guides/v2.3/config-guide/prod/config-reference-envphp.md b/src/guides/v2.3/config-guide/prod/config-reference-envphp.md index 03acb895fde..20f7a7b7aac 100644 --- a/src/guides/v2.3/config-guide/prod/config-reference-envphp.md +++ b/src/guides/v2.3/config-guide/prod/config-reference-envphp.md @@ -181,7 +181,7 @@ Learn more about [Magento Modes][magento-modes]. ## queue -Message queue releated configurations are available in this node. +Message queue related configurations are available in this node. ```conf 'queue' => [ @@ -196,7 +196,7 @@ Learn more about Message queue in below link [Message Queue][message-queue] ## resource -Resource configuration settings are avilable in this node. +Resource configuration settings are available in this node. ```conf 'resource' => [ @@ -208,7 +208,7 @@ Resource configuration settings are avilable in this node. ## session -Magento session related configurations are stoted in the `session` node. +Magento session related configurations are stored in the `session` node. ```conf 'session' => [ diff --git a/src/guides/v2.4/config-guide/db-profiler/db-profiler.md b/src/guides/v2.4/config-guide/db-profiler/db-profiler.md index 3591db93618..3000206e38a 100644 --- a/src/guides/v2.4/config-guide/db-profiler/db-profiler.md +++ b/src/guides/v2.4/config-guide/db-profiler/db-profiler.md @@ -53,7 +53,7 @@ An example follows: ## Step 2: Configure the output -Configure the output in your Magento application boostrap file; this might be `/pub/index.php` or it could be located in a web server virtual host configuration. +Configure the output in your Magento application bootstrap file; this might be `/pub/index.php` or it could be located in a web server virtual host configuration. The following example displays results in a three-column table: From 0b27b5049fa5de3f7b5f9b015542097bfa05458f Mon Sep 17 00:00:00 2001 From: Kevin Harper Date: Mon, 5 Apr 2021 09:25:09 -0500 Subject: [PATCH 4/4] Update order-create-order.md --- src/guides/v2.3/rest/tutorials/orders/order-create-order.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md index 9d240e24734..8e647b2f576 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md @@ -24,8 +24,7 @@ When you submit payment information, Magento creates an order and sends an order {:.bs-callout-info} Use the `V1/guest-carts//payment-information` endpoint to set the payment information on behalf of a guest. Do not include an authorization token. - -Also, when using this guest-carts endpoint, it's required to include `email` field in the payload (same level as `paymentMethod` and `billing_address`) +You must include the `email` attribute in the payload at the same level as `paymentMethod` and `billing_address`. **Endpoint:**