Sync 2.3.4-develop and resolve merge conflicts

src/_data/toc/graphql.yml

@@ -16,6 +16,9 @@ pages:
         - label: GraphQL Caching
           url: /graphql/caching.html
 
+        - label: Filtering with custom attributes
+          url: /graphql/custom-filters.html
+
     - label: Development
       children:
         - label: Define the GraphQL schema for a module
@@ -50,6 +53,9 @@ pages:
         - label: category query
           url: /graphql/queries/category.html
 
+        - label: categoryList query
+          url: /graphql/queries/category-list.html
+
         - label: checkoutAgreements query
           url: /graphql/queries/checkout-agreements.html
 
@@ -74,6 +80,9 @@ pages:
         - label: customer query
           url: /graphql/queries/customer.html
 
+        - label: customerCart query
+          url: /graphql/queries/customer-cart.html
+
         - label: customerDownloadableProducts query
           url: /graphql/queries/customer-downloadable-products.html
 
@@ -112,9 +121,15 @@ pages:
         - label: Using mutations
           url: /graphql/mutations/index.html
 
+        - label: addBundleProductsToCart mutation
+          url: /graphql/mutations/add-bundle-products.html
+
         - label: addConfigurableProductsToCart mutation
           url: /graphql/mutations/add-configurable-products.html
 
+        - label: addDownloadableProductsToCart mutation
+          url: /graphql/mutations/add-downloadable-products.html
+
         - label: addSimpleProductsToCart mutation
           url: /graphql/mutations/add-simple-products.html
 
@@ -163,6 +178,9 @@ pages:
         - label: handlePayflowProResponse mutation
           url: /graphql/mutations/handle-payflow-pro-response.html
 
+        - label: mergeCarts mutation
+          url: /graphql/mutations/merge-carts.html
+
         - label: placeOrder mutation
           url: /graphql/mutations/place-order.html
 

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

@@ -93,6 +93,10 @@ pages:
         - label: HtmlContent component
           url: /ui_comp_guide/components/ui-htmlcontent.html
 
+        - label: ImagePreview component
+          include_versions: ["2.3"]
+          url: /ui_comp_guide/components/ui-image-preview.html
+
         - label: ImageUploader component
           include_versions: ["2.3"]
           url: /ui_comp_guide/components/image-uploader/
@@ -113,6 +117,10 @@ pages:
         - label: Listing (grid) component
           url: /ui_comp_guide/components/ui-listing-grid.html
 
+        - label: Masonry (grid) component
+          include_versions: ["2.3"]
+          url: /ui_comp_guide/components/ui-masonry.html
+
         - label: MassActions component
           url: /ui_comp_guide/components/ui-massactions.html
 

src/_includes/cloud/enable-ssh.md

@@ -51,7 +51,7 @@ To create an SSH key pair:
 
    GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.
 
-1. When prompted to "Enter a file in which to save the key," press **Enter**to save the file to the default location. The prompt displays the location.
+1. When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.
 
 1. When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.
 

src/_includes/config/consumers.md

@@ -0,0 +1,7 @@
+Name|Value|Required?|
+|`--consumers-wait-for-messages`|Should consumers wait for a message from the queue? 1 - Yes, 0 - No|No|
+{:style="table-layout:auto;"}
+
+`0`—Consumers process available messages in the queue, close the TCP connection, and terminate. Consumers do not wait for additional messages to enter the queue, even if the number of processed messages is less than the `--max_messages` value specified during starting consumers.
+
+`1`—Consumers continue to process messages from the message queue until reaching the maximum number of messages (the value specified for `--max_messages` on the `queue:consumers:start` command) before closing the TCP connection and terminating the consumer process. If the queue empties before reaching `--max_messages` the consumer waits for more messages to arrive. If you use workers to run consumers instead of using a cron job, set this variable to `1`.

src/_includes/graphql/cart-object.md

@@ -1,11 +1,14 @@
 Attribute |  Data Type | Description
 --- | --- | ---
-`applied_coupon` | [`AppliedCoupon`][AppliedCoupon] | The `AppliedCoupon` object contains the `code` text attribute, which specifies the coupon code
+`applied_coupon` | [`AppliedCoupon`][AppliedCoupon] | Deprecated. Use `applied_coupons` instead
+`applied_coupons` | [[`AppliedCoupon`]][AppliedCoupon] | An array of `AppliedCoupon` objects. Each object contains the `code` text attribute, which specifies the coupon code
 `applied_gift_cards` | [[`AppliedGiftCard`]][AppliedGiftCard] | An array of `AppliedGiftCard` objects. An `AppliedGiftCard` object contains the `code` text attribute, which specifies the gift card code. `applied_gift_cards` is a Commerce-only attribute, defined in the GiftCardAccountGraphQl module
 `applied_store_credit` | [`AppliedStoreCredit`][AppliedStoreCredit] | Contains store credit information applied to the cart. `applied_store_credit` is a Commerce-only attribute, defined in the CustomerBalanceGraphQl module
 `available_payment_methods` | [[AvailablePaymentMethod]][AvailablePaymentMethod] | Available payment methods
-`billing_address` | [BillingCartAddress][BillingCartAddress]! | Contains the billing address specified in the customer's cart
+`billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
 `email` | String | The customer's email address
+`id` | ID! | The ID of the cart
+`is_virtual` | Boolean | Indicates whether the cart contains only virtual products
 `items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
 `prices` | [CartPrices][CartPrices] | Contains subtotals and totals
 `selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method

src/_includes/graphql/cms-block-object.md

@@ -0,0 +1,7 @@
+The `CmsBlock` object can contain the following attributes:
+
+Attribute | Data type | Description
+--- | --- | ---
+`content` | String | The content of the CMS block in raw HTML
+`identifier` | String | The CMS block identifier
+`title` | String | The title assigned to the CMS block

src/_includes/graphql/create-customer.md

@@ -1,6 +1,7 @@
 Attribute |  Data Type | Description
 --- | --- | ---
-`dob` | String | The customer’s date of birth
+`date_of_birth` | String | The customer’s date of birth
+`dob` | String | Deprecated. Use `date_of_birth` instead. The customer’s date of birth
 `email` | String | The customer’s email address. Required to create a customer
 `firstname` | String | The customer’s first name. Required to create a customer
 `gender` | Int | The customer's gender (Male - 1, Female - 2)

src/_includes/graphql/customer-address-input.md

@@ -1,13 +1,14 @@
-### CustomerAddress input {#customerAddressInput}
+### CustomerAddressInput attributes {#customerAddressInput}
 
-The `CustomerAddress` input can contain the following attributes:
+The `CustomerAddressInput` object can contain the following attributes:
 
 Attribute |  Data Type | Description
 --- | --- | ---
 `city` | String | The city or town
 `company` | String | The customer's company
-`country_id` | String | The customer's country
-`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeInput) | Address custom attributes
+`country_code` | String | The customer's country
+`country_id` | String | Deprecated. Use `country_code` instead. The customer's country
+`custom_attributes` | [CustomerAddressAttributeInput](#customerAddressAttributeInput) | Deprecated. Not applicable for GraphQL
 `customer_id` | Int | The customer ID
 `default_billing` | Boolean | Indicates whether the address is the default billing address
 `default_shipping` | Boolean | Indicates whether the address is the default shipping address
@@ -19,28 +20,28 @@ Attribute |  Data Type | Description
 `middlename` | String | The middle name of the person associated with the shipping/billing address
 `postcode` | String | The customer's ZIP or postal code
 `prefix` | String | An honorific, such as Dr., Mr., or Mrs.
-`region` | [CustomerAddressRegion](#customerAddressRegionInput) | An object that defines the customer's state or province
-`region_id` | Int | A number that uniquely identifies the state, province, or other area
+`region` | [CustomerAddressRegionInput](#customerAddressRegionInput) | An object that defines the customer's state or province
+`region_id` | Int | Deprecated. Use `region` instead. A number that uniquely identifies the state, province, or other area
 `street` | [String] | An array of strings that define the street number and name
 `suffix` | String | A value such as Sr., Jr., or III
 `telephone` | String | The telephone number
 `vat_id` | String | The customer's Tax/VAT number (for corporate customers)
 
-### CustomerAddressAttribute input {#customerAddressAttributeInput}
+### CustomerAddressAttributeInput attributes {#customerAddressAttributeInput}
 
-The `CustomerAddressAttribute` input can contain the following attributes:
+The `CustomerAddressAttributeInput` data type has been deprecated because the contents are not applicable for GraphQL. It can contain the following attributes:
 
 Attribute |  Data Type | Description
 --- | --- | ---
 `attribute_code` | String | Attribute code
 `value` | String | Attribute value
 
-### CustomerAddressRegion input {#customerAddressRegionInput}
+### CustomerAddressRegionInput attributes {#customerAddressRegionInput}
 
-The `customerAddressRegion` input can contain the following attributes:
+The `customerAddressRegionInput` object can contain the following attributes:
 
 Attribute |  Data Type | Description
 --- | --- | ---
-`region_code` | String | The address region code
 `region` | String | The state or province name
-`region_id` | Int | Uniquely identifies the region
+`region_code` | String | The address region code
+`region_id` | Int | Deprecated. Use `region` instead. Uniquely identifies the region

src/_includes/graphql/customer-address-output.md

@@ -1,4 +1,4 @@
-### CustomerAddress output {#customerAddressOutput}
+### CustomerAddress attributes {#customerAddressOutput}
 
 The values assigned to attributes such as `firstname` and `lastname` in this object may be different from those defined in the `Customer` object.
 
@@ -8,8 +8,9 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `city` | String | The city or town
 `company` | String | The customer's company
-`country_id` | String | The customer's country
-`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeOutput) | Address custom attributes
+`country_code` | CountryCodeEnum | The customer's country
+`country_id` | String | Deprecated. Use `country_code` instead. The customer's country
+`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeOutput) | Deprecated. Not applicable for GraphQL
 `customer_id` | Int | The customer ID
 `default_billing` | Boolean | Indicates whether the address is the default billing address
 `default_shipping` | Boolean | Indicates whether the address is the default shipping address
@@ -22,27 +23,27 @@ Attribute |  Data Type | Description
 `postcode` | String | The customer's ZIP or postal code
 `prefix` | String | An honorific, such as Dr., Mr., or Mrs.
 `region` | [CustomerAddressRegion](#customerAddressRegionOutput) | An object that defines the customer's state or province
-`region_id` | Int | A number that uniquely identifies the state, province, or other area
+`region_id` | Int | Deprecated. Use `region` instead. A number that uniquely identifies the state, province, or other area
 `street` | [String] | An array of strings that define the street number and name
 `suffix` | String | A value such as Sr., Jr., or III
 `telephone` | String | The telephone number
 `vat_id` | String | The customer's Tax/VAT number (for corporate customers)
 
-### CustomerAddressAttribute output {#customerAddressAttributeOutput}
+### CustomerAddressAttribute attributes {#customerAddressAttributeOutput}
 
-The `CustomerAddressAttribute` output returns the following attributes:
+The `CustomerAddressAttribute` output data type has been deprecated because the contents are not applicable for GraphQL. It can contain the following attributes:
 
 Attribute |  Data Type | Description
 --- | --- | ---
 `attribute_code` | String | Attribute code
 `value` | String | Attribute value
 
-### CustomerAddressRegion output {#customerAddressRegionOutput}
+### CustomerAddressRegion attributes {#customerAddressRegionOutput}
 
 The `customerAddressRegion` output returns the following attributes:
 
 Attribute |  Data Type | Description
 --- | --- | ---
-`region_code` | String | The address region code
 `region` | String | The state or province name
-`region_id` | Int | Uniquely identifies the region
+`region_code` | String | The address region code
+`region_id` | Int | Deprecated. Use `region` instead. Uniquely identifies the region

src/_includes/graphql/customer-input.md

@@ -2,13 +2,14 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressInput) | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
+`date_of_birth` | String | The customer's date of birth
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
-`dob` | String | The customer's date of birth
+`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
 `email` | String | The customer's email address
 `firstname` | String | The customer's first name
 `gender` | Int | The customer's gender (Male - 1, Female - 2)
-`group_id` | Int | The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
+`group_id` | Int | Deprecated. This attribute is not applicable for GraphQL. The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
 `id` | Int | The ID assigned to the customer
 `is_subscribed` | Boolean | Indicates whether the customer is subscribed to the company's newsletter
 `lastname` | String | The customer's family name

src/_includes/graphql/customer-output.md

@@ -2,19 +2,21 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressOutput)  | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
+`date_of_birth` | String | The customer's date of birth
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
-`dob` | String | The customer's date of birth
+`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
 `email` | String | The customer's email address
 `firstname` | String | The customer's first name
 `gender` | Int | The customer's gender (Male - 1, Female - 2)
-`group_id` | Int | The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
+`group_id` | Int | Deprecated. This attribute is not applicable for GraphQL. The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
 `id` | Int | The ID assigned to the customer
 `is_subscribed` | Boolean | Indicates whether the customer is subscribed to the company's newsletter
 `lastname` | String | The customer's family name
 `middlename` |String | The customer's middle name
 `prefix` | String | An honorific, such as Dr., Mr., or Mrs.
 `suffix` | String | A value such as Sr., Jr., or III
 `taxvat` | String | The customer's Tax/VAT number (for corporate customers)
+`wishlist` | Wishlist! | Contains the contents of the customer's wish lists
 
 {% include graphql/customer-address-output.md %}

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

@@ -91,6 +91,10 @@ You can also test using the following 3rd party options:
 
 You can use New Relic services for performance monitoring on Pro and Starter environments. On Pro plan accounts, we provide Adobe-generated alert policies to monitor application and infrastructure performance using New Relic APM and Infrastructure agents. For details on using these services, see [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html).
 
+## Performance monitoring
+
+You can use New Relic services for performance monitoring on Pro and Starter environments. On Pro plan accounts, we provide Adobe-generated alert policies to monitor application and infrastructure performance using New Relic APM and Infrastructure agents. For details on using these services, see [New Relic]({{ page.baseurl }}/cloud/project/new-relic.html).
+
 {:.ref-header}
 Next step
 

src/guides/v2.2/frontend-dev-guide/layouts/xml-manage.md

@@ -549,6 +549,41 @@ As result, the `<body>` tag has a new `my-new-body-class` class on all product p
 <referenceBlock name="customer-account-navigation-return-history-link" remove="true"/>
 ```
 
+## Create cms-page/product/category-specific layouts
+
+As of Magento 2.2.11, merchants can select layout updates to be applied to specific Category/Product/CMS Page pages on the frontend. These layout
+updates are made by creating layout XML files following specific naming conventions.
+
+For Categories:
+
+-  `catalog_category_view_selectable_<Category ID>_<Layout Update Name>.xml`
+
+where:
+
+-  _Category ID_ is the desired category ID.
+-  _Layout Update Name_ is shown as the option for the __Custom layout update__ field of the __Design__ section on the _Category Edit_ page.
+
+For Products:
+
+-  `catalog_product_view_selectable_<Product SKU>_<Layout Update Name>.xml`
+
+where:
+
+-  _Product SKU_ is the desired product's SKU encoded as a URI.
+  _example_: "My Product SKU" -> "My%20Product%20SKU"
+-  _Layout Update Name_ is shown as the option for the __Custom layout update__ field of the __Design__ section on the _Product Edit_ page.
+
+For CMS Pages:
+
+-  `cms_page_view_selectable_<CMS Page Identifier>_<Layout Update Name>.xml`
+
+where:
+
+-  _CMS Page Identifier_ is the desired page's _URL Key_ with "/" symbols replaced with "_".
+-  _Layout Update Name_ is shown as the option for the __Custom layout update__ field of the __Design__ section on _CMS Page Edit_ page.
+
+These files must be placed in the appropriate folders for layout XML files. They will be available as __Custom Layout Update__ options for Merchants after flushing the cache.
+
 {:.ref-header}
 Related topics