Merge branch 'master' into MC-35039-elasticsearch-support

Author: keharper

src/_data/toc/graphql.yml

@@ -113,6 +113,10 @@ pages:
         - label: products query
           url: /graphql/queries/products.html
 
+        - label: pickupLocations query
+          url: /graphql/queries/pickup-locations.html
+          exclude_versions: ["2.3"]
+
         - label: storeConfig query
           url: /graphql/queries/store-config.html
 

src/_data/toc/inventory.yml

@@ -50,6 +50,10 @@ pages:
         - label: Manage source selection algorithms
           url: /rest/modules/inventory/manage-source-selection.html
 
+        - label: In-Store Pickup
+          url: /rest/modules/inventory/in-store-pickup.html
+          exclude_versions: ["2.3"]
+
     - label: Manage Inventory Management modules
       url: /extensions/inventory-management/
       versionless: true

src/_data/toc/rest-api.yml

@@ -255,3 +255,8 @@ pages:
 
             - label: Manage source selection algorithms
               url: /rest/modules/inventory/manage-source-selection.html
+
+            - label: In-Store Pickup
+              url: /rest/modules/inventory/in-store-pickup.html
+              exclude_versions: ["2.3"]
+              

src/cloud/architecture/starter-develop-deploy-workflow.md

@@ -112,7 +112,7 @@ If you are familiar with Magento, you may be concerned about how to get your con
 
 {{site.data.var.ece}} provides a set of two [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html) commands that export configuration settings from your environment into a file. These commands are only available for **{{site.data.var.ece}} 2.2 and later**.
 
-*  `php .vendor/bin/m2-ece-scd-dump`: Recommended. Exports only the configuration settings you have entered or modified from defaults into a configuration file.
+*  `php .vendor/bin/ece-tools config:dump`: Recommended. Exports only the configuration settings you have entered or modified from defaults into a configuration file.
 *  `php bin/magento app:config:dump`: Exports every configuration setting, including modified and default, into a configuration file.
 
 The generated file is `app/etc/config.php`.
@@ -121,11 +121,11 @@ You generate the file in the Integration environment where you configured Magent
 
 **Important notes** on Configuration Management:
 
-*  Any configuration setting included in the file generated from the `app:config:dump` command is locked from editing, or read-only, in the deployed environment. This is one reason we recommend using the `.vendor/bin/m2-ece-scd-dump` command.
+*  Any configuration setting included in the file generated from the `app:config:dump` command is locked from editing, or read-only, in the deployed environment. This is one reason we recommend using the `.vendor/bin/ece-tools config:dump` command.
 
-   For example, we will have you install a module for Fastly in your development environment. You can only configure this module in the Staging and Production environment. Using the `.vendor/bin/m2-ece-scd-dump` command keeps those default fields editable when you deploy your development changes to the Staging and Production environment.
+   For example, we will have you install a module for Fastly in your development environment. You can only configure this module in the Staging and Production environment. Using the `.vendor/bin/ece-tools config:dump` command keeps those default fields editable when you deploy your development changes to the Staging and Production environment.
 
-*  The generated file can be long depending on the size of your deployment. The `.vendor/bin/m2-ece-scd-dump` command generates a much smaller file than the file generated by the `app:config:dump` command.
+*  The generated file can be long depending on the size of your deployment. The `.vendor/bin/ece-tools config:dump` command generates a much smaller file than the file generated by the `app:config:dump` command.
 
 ![Generate configuration management file]({{ site.baseurl }}/common/images/cloud/cloud_workflow-config-mgmt.png)
 

src/cloud/live/sens-data-initial.md

@@ -88,13 +88,13 @@ To create and transfer `config.php`:
 1. Create `config.php` on the integration server.
 
    ```bash
-   ssh <SSH URL> "php vendor/bin/m2-ece-scd-dump"
+   ssh <SSH URL> "php vendor/bin/ece-tools config:dump"
    ```
 
    For example,
 
    ```bash
-   ssh [email protected] "php vendor/bin/m2-ece-scd-dump"
+   ssh [email protected] "php vendor/bin/ece-tools config:dump"
    ```
 
 1. If you haven't done so already, change to the project root directory.
@@ -197,7 +197,7 @@ To add additional configuration values in the Integration environment Magento Ad
 
 ### Run the config.php command {#regenerate}
 
-By running the command again for `php vendor/bin/m2-ece-scd-dump`, the new configuration is appended to the file.
+By running the command again for `php vendor/bin/ece-tools config:dump`, the new configuration is appended to the file.
 
 1. On your local system, find the integration server's SSH URL.
 
@@ -208,13 +208,13 @@ By running the command again for `php vendor/bin/m2-ece-scd-dump`, the new confi
 1. Run the `config.php` creation command again on the Integration server.
 
    ```bash
-   ssh <SSH URL> "php vendor/bin/m2-ece-scd-dump"
+   ssh <SSH URL> "php vendor/bin/ece-tools config:dump"
    ```
 
    For example,
 
    ```bash
-   ssh [email protected] "php vendor/bin/m2-ece-scd-dump"
+   ssh [email protected] "php vendor/bin/ece-tools config:dump"
    ```
 
 1. If you haven't done so already, change to the project root directory.

src/cloud/project/project-upgrade.md

@@ -155,7 +155,7 @@ To create a system-specific configuration file:
    For example for Pro, to run the `scd-dump` on the `integration` branch:
 
    ```bash
-   ssh <project-id-integration>@ssh.us.magentosite.cloud "php vendor/bin/m2-ece-scd-dump"
+   ssh <project-id-integration>@ssh.us.magentosite.cloud "php vendor/bin/ece-tools config:dump"
    ```
 
 1. Transfer the `config.php` file to your local workstations using `rsync` or `scp`. You can only add this file to the branch locally.

src/cloud/reference/discover-deploy.md

@@ -220,7 +220,7 @@ If the `app/etc/config.php` file does not exist in the codebase, static files ar
 {:.bs-callout-info}
 Refer to [Magento deploy variables]({{ site.baseurl }}/cloud/env/variables-deploy.html) to learn about customizing or disabling file compression.
 
-There are two default deploy hooks. The `pre-deploy.php` hook completes necessary cleanup and retrieval of resources and code generated in the build hook. The `php ./vendor/bin/m2-ece-deploy` hook runs a series of commands and scripts:
+There are two default deploy hooks. The `pre-deploy.php` hook completes necessary cleanup and retrieval of resources and code generated in the build hook. The `php ./vendor/bin/ece-tools deploy` hook runs a series of commands and scripts:
 
 -  If Magento is **not installed**, it installs Magento with `bin/magento setup:install`, updates the deployment configuration, `app/etc/env.php`, and the database for your specified environment, such as Redis and website URLs. **Important:** When you completed the [First time deployment]({{ site.baseurl }}/cloud/setup/first-time-deploy.html) during setup, {{site.data.var.ee}} was installed and deployed across all environments.
 

src/guides/v2.3/get-started/authentication/gs-authentication-session.md

@@ -23,12 +23,11 @@ For example, if a customer is logged in to the Magento storefront and the [JavaS
 
 `GET /rest/V1/customers/me`
 
-Similarly, if an admin is logged in to the Magento Admin
-and the JavaScript widget `Magento_Customer::group` API, details for the logged-in admin are fetched.
-The web API framework establishes the identity of the admin user based on logged-in session information and authorizes access to the `Magento_Customer::group` resource.
+Similarly, if an admin is logged in to the Magento Admin and the JavaScript widget invokes the `Magento_Customer::group` API, details for the logged-in admin are fetched. The web API framework establishes the identity of the admin user based on logged-in session information and authorizes access to the `Magento_Customer::group` resource.
 
- {:.bs-callout-info}
-The session based authentication functionality is restricted to only allow for AJAX calls and not direct browser requests due to security vulnerabilities. A developer can create a custom storefront widget that can issue requests without additional authentication steps.
+{:.bs-callout-warning}
+Admin session-based authentication is not currently possible for API endpoints.
+The session based authentication functionality is restricted to AJAX calls. Direct browser requests cannot be made due to security vulnerabilities. A developer can create a custom storefront widget that can issue requests without additional authentication steps.
 
 ## Related topic
 

src/guides/v2.3/rest/tutorials/inventory/create-cart-add-products.md

@@ -1,5 +1,6 @@
 ---
 layout: tutorial
+group: rest-api
 title: Step 7. Create a cart and add products to it
 subtitle: Order processing with Inventory Management
 menu_title: Step 7. Create a cart and add products to it

src/guides/v2.3/rest/tutorials/inventory/create-invoice.md

@@ -1,5 +1,6 @@
 ---
 layout: tutorial
+group: rest-api
 title: Step 10. Create an invoice
 subtitle: Order processing with Inventory Management
 menu_title: Step 10. Create an invoice