Merge branch 'master' into 2.4.2-develop

src/_data/whats-new.yml

@@ -2450,7 +2450,7 @@ entries:
   date: October 8, 2019
   link: https://github.com/magento/devdocs/pull/5586
 - description: Updated the REST schema for [2.3.3](https://devdocs.magento.com/redoc/2.3/)
-    and [2.2.10](https://devdocs.magento.com/swagger/index_22.html).
+    and [2.2.10](https://devdocs.magento.com/swagger/index.html).
   versions: 2.2.10, 2.3.3
   type: Major update
   date: October 8, 2019
@@ -3170,7 +3170,7 @@ entries:
   date: June 22, 2019
   link: https://github.com/magento/devdocs/pull/4824
 - description: Updated the REST schema for [2.3.2](https://devdocs.magento.com/redoc/2.3/)
-    and [2.2.9](https://devdocs.magento.com/swagger/index_22.html).
+    and [2.2.9](https://devdocs.magento.com/swagger/index.html).
   versions: 2.2.9, 2.3.2
   type: Major update
   date: June 22, 2019

src/_includes/install/sampledata/sample-data-rc1-cli-24.md

@@ -0,0 +1,86 @@
+## Command-line upgrade to Magento {{ page.guide_version }} with sample data
+
+These instructions apply to {{site.data.var.ce}} and {{site.data.var.ee}} users *only* if all of the following are true:
+
+*  You have installed optional sample data
+*  You are upgrading to Magento {{ page.guide_version }} (including a Release Candidate) from any earlier version using the command line
+
+To upgrade to Magento {{ page.guide_version }} sample data using the command line:
+
+1. Log in to your Magento server as, or switch to, the [Magento file system owner].
+1. Change to the Magento installation directory.
+1. Back up your current `composer.json` file:
+
+   ```bash
+   cp composer.json composer.json.bak
+   ```
+
+1. Upgrade the Magento software version using commands of the following format:
+
+   ```bash
+   composer require <product> <version> --no-update
+   ```
+
+   ```bash
+   composer require <sample data module-1>:<version> ... <sample data module-n>:<version> --no-update
+   ```
+
+   *  Example for {{site.data.var.ce}}:
+
+      ```bash
+      composer require magento/product-community-edition {{ page.guide_version }}.0 --no-update
+      ```
+
+      ```bash
+      composer require magento/module-bundle-sample-data:100.4.* magento/module-widget-sample-data:100.4.* magento/module-theme-sample-data:100.4.* magento/module-catalog-sample-data:100.4.* magento/module-customer-sample-data:100.4.* magento/module-cms-sample-data:100.4.*  magento/module-catalog-rule-sample-data:100.4.* magento/module-sales-rule-sample-data:100.4.* magento/module-review-sample-data:100.4.* magento/module-tax-sample-data:100.4.* magento/module-sales-sample-data:100.4.* magento/module-grouped-product-sample-data:100.4.* magento/module-downloadable-sample-data:100.4.* magento/module-msrp-sample-data:100.4.* magento/module-configurable-sample-data:100.4.* magento/module-product-links-sample-data:100.4.* magento/module-wishlist-sample-data:100.4.* magento/module-swatches-sample-data:100.4.* magento/sample-data-media:100.4.* magento/module-offline-shipping-sample-data:100.4.* --no-update
+      ```
+
+   *  Example for {{site.data.var.ee}}:
+
+      ```bash
+      composer require magento/product-enterprise-edition {{ page.guide_version }}.0 --no-update
+      ```
+
+      ```bash
+      composer require magento/module-bundle-sample-data:100.4.* magento/module-widget-sample-data:100.4.* magento/module-theme-sample-data:100.4.* magento/module-catalog-sample-data:100.4.* magento/module-customer-sample-data:100.4.* magento/module-cms-sample-data:100.4.*  magento/module-catalog-rule-sample-data:100.4.* magento/module-sales-rule-sample-data:100.4.* magento/module-review-sample-data:100.4.* magento/module-tax-sample-data:100.4.* magento/module-sales-sample-data:100.4.* magento/module-grouped-product-sample-data:100.4.* magento/module-downloadable-sample-data:100.4.* magento/module-msrp-sample-data:100.4.* magento/module-configurable-sample-data:100.4.* magento/module-product-links-sample-data:100.4.* magento/module-wishlist-sample-data:100.4.* magento/module-swatches-sample-data:100.4.* magento/sample-data-media:100.4.* magento/module-offline-shipping-sample-data:100.4.* magento/module-gift-card-sample-data:100.4.* magento/module-customer-balance-sample-data:100.4.* magento/module-target-rule-sample-data:100.4.* magento/module-gift-registry-sample-data:100.4.* magento/module-multiple-wishlist-sample-data:100.4.* --no-update
+      ```
+
+   {% include note.html
+      type="info"
+    content="To upgrade to a Release Candidate, append `-rc<x>` to the version of each module. For example, `-rc3`."
+  %}
+
+1. Update dependencies:
+
+   ```bash
+   composer update
+   ```
+
+1. If prompted, enter your [authentication keys].
+1. Wait for dependencies to update.
+
+### Finish your upgrade
+
+After you have reset file system permissions:
+
+1. If you have not done so already, log in to your Magento server as, or switch to, the Magento file system owner.
+1. Change to your Magento installation directory.
+1. Manually clear the `var/cache`, `var/page_cache`, and `var/generation` directories.
+
+   A sample command follows:
+
+   ```bash
+   rm -rf var/cache/* var/page_cache/* var/generation/*
+   ```
+
+1. Upgrade Magento:
+
+   ```bash
+   bin/magento setup:upgrade
+   ```
+
+{% include install/sampledata/file-sys-perms-digest.md %}
+
+<!-- Link definitions -->
+[Magento file system owner]: {{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html
+[authentication keys]: {{ page.baseurl }}/install-gde/prereq/connect-auth.html

src/cloud/reference/discover-deploy.md

@@ -31,10 +31,10 @@ A set of YAML configuration files located in the project root directory define y
 
 For all Starter environments and Pro Integration environments, pushing your Git branch updates all settings and configurations dependent on these files.
 
--  [`.magento.app.yaml`]({{ site.baseurl }}/cloud/project/magento-app.html)—defines how to build and deploy Magento, including services, hooks, cron jobs, and more.
+-  [`.magento.app.yaml`]({{ site.baseurl }}/cloud/project/magento-app.html)—defines how to build and deploy Magento, including user access, service mapping (relationships), hooks, cron jobs, and more.
 -  [`.magento.env.yaml`]({{ site.baseurl }}/cloud/project/magento-env-yaml.html)—centralizes the management of build and deploy actions across all of your environments, including Pro Staging and Production, using environment variables.
 -  [`.magento/routes.yaml`]({{ site.baseurl }}/cloud/project/routes.html)—defines how Magento processes an incoming URL.
--  [`.magento/services.yaml`]({{ site.baseurl }}/cloud/project/services.html)—defines the services Magento uses by name and version. For example, this file may include versions of MySQL, PHP extensions, and Elasticsearch. These are referred to as *services*.
+-  [`.magento/services.yaml`]({{ site.baseurl }}/cloud/project/services.html)—defines the services Magento uses by name and version. For example, this file can include versions of MySQL, PHP extensions, and Elasticsearch. These are referred to as *services*.
 -  [`app/etc/config.php`]({{ site.baseurl }}/cloud/live/sens-data-over.html)—defines the [system-specific settings]({{ site.baseurl }}/cloud/live/sens-data-over.html#configuration-data) Magento uses to configure your store. Magento generates this file if it does not detect it during the build phase. See [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html) for information on how to use this file to manage and synchronize the Magento application configuration across your Cloud environments.
 
 ## Required files for your Git branch {#requiredfiles}

src/guides/v2.3/extension-dev-guide/extension_attributes/adding-attributes.md

@@ -181,7 +181,9 @@ Now we need to bind our plugin to `ProductInterface`:
 
 ## Extension Attributes Configuration:
 
-For scalar attributes we can use next configuration:
+The file that holds these extension attributes must reside under the `/etc` folder of your module.
+
+For scalar attributes, we can use the following configuration:
 
 ```xml
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
@@ -192,6 +194,8 @@ For scalar attributes we can use next configuration:
 </config>
 ```
 
+Here, the scalar attributes indicate the simple form of attribute representation, such as an integer or a string. Specify the class or interface of the extension attributes inside the "for" attribute of the `<extension_attributes>` tag. In this case, it is the ProductInterface. The attribute is specified with a unique code and its type.
+
 For non-scalar attributes:
 
 ```xml
@@ -202,6 +206,8 @@ For non-scalar attributes:
 </config>
 ```
 
+Here, the non-scalar attributes indicate data objects such as the instance of a class. In the above example, the CustomDataInterface object is added as an extension attribute.
+
 For array extension attributes:
 
 ```xml
@@ -212,6 +218,8 @@ For array extension attributes:
 </config>
 ```
 
+The array extension attributes are just an extension of the scalar attributes where a range of values can be represented as an attribute. The `[]` symbol indicates the attribute type is an array.
+
 The array indicator `[]` can also be appended to non-scalar types.
 
 In first - scalar - case we will get the next result:

src/guides/v2.3/extension-dev-guide/indexing.md

@@ -99,6 +99,10 @@ The Magento indexing mechanism uses the status value in reindex triggering proce
 Reindexing can be performed in two modes:
 
 *  Update on Save - index tables are updated immediately after the dictionary data is changed.
+
+{:.bs-callout-info}
+**Update on Save** indexers must use custom code (plugins, events or any other working approach) in order to trigger reindexing when entities are saved/deleted etc.
+
 *  Update by Schedule - index tables are updated by cron job according to the configured schedule.
 
  {:.bs-callout-info}

src/guides/v2.3/extension-dev-guide/searching-with-repositories.md

@@ -507,3 +507,6 @@ The `di.xml` configuration file excerpt below shows how you can create a virtual
       </arguments>
   </type>
 ```
+
+{:.bs-callout-info}
+When building an EAV Model that needs to implement the `Repository::getList` method, use the EAV Filter Processor; otherwise the custom filters will not be added to the collection.

src/guides/v2.3/frontend-dev-guide/css-guide/css_quick_guide_approach.md

@@ -26,6 +26,31 @@ To extend the parent theme's styles in your theme:
 
 1. Add your Less code in this file.
 
+However, the above only works if the theme's parent is a Blank. Consider a Theme A which is the child of Blank. Theme A has two children, B and C. A global style rule is added to the `_extend.less` file of theme A. This extends its parent Blank. Theme B and C also have their own `_extend.less` files. Theme B and C will override the parent (Theme A), rather than extending it further. Theme B & Theme C are extending their grandparent (Blank) and overriding their parent (Theme A) in this setup.
+
+In case of subsequent descendants of the child theme, you can avoid this behavior by following these steps:
+
+1. Create a `_extend-child.less` in both your parent and child themes.
+1. Keep `_extend-child.less` empty in your parent theme and add it too your parent theme's `_extend.less` file.
+1. Add a `@import '_extend-child.less'` rule to the end of your parent's theme's `_extend.less` file.
+1. In your child theme, add `@import` or style rules in `_extend-child.less` to extend parent theme's CSS.
+
+   ```tree
+   app/design/frontend/Vendor/
+   ├── parent
+   │   └── web
+   │       └── css
+   │           └── source
+   │               ├── _extend-child.less (keep this file empty)
+   │               └── _extend.less
+   └── child
+       └── web
+           └── css
+               └── source
+                   └── _extend-child.less
+   ...
+   ```
+
 Extending a theme using `_extend.less` is the simplest option when you are happy with everything the parent theme has, but want to add more styles.
 
 {:.bs-callout-info}

src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md

@@ -64,7 +64,7 @@ To ensure the stability of your customizations and prevent upgrades from overwri
 
    Fallback web fonts that are used by default in Magento are located in `lib/web/css/source/lib/variables/_typography.less`.
 
-   For more information about font-face, refer to this article [Font-face][https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face]{:target="_blank"}.
+   For more information about font-face, refer to this article [Font-face](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face){:target="_blank"}.
 
 ## `<font>` head type
 

src/guides/v2.3/graphql/index.md

@@ -10,22 +10,22 @@ landing-page: GraphQL Developer's Guide
 
 As of Magento 2.3.4, GraphQL provides the following features:
 
-*  Support for all product types, payment methods, and shipping methods
-*  Achieved <.5 sec average response times with 500 concurrent requests
-*  Redesigned a feature rich layered navigation
+-  Support for all product types, payment methods, and shipping methods
+-  Achieved <.5 sec average response times with 500 concurrent requests
+-  Redesigned a feature rich layered navigation
 
 ## Where we're going
 
 The `graphql-ce` Community Engineering repository has been archived. Development for Magento 2.3.5 will be limited to bug fixes.
 
 For the 2.4.0 and 2.4.1 releases, Magento teams are working toward completing GraphQL coverage for Business to Consumer (B2C) uses cases, with emphasis on the following:
 
-*  Reorders
-*  Inventory Management store pickups
-*  Order history for logged in customers
-*  Replace product-specific mutations that add products to a cart with a single mutation that can handle all product types
-*  Gift wrapping and messages
-*  Saved payment methods
+-  Reorders
+-  Inventory Management store pickups
+-  Order history for logged in customers
+-  Replace product-specific mutations that add products to a cart with a single mutation that can handle all product types
+-  Gift wrapping and messages
+-  Saved payment methods
 
 We also expect to begin adding coverage for B2B scenarios.
 

src/guides/v2.3/graphql/queries/cms-page.md

@@ -15,13 +15,14 @@ Return the contents of a CMS page:
 
 ## Example usage
 
-The following query returns information about the "404 Not Found" CMS page:
+You must include the CMS page identifier value to retrieve the content of a specific CMS page. The following query returns information about the "404 Not Found" CMS page:
 
 **Request:**
 
 ```graphql
 {
   cmsPage(identifier: "no-route") {
+    identifier
     url_key
     title
     content
@@ -40,6 +41,7 @@ The following query returns information about the "404 Not Found" CMS page:
 {
   "data": {
     "cmsPage": {
+      "identifier": "no-route"
       "url_key": "no-route",
       "title": "404 Not Found",
       "content": "<dl>\r\n<dt>The page you requested was not found, and we have a fine guess why.</dt>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li>If you typed the URL directly, please make sure the spelling is correct.</li>\r\n<li>If you clicked on a link to get here, the link is outdated.</li>\r\n</ul></dd>\r\n</dl>\r\n<dl>\r\n<dt>What can you do?</dt>\r\n<dd>Have no fear, help is near! There are many ways you can get back on track with Magento Store.</dd>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li><a href=\"#\" onclick=\"history.go(-1); return false;\">Go back</a> to the previous page.</li>\r\n<li>Use the search bar at the top of the page to search for your products.</li>\r\n<li>Follow these links to get you back on track!<br /><a href=\"http://magento2.vagrant193/\">Store Home</a> <span class=\"separator\">|</span> <a href=\"http://magento2.vagrant193/customer/account/\">My Account</a></li></ul></dd></dl>\r\n",

src/guides/v2.3/graphql/tutorials/checkout/checkout-add-product-to-cart.md

@@ -31,9 +31,11 @@ If you add a product to the shopping cart as a registered customer, be sure to s
 
 ## Add a simple product into the shopping cart
 
-`{ CART_ID }` is the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html).
+The following mutation adds a simple product into the shopping cart.
 
-The following mutation adds a **simple product** into shopping cart.
+Replace `{ CART_ID }` with the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html).
+
+In this example, we will add the Aim Analog Watch (SKU 24-MG04) from the default Luma catalog to the cart. The SKU identifies the product to be added.
 
 **Request:**
 
@@ -46,7 +48,7 @@ mutation {
         {
           data: {
             quantity: 1
-            sku: "simple-product"
+            sku: "24-MG04"
           }
         }
       ]
@@ -75,9 +77,9 @@ mutation {
       "cart": {
         "items": [
           {
-            "id": "508",
+            "id": "5",
             "product": {
-              "sku": "simple-product",
+              "sku": "24-MG04",
               "stock_status": "IN_STOCK"
             },
             "quantity": 1
@@ -91,7 +93,8 @@ mutation {
 
 ## Add a virtual product into the shopping cart
 
-The following mutation adds a **virtual product** into shopping cart.
+The following mutation adds a virtual product into the shopping cart.
+In this example, we add the Beginner's Yoga video downloadable product (SKU 240-LV04).
 
 **Request:**
 
@@ -104,7 +107,7 @@ mutation {
         {
           data: {
             quantity: 1
-            sku: "virtual-product"
+            sku: "240-LV04"
           }
         }
       ]
@@ -133,9 +136,17 @@ mutation {
       "cart": {
         "items": [
           {
-            "id": "509",
+            "id": "5",
             "product": {
-              "sku": "virtual-product",
+              "sku": "24-MG04",
+              "stock_status": "IN_STOCK"
+            },
+            "quantity": 1
+          },
+          {
+            "id": "6",
+            "product": {
+              "sku": "240-LV04",
               "stock_status": "IN_STOCK"
             },
             "quantity": 1
@@ -147,6 +158,8 @@ mutation {
 }
 ```
 
+The response lists all items currently in the cart, including the just-added video download.
+
 ## Verify this step {#verify-step}
 
 1. Sign in as a customer to the website using the email `john.doe@example.com` and password `b1b2b3l@w+`.