Merge branch 'master' into imgbot

magento · Jul 9, 2019 · e3c67de · e3c67de
2 parents 07cfcd4 + 3fbeb2a
commit e3c67de
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 20 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: 450a470aa4b937400190d009131fa91cf27d7a9d
+  revision: 5ce6bf94dbf827682b1f83d5e3c4fbc4c4f69478
   specs:
-    devdocs (0.0.1)
+    devdocs (2)
       jekyll (>= 3.3)
 
 GEM
@@ -33,10 +33,10 @@ GEM
     exifr (1.3.6)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
-    fspath (3.1.0)
+    fspath (3.1.1)
     html-proofer (3.9.3)
       activesupport (>= 4.2, < 6.0)
       addressable (~> 2.3)
@@ -50,18 +50,18 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    image_optim (0.26.3)
+    image_optim (0.26.4)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.5.2.20190428)
+    image_optim_pack (0.5.3)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
     image_size (2.0.1)
-    in_threads (1.5.1)
-    jekyll (3.8.5)
+    in_threads (1.5.2)
+    jekyll (3.8.6)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -118,16 +118,16 @@ GEM
     parallel (1.17.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    progress (3.5.0)
-    progressbar (1.10.0)
-    public_suffix (3.0.3)
+    progress (3.5.1)
+    progressbar (1.10.1)
+    public_suffix (3.1.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rouge (3.3.0)
+    rouge (3.5.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -147,7 +147,7 @@ GEM
       netrc (~> 0.10)
       octokit (~> 4.14)
       thor (~> 0.20)
-    yell (2.1.0)
+    yell (2.2.0)
 
 PLATFORMS
   ruby

diff --git a/_data/compatibility.yml b/_data/compatibility.yml
@@ -17,6 +17,13 @@ extension:
   -
     name: Google Shopping ads Channel
     versions:
+      -
+        name: 2.0.2
+        support:
+          2.2.4+: general availability
+          2.3.0: general availability
+          2.3.1: general availability
+          2.3.2: general availability
       -
         name: 2.0.1
         support:

diff --git a/_data/whats-new.yml b/_data/whats-new.yml
@@ -4,8 +4,45 @@ description: |
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: /whats-new.html
 thread: /whatsnew-feed.xml
-updated: Thu Jun 27 16:05:11 2019
+updated: Mon Jul 8 13:39:43 2019
 entries:
+- description: Added the 'Product view page available containers' section to [Product
+    Layouts](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/product-layouts.html).
+  versions: 2.1.x, 2.2.x, 2.3.x
+  type: Major update
+  date: July 8, 2019
+  link: https://github.com/magento/devdocs/pull/4630
+- description: Clarified that the [Functional testing in Docker](https://devdocs.magento.com/guides/v2.3/cloud/docker/docker-development-testing.html)
+    is for ece-tools and not for the Magento application.
+  versions: 2.x
+  type: Technical changes
+  date: June 29, 2019
+  link: https://github.com/magento/devdocs/pull/4874
+- description: Updated the route configuration instructions for Magento Commerce Pro
+    and Starter projects using the `routes.yaml` file.<br/>- Documented the `{all}`
+    route template option for the `routes.yaml` which simplifies route configuration
+    for projects with multiple domains. See [Configure routes](https://devdocs.magento.com/guides/v2.3/cloud/project/project-conf-files_routes.html).<br/>-
+    Updated the route configuration documentation to indicate that customers can update
+    route configuration using the `routes.yaml` file on Pro Integration, Staging,
+    and Production environments. Previously, customers had to submit a support ticket
+    to update route configuration on Pro Staging and Production environments.
+  versions: 2.1.x, 2.2.x
+  type: Major update
+  date: June 28, 2019
+  link: https://github.com/magento/devdocs/pull/4795
+- description: Release Notes for the Google Shopping ads Channel extension have been
+    updated to include version 2.0.0. The Upcoming Releases page has also been updated.
+  versions: 2.0 Google Shopping ads
+  type: Major update
+  date: June 28, 2019
+  link: https://github.com/magento/devdocs/pull/4850
+- description: Added a [new way to upgrade the Magento CLI ](https://devdocs.magento.com/guides/v2.3/comp-mgr/cli/upgrade-with-plugin.html)(yet
+    experimental) using the Magento composer root plugin to resolve conflicts in dependencies
+    during the upgrade.
+  versions: 2.3.x
+  type: New topic
+  date: June 28, 2019
+  link: https://github.com/magento/devdocs/pull/4679
 - description: Updated the [Module Reference Guide](https://devdocs.magento.com/guides/v2.3/mrg/intro.html).
   versions: 2.3.2
   type: Major update

diff --git a/extensions/google-shopping-ads/release-notes/index.md b/extensions/google-shopping-ads/release-notes/index.md
@@ -17,6 +17,11 @@ The release notes include:
 -   {:.fix}Fixes and improvements
 -   {:.bug}Known issues
 
+### v2.0.2
+
+Google Shopping ads Channel 2.0.2 is generally available for versions 2.2.4+ and 2.3.x of {{site.data.var.ce}}, {{site.data.var.ee}}, and {{site.data.var.ece}}.
+
+- {:.fix} **Resolved Startup Issue**: Corrected an issue that prevented Google Shopping ads Channel from starting up correctly after installing v2.0.1.
 
 ### v2.0.1
 

diff --git a/guides/v2.2/ui_comp_guide/concepts/ui_comp_linking_concept.md b/guides/v2.2/ui_comp_guide/concepts/ui_comp_linking_concept.md
@@ -33,9 +33,23 @@ Example of setting `exports` in a component's `.js` file:
   }
 }
 ```
-
 Here `visible` is the `key`, `${ $.provider }:visibility` is the `value`. The value of the local `visible` property is assigned to the `visibility` property of the `provider` component. The latter is changed automatically if the value of `visible` changes if the local `visible` property is observable (which it isn't given only the code example above).
 
+Example of setting `exports` directly using the destination component name:
+
+```json
+{
+  "exports": {
+   "items": "checkout.sidebar.summary.cart_items:items"
+  }
+}
+```
+
+The syntax for the destination component name is determined by the hierarchy in the XML handle. Separate parent names with a `.` (dot) followed by the component name.
+
+{:.bs-callout .bs-callout-info}
+To retrieve the full name of the destination component name, open your browser in developer mode, select the element that you want on the **Elements** tab, go to the **Console** tab, and execute the following code: `require('ko').contextFor($0).$data.name`.
+
 Example of setting `exports` in a component's configuration `.xml` file:
 
 ```xml

diff --git a/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md b/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md
@@ -3,7 +3,7 @@ group: release-notes
 title: Magento Commerce 2.3.2 Release Notes
 ---
 
-*Patch code and release notes published on June 25, 2019. Release notes last updated on June 26, 2019.*
+*Patch code and release notes published on June 25, 2019. Release notes last updated on July 8, 2019.*
 
 We are pleased to present Magento Commerce 2.3.2.  This release includes over 200 functional fixes to the core product, over 350 pull requests contributed by the community, and  over 75 security enhancements. It includes  contributions from our community members. These contributions range from minor clean-up of core code to significant enhancements to Inventory Management and GraphQL.
 
@@ -741,6 +741,8 @@ has been changed to `<argument name="resourceStockItem" xsi:type="object">Magent
 
 ### Infrastructure
 
+* The default behavior of view models has changed in this release. Instances of view models are now shared by default. As a result, you must add the `attribute shared="false"` on the argument node of the `layout.xml` file if you want a new instance of a view model.
+
 <!--- ENGCOM-4474-->
 * The `FrontController` now explicitly requires actions to specify if they respond to `HEAD` requests. `HEAD` action mapping has also been changed to the  `GET` action interface, which results in `HEAD` requests returning `200` instead of `404`. *Fix submitted by [Matti Vapa](https://github.com/mattijv) in pull request [21378](https://github.com/magento/magento2/pull/21378)*. [GitHub-21299](https://github.com/magento/magento2/issues/21299)
 

diff --git a/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md b/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md
@@ -3,7 +3,7 @@ group: release-notes
 title: Magento Open Source 2.3.2 Release Notes
 ---
 
-*Patch code and release notes published on June 25, 2019. Release notes last updated on June 26, 2019.*
+*Patch code and release notes published on June 25, 2019. Release notes last updated July 8, 2019.*
 
 We are pleased to present Magento Open Source 2.3.2.  This release includes over 200 functional fixes to the core product, over 350 pull requests contributed by the community, and  over 75 security enhancements. It includes significant contributions from our community members. 
 
@@ -649,6 +649,8 @@ has been changed to `<argument name="resourceStockItem" xsi:type="object">Magent
 
 ### Infrastructure
 
+* The default behavior of view models has changed in this release. Instances of view models are now shared by default. As a result, you must add the `attribute shared="false"` on the argument node of the `layout.xml` file if you want a new instance of a view model.
+
 <!--- ENGCOM-4474-->
 * The `FrontController` now explicitly requires actions to specify if they respond to `HEAD` requests. `HEAD` action mapping has also been changed to the  `GET` action interface, which results in `HEAD` requests returning `200` instead of `404`. *Fix submitted by [Matti Vapa](https://github.com/mattijv) in pull request [21378](https://github.com/magento/magento2/pull/21378)*. [GitHub-21299](https://github.com/magento/magento2/issues/21299)
 
@@ -1013,7 +1015,7 @@ label, types and disabled, but the actual `file-content` was not replaced with t
 * You can now insert widgets that contain a WYSIWYG field into a form. Previously, widgets with a `WYSIWYG` parameter failed when inserting them into a WYSIWYG in a form. *Fix submitted by [James Dinsdale](https://github.com/molovo) in pull request [20174](https://github.com/magento/magento2/pull/20174)*. [GitHub-19742](https://github.com/magento/magento2/issues/19742)
 
 
-# Known issues
+## Known issues
 
 * **Issue**: The Async/Bulk Web APIs support only the default store view. A hot fix for this issue will be available in the near future. This issue has been resolved with the Scope parameter for Async/Bulk API patch, which is now available. See [Patch for Magento Framework Message Queue and Store Scopes](https://community.magento.com/t5/Magento-DevBlog/Patch-for-Magento-Framework-Message-Queue-and-Store-Scopes/ba-p/135209) for a full discussion of this scope-related issue and patch contents.
 

diff --git a/release/index.md b/release/index.md
@@ -17,7 +17,7 @@ The following table describes the status of Magento software availability and wh
 | **Magento Shipping**                            | Available now                                                                                                                                        | Merchants on Magento 2.2.2+ can use the [onboarding process](https://account.magento.com/shipping/onboarding/start)          |
 | **Page Builder**                                | Available now                                                                                                                                        | Bundled with {{site.data.var.ee}} 2.3.x                                                                                      |
 | **Amazon Sales Channel 2.0.0**                        | Available now for {{site.data.var.ece}} 2.2.4+ and 2.3.x (US, Canada, Mexico)<br><br>EMEA and APAC availability expected in second half of 2019 | [Magento Marketplace](https://marketplace.magento.com/magento-module-amazon.html)                                                                                                         |
-| **Google Shopping ads Channel 2.0.1**           | Available now for {{site.data.var.ece}} 2.2.4+ and 2.3.x                                                                                             | [Magento Marketplace](http://marketplace.magento.com/magento-google-shopping-ads.html)                                       |
+| **Google Shopping ads Channel 2.0.2**           | Available now for {{site.data.var.ece}} 2.2.4+ and 2.3.x                                                                                             | [Magento Marketplace](http://marketplace.magento.com/magento-google-shopping-ads.html)                                       |
 
 ## Compatibility