Merge branch 'master' into response-for-graphql-query

Author: keharper

_config.checks.yml

@@ -36,4 +36,5 @@ html-proofer:
   # Ignore any link that includes a specified pattern
   :url_ignore:
   - !ruby/regexp /guides\/v2\.2/
+  - !ruby/regexp /\/download\//
 

_config.yml

@@ -195,3 +195,6 @@ m1xgithuburl: https://github.com/magento/devdocs-m1/tree/master
 # 2.3 variables
 gdeurl23: /guides/v2.3/
 githuburl23: https://github.com/magento/devdocs/tree/master/src/guides/v2.3/
+
+# Path to S3 location where we store large downloadable binary files, such as .ai, .psd, .zip, .pdf, .sketch
+downloads: https://devdocs.magento.com/download

src/_data/toc/architecture-guide.yml

@@ -13,6 +13,9 @@ pages:
         - label: Frontend customization
           url: /architecture/frontend_custom_strategies.html
 
+        - label: Security overview
+          url: /architecture/security_intro.html
+
     - label: Architectural layers
       url: /architecture/archi_perspectives/ALayers_intro.html
       children:

src/_data/toc/configuration-guide.yml

@@ -286,25 +286,6 @@ pages:
     - label: Configure the database profiler
       url: /config-guide/db-profiler/db-profiler.html
 
-    - label: Install and configure Elasticsearch (Magento Commerce only)
-      url: /config-guide/elasticsearch/es-overview.html
-      children:
-
-        - label: Configure nginx and Elasticsearch
-          url: /config-guide/elasticsearch/es-config-nginx.html
-
-        - label: Configure Apache and Elasticsearch
-          url: /config-guide/elasticsearch/es-config-apache.html
-
-        - label: Configure Elasticsearch stopwords
-          url: /config-guide/elasticsearch/es-config-stopwords.html
-
-        - label: Configure Magento to use Elasticsearch
-          url: /config-guide/elasticsearch/configure-magento.html
-
-        - label: Change the Elasticsearch client
-          url: /config-guide/elasticsearch/es-downgrade.html
-
     - label: Install and configure Elasticsearch
       url: /config-guide/elasticsearch/es-overview.html
       children:

src/_data/toc/marketplace-api.yml

@@ -21,6 +21,10 @@ pages:
       url: /marketplace/eqp/v1/packages.html
       versionless: true
 
+    - label: Test results
+      url: /marketplace/eqp/v1/test-results.html
+      versionless: true
+
     - label: Reports
       url: /marketplace/eqp/v1/reports.html
       versionless: true
@@ -29,3 +33,6 @@ pages:
       url: /marketplace/eqp/v1/filtering.html
       versionless: true
 
+    - label: API callbacks
+      url: /marketplace/eqp/v1/callbacks.html
+      versionless: true

src/_data/toc/ui-components-guide.yml

@@ -51,6 +51,10 @@ pages:
         - label: ColumnsEditingClient component
           url: /ui_comp_guide/components/ui-columns-editing-client.html
 
+        - label: ColumnsResize component
+          url: /ui_comp_guide/components/ui-columns-resize.html
+          exclude_versions: ["2.2"]
+
         - label: ColumnsControls component
           url: /ui_comp_guide/components/ui-columnscontrols.html
 
@@ -99,6 +103,9 @@ pages:
         - label: Form component
           url: /ui_comp_guide/components/ui-form.html
 
+        - label: FormDataProvider component
+          url: /ui_comp_guide/components/ui-form-data-provider.html
+
         - label: GridDataProvider component
           url: /ui_comp_guide/components/ui-grid-data-provider.html
 

src/_includes/graphql/cart-object.md

@@ -13,6 +13,7 @@ Attribute |  Data Type | Description
 `prices` | [CartPrices][CartPrices] | Contains subtotals and totals
 `selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method
 `shipping_addresses` | [[ShippingCartAddress]][ShippingCartAddress]! | Contains one or more shipping addresses
+`total_quantity` | Float! | Total Quantity of products in the cart
 
 [AppliedCoupon]: {{page.baseurl}}/graphql/queries/cart.html#AppliedCoupon
 [AppliedGiftCard]: {{page.baseurl}}/graphql/queries/cart.html#AppliedGiftCard

src/_includes/graphql/customer-payment-tokens.md

@@ -4,7 +4,7 @@ The `CustomerPaymentTokens` output object contains an array of `items`.
 
 Attribute | Data Type | Description
 --- | --- | ---
-`items` | [PaymentToken] | Contains an array of customer payment tokens
+`items` | [PaymentToken]! | Contains an array of customer payment tokens
 
 ### PaymentToken attributes
 
@@ -13,6 +13,6 @@ The `PaymentToken` object defines characteristics of a token stored in the payme
 Attribute | Data Type | Description
 --- | --- | ---
 `details` | String | Stored account details
-`payment_method_code` | String | The payment method code associated with the token
-`public_hash` | String | The public hash of the token generated by the vault provider
-`type` | `PaymentTokenTypeEnum` | `card` or `account`
+`payment_method_code` | String! | The payment method code associated with the token
+`public_hash` | String! | The public hash of the token generated by the vault provider
+`type` | `PaymentTokenTypeEnum!` | `card` or `account`

src/cloud/architecture/cloud-architecture.md

@@ -82,7 +82,7 @@ For comparison, each plan includes the following infrastructure features and sup
       <td>24x7 monitoring and email support for the core application and the cloud infrastructure</td>
     </tr>
     <tr>
-      <td>Dedicated Technical Account Manager</td>
+      <td>A dedicated Customer Technical Advisor (CTA)</td>
       <td class="blank"></td>
       <td>Dedicated technical account management for the initial launch period, starting with your subscription until your initial site launch</td>
     </tr>

src/cloud/cdn/configure-fastly.md

@@ -65,11 +65,11 @@ To enable Fastly CDN caching in Staging and Production:
 
 1. Click **Stores** > Settings > **Configuration** > **Advanced** > **System** and expand **Full Page Cache**.
 
-   ![Expand to select Fastly]({{ site.baseurl }}/common/images/cloud_fastly_menu.png){:width="650px"}
+   ![Expand to select Fastly]({{ site.baseurl }}/common/images/cloud/cloud_fastly_menu.png){:width="650px"}
 
 1. In the _Caching Application_ section, remove the selection from **Use system value**, and then select **Fastly CDN** from the drop-down list.
 
-   ![Choose Fastly]({{ site.baseurl }}/common/images/cloud-fastly_enable-admin.png){:width="550px"}
+   ![Choose Fastly]({{ site.baseurl }}/common/images/cloud/cloud-fastly_enable-admin.png){:width="550px"}
 
 1. Expand **Fastly Configuration** and [choose caching options](https://github.com/fastly/fastly-magento2/blob/master/Documentation/CONFIGURATION.md#configure-the-module).
 
@@ -96,7 +96,7 @@ To enable Fastly CDN caching in Staging and Production:
 
    If the test fails, verify that the correct service ID and API token values match the credentials for the current environment.
 
-   If the test fails again, submit a support ticket or contact your Technical Account Manager. For Pro projects, include the URLs for your Production and Staging sites.  For Starter projects, include the URLs for your `Master` and Staging site.
+   If the test fails again, submit a support ticket or contact your Customer Technical Advisor (CTA). For Pro projects, include the URLs for your Production and Staging sites.  For Starter projects, include the URLs for your `Master` and Staging site.
 
  {:.bs-callout-info}
 If you need to change the Fastly API token credential for a Staging or Production environment, see [Change Fastly credentials]({{ site.baseurl}}/cloud/cdn/cloud-fastly.html#change-your-fastly-api-token).
@@ -113,7 +113,7 @@ To upload the Fastly VCL:
 
 1. In the _Fastly Configuration_ section, click **Upload VCL to Fastly** as the following figure shows.
 
-   ![Upload a Magento VCL to Fastly]({{ site.baseurl }}/common/images/cloud_upload-vcl-to-fastly.png)
+   ![Upload a Magento VCL to Fastly]({{ site.baseurl }}/common/images/cloud/cloud_fastly-upload-vcl-admin-ui.png)
 
 1. After the upload completes, refresh the cache according to the notification at the top of the page.
 
@@ -146,7 +146,7 @@ To review the backend settings configuration:
 
 1. Expand **Backend settings** and click the gear to check the default backend. A modal opens that shows current settings with options to change them.
 
-   ![Modify the backend]({{ site.baseurl }}/common/images/cloud_fastly-backend.png){:width="600px"}
+   ![Modify the backend]({{ site.baseurl }}/common/images/cloud/cloud_fastly-backend.png){:width="600px"}
 
 1. Select the **Shield** location (or datacenter) closest to your AWS region.
    For example, if Staging is on the west coast of the United States (us-west-1), select the `sjc-ca-us` Fastly shield location. This is the POP that provides caching services.
@@ -192,7 +192,7 @@ The options include:
 -  **Purge CMS page**: Purges page content when updating and adding pages to the Magento CMS. For example, you may want to purge when updating your Terms and Conditions or Return policy. If you rarely make these changes, you could disable automatic purging.
 -  **Soft purge**: Sets changed content to stale and purges according to the stale timing. In combination with the stale timings your customers will be served stale content very fast while Fastly is updating the content in the background.
 
-![Configure purge options]({{ site.baseurl }}/common/images/cloud_fastly-purgeoptions.png){:width="650px"}
+![Configure purge options]({{ site.baseurl }}/common/images/cloud/cloud_fastly-purgeoptions.png){:width="650px"}
 
 {:.procedure}
 To configure Fastly purge options:
@@ -237,7 +237,7 @@ The Fastly module includes GeoIP handling to automatically redirect visitors or
 
 1. For **Country Mapping**, click **Add** to enter a two-letter country code to map with a specific Magento store from a list. For a list of country codes, see [this site](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).
 
-   ![Add GeoIP country maps]({{ site.baseurl }}/common/images/cloud_fastly-geo-code.png)
+   ![Add GeoIP country maps]({{ site.baseurl }}/common/images/cloud/cloud_fastly-geo-code.png)
 
 1. Click **Save Config** at the top of the page.
 

src/cloud/cdn/fastly-image-optimization.md

@@ -58,11 +58,11 @@ To update Fastly IO:
 
 1. On the _Fastly Configuration_ page in the _Default IO config options_ field, click **Configure**.
 
-   ![View the Fastly IO configuration settings]({{ site.baseurl }}/common/images/cloud_fastly-io-default-config.png){:width="650px"})
+   ![View the Fastly IO configuration settings]({{ site.baseurl }}/common/images/cloud/cloud_fastly-io-default-config.png){:width="650px"})
 
 1. Review and update the Fastly IO configuration settings on the _Image optimization default config options_ page:
 
-   ![Review Fastly IO configuration]({{ site.baseurl }}/common/images/cloud_fastly-io-config-options.png){:width="650px"}
+   ![Review Fastly IO configuration]({{ site.baseurl }}/common/images/cloud/cloud_fastly-io-config-options.png){:width="650px"}
 
    -  **Auto WebP?**—leave the default setting (*Yes*) to convert images to the WebP format in browsers that support it. If you change the setting to **No**, Fastly uses the image file type instead of converting the image to WebP format.
 
@@ -86,13 +86,13 @@ To update Fastly IO:
 
 1. In the Image Optimization configuration _Enable deep image optimization_ field, select **Yes** to turn on deep image optimization.
 
-   ![Enable Fastly IO deep image optimization]({{ site.baseurl }}/common/images/cloud_fastly-io-deep-image-config.png){:width="650px"}
+   ![Enable Fastly IO deep image optimization]({{ site.baseurl }}/common/images/cloud/cloud_fastly-io-deep-image-config.png){:width="650px"}
 
    Deep image optimization is off by default. When this feature is enabled, the built-in resizing feature in Magento is turned off and resizing work is offloaded to the Fastly IO service. Image optimization only applies to product images. CMS images are not resized. See the [Fastly documentation](#deep-image-optimization).
 
 1. After you enable deep image optimization, enable the [adaptive pixel ratios](#adaptive-pixel-ratios) feature to generate images optimized for use in responsive websites.
 
-   ![Enable Fastly IO adaptive pixel ratios]({{ site.baseurl }}/common/images/cloud_fastly-io-config-adaptive-pixel.png){:width="650px"}
+   ![Enable Fastly IO adaptive pixel ratios]({{ site.baseurl }}/common/images/cloud/cloud_fastly-io-config-adaptive-pixel.png){:width="650px"}
 
    -  In the _Enable adaptive device pixel ratios_ field, select **Yes**.
    -  In the _Device pixel ratios_ field, accept the default setting, or click the **System Input** check box to remove the setting. Then, select the desired ratio. A higher Device Pixel Ratio setting delivers larger images.

src/cloud/cdn/trouble-fastly.md

@@ -105,7 +105,7 @@ To check the Fastly 503 error page:
 
 1. Reopen the URL that caused the 503 error. Fastly returns an error page with the reason as shown in the following example.
 
-   ![Fastly error]({{ site.baseurl }}/common/images/cloud_fastly-503-example.png)
+   ![Fastly error]({{ site.baseurl }}/common/images/cloud/cloud_fastly-503-example.png)
 
 ## Apex and subdomains already associated with a Fastly account {#domains}
 

src/cloud/configure/setup-cron-jobs.md

@@ -53,7 +53,7 @@ To review cron configuration on Pro plan environments:
    ```
 
    {:.bs-callout-info}
-   If the `crontab -l` command returns a `Command not found` error, contact your Magento account manager or CSM about enabling the auto-crons self-service configuration option on your {{site.data.var.ece}} project.
+   If the `crontab -l` command returns a `Command not found` error, contact your Customer Technical Advisor (CTA) or Customer Success Manager (CSM) about enabling the auto-crons self-service configuration option on your {{site.data.var.ece}} project.
 
 The following example shows the crontab output for an environment that has only the default crons configuration:
 
@@ -120,7 +120,7 @@ The default cron interval for all environments provisioned in the US-3, EU-3, an
 
 ### Prerequisite
 
-On {{ site.data.var.ee }} Pro projects, the [auto-crons feature](#verify-cron-configuration-on-pro-projects) must be enabled on your {{site.data.var.ece}} project before you can add custom cron jobs to Staging and Production environments using `.magento.app.yaml`. If this feature is not enabled,contact your Magento account manager or CSM.
+On {{ site.data.var.ee }} Pro projects, the [auto-crons feature](#verify-cron-configuration-on-pro-projects) must be enabled on your {{site.data.var.ece}} project before you can add custom cron jobs to Staging and Production environments using `.magento.app.yaml`. If this feature is not enabled, contact your Customer Technical Advisor (CTA).
 
 {:.procedure}
 To add custom crons:

src/cloud/deploy/scenario-based-deployment.md

@@ -69,7 +69,7 @@ hooks:
     php ./vendor/bin/ece-tools run scenario/deploy.xml vendor/<vendor-name>/<module-name>/deploy.xml vendor/<vendor-name>/<module-name>/deploy2.xml
 ```
 
-During deployment, the custom scenarios merge with the default scenario based on the following rules:
+During deployment, the custom scenarios merge with the default scenario-based on the following rules:
 
 -  Scenarios are prioritized based on their sequence in the hook definition with the last scenario listed having the highest priority.
 

src/cloud/live/go-live-checklist.md

@@ -6,7 +6,7 @@ functional_areas:
   - Testing
 ---
 
-Before you deploy to the Production environment, download the [Go live checklist]({{ site.baseurl }}/common/pdf/magento-commerce-cloud-prelaunch-checklist.pdf), and use it with these instructions to confirm that you have completed all required configuration and testing. See an overview of the complete deployment process for Starter and Pro at [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html).
+Before you deploy to the Production environment, download the [Go live checklist]({{ site.downloads }}/magento-commerce-cloud-prelaunch-checklist.pdf), and use it with these instructions to confirm that you have completed all required configuration and testing. See an overview of the complete deployment process for Starter and Pro at [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html).
 
 ## Completely test in Production {#test}
 

src/cloud/project/ece-tools-upgrade-project.md

@@ -62,7 +62,9 @@ To upgrade project to use ece-tools:
    hooks:
        # We run build hooks before your application has been packaged.
        build: |
-           php ./vendor/bin/ece-tools build
+           set -e
+           php ./vendor/bin/ece-tools build:generate
+           php ./vendor/bin/ece-tools build:transfer
        # We run deploy hook after your application has been deployed and started.
        deploy: |
            php ./vendor/bin/ece-tools deploy