Merge branch 'master' into db_mftf_yml

Author: dobooth

.github/CONTRIBUTING.md

@@ -15,6 +15,8 @@ If you write and contribute a full topic, we will add your name (or your company
 
 ## Get started
 
+> We no longer accept contributions to files in the `src/guides/v2.2/` directory.
+
 ![Get started workflow](https://devdocs.magento.com/common/images/contribute-prerequisites.png)
 
 1. Make sure you have a [GitHub account](https://github.com/signup/free).
@@ -119,49 +121,6 @@ title: Continue with your installation
 | `group`       | Defines the topic's guide or section. Use the table of contents `.yml` file name. This loads your left-side navigation. We will help during the PR process to add new files to the `.yml` file. |
 | `title`       | Sets the title of the page in the HTML metadata and the main title on the page.  |
 
-## Symbolic links
-
-We use symbolic links for topics that are the same across versions of Magento. A file is symlinked if the entire content of the file is a path to the original version, such as [ext-best-practices/tutorials/serialized-to-json-data-upgrade.md](https://github.com/magento/devdocs/blob/master/guides/v2.3/ext-best-practices/tutorials/serialized-to-json-data-upgrade.md). Note that some editors will automatically follow symlinks so it might not be clear if a file is symlinked or not. Check the file on Github directly to be sure.
-
-### Create a symbolic link
-
-When you create a new topic (create a new `.md` file) and its content is the same for 2.2 and 2.3 versions, create a symbolic link.
-
-For example, if you created a new file for v.2.2: `guides/v2.2/install-gde/new-doc-topic.md` and its content is the same for v.2.3, use the command below to create the symbolic link.
-
-```bash
-cd <DEVDOCS_REPOSITORY_ROOT_DIR>/guides/v2.3/install-gde
-```
-
-```bash
-ln -s ../../v2.2/install-gde/new-doc-topic.md new-doc-topic.md
-```
-
-If you have an image that is identical between versions, it should placed in `/common/images`. Please optimize images before committing them to the repository.
-If done correctly, the symbolic link path will start with 2-4 instances of `../`, as the above example shows. If possible, check a symlinked file within the same folder to ensure the proper pathing.
-
-### Remove a symbolic link
-
-If your changes are unique to a specific version, remove the symbolic link and add a new file. Copy and paste a previous version of the topic to get started.
-
-The removal should use the `git rm` command specifically. Deleting the file through the regular file system might cause issues with the repository.
-
-For example:
-
-```bash
-cd <DEVDOCS_REPOSITORY_ROOT_DIR>
-```
-
-```bash
-git rm guides/v2.3/install-gde/new-doc-topic.md
-```
-
-```bash
-cp guides/v2.2/install-gde/new-doc-topic.md guides/v2.3/install-gde/new-doc-topic.md
-```
-
-Once you have the copy in place, you can edit it with the version-specific information.
-
 ## Report an issue
 
 If you find a typo or errors in Magento DevDocs, you can either fix it with a pull request (as described above) or you can report it by creating an issue in the DevDocs GitHub repository.

src/_data/main-nav.yml

@@ -196,6 +196,10 @@
     - label: Checkout
       url: /howdoi/checkout/checkout_overview.html
 
+    - label: Compliance
+      url: /compliance/industry-compliance.html
+      versionless: true
+
     - label: Inventory Management
       url: /inventory/index.html
       exclude_versions: ['2.0', '2.1', '2.2']

src/_data/toc/compliance.yml

@@ -0,0 +1,26 @@
+label: Compliance
+pages:
+    - label: Industry Compliance
+      url: /compliance/industry-compliance.html
+      versionless: true
+      children:
+
+      - label: Privacy Regulations
+      
+        children:
+
+        - label: CCPA
+          versionless: true
+          url: /compliance/privacy/ccpa.html
+
+        - label: GDPR
+          versionless: true
+          url: /compliance/privacy/gdpr.html
+
+        - label: PI Reference (M2.x)
+          versionless: true
+          url: /compliance/privacy/pi-data-reference-m2.html
+
+        - label: PI Reference (M1.x)
+          versionless: true
+          url: /compliance/privacy/pi-data-reference-m1.html

src/_data/toc/frontend-developer-guide.yml

@@ -178,6 +178,9 @@ pages:
         - label: Example theme translation dictionary
           url: /frontend-dev-guide/translations/translate_practice.html
 
+    - label: Form validation
+      url: /frontend-dev-guide/validations/form-validation.html
+
     - label: Tools
       include_versions: ["2.2", "2.3"]
       url: /frontend-dev-guide/tools/tools_overview.html

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

@@ -22,6 +22,9 @@ pages:
         - label: Checkbox component
           url: /ui_comp_guide/components/ui-checkbox.html
 
+        - label: CheckboxToggleNotice component
+          url: /ui_comp_guide/components/ui-checkbox-toggle-notice.html
+
         - label: Checkboxset component
           url: /ui_comp_guide/components/ui-checkboxset.html
 
@@ -90,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/
@@ -110,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/browsers/supported-browsers.md

@@ -4,8 +4,8 @@ Storefront and Admin:
 *  Firefox latest, latest–1 (any operating system)
 *  Chrome latest, latest–1 (any operating system)
 *  Safari latest, latest–1 (Mac OS only)
-*  Safari Mobile for iPad 2, iPad Mini, iPad with Retina Display (iOS 7 or later), for desktop storefront
-*  Safari Mobile for iPhone 4 or later; iOS 7 or later, for mobile storefront
+*  Safari Mobile for iPad 2, iPad Mini, iPad with Retina Display (iOS 12 or later), for desktop storefront
+*  Safari Mobile for iPhone 6 or later; iOS 12 or later, for mobile storefront
 *  Chrome for mobile latest–1 (Android 4 or later) for mobile storefront
 
 Here, _latest–1_ means one major version earlier than the latest released version.

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