Merge branch 'master' into issue-6912

magento · Mar 31, 2020 · 7648256 · 7648256
2 parents f29f9ca + f0c8169
commit 7648256
Show file tree

Hide file tree

Showing 47 changed files with 2,265 additions and 2,082 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -118,7 +118,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
-    octokit (4.16.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.19.1)
@@ -132,7 +132,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.16.0)
+    rouge (3.17.0)
     safe_yaml (1.0.5)
     sassc (2.2.1)
       ffi (~> 1.9)
@@ -142,10 +142,10 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
-    tomlrb (1.2.9)
+    tomlrb (1.3.0)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     verbal_expressions (0.1.5)
     wdm (0.1.1)
     whatsup_github (0.0.1)

diff --git a/src/_data/toc/ui-components-guide.yml b/src/_data/toc/ui-components-guide.yml
@@ -196,6 +196,9 @@ pages:
         - label: ThumbnailColumn component
           url: /ui_comp_guide/components/ui-thumbnailcolumn.html
 
+        - label: TimelineColumns component
+          url: /ui_comp_guide/components/ui-timeline-columns.html
+
         - label: ListingToolbar component
           url: /ui_comp_guide/components/ui-toolbar.html
 

diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml
@@ -4,7 +4,51 @@ description: |
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: /whats-new.html
 thread: /whatsnew-feed.xml
-updated: Mon Mar 23 12:42:59 2020
+updated: Mon Mar 30 08:59:14 2020
+entries:
+- description: Added a section for the Tooltip Element to the [Magento UI library](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.html)
+    topic.
+  versions: 2.3.x
+  type: Major Update
+  date: March 30, 2020
+  link: https://github.com/magento/devdocs/pull/6947
+- description: "Added an 'ignoreTmpls property' section to the [Template Literals
+    in UI Components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.html)
+    topic."
+  versions: 2.3.x
+  type: Major Update
+  date: March 25, 2020
+  link: https://github.com/magento/devdocs/pull/6873
+- description: Available now! Amazon Sales Channel 4.0 introduces a new [Amazon Sales
+    Channel](https://docs.magento.com/m2/ce/user_guide/sales-channels/asc/amazon-sales-channel-home.html)
+    home page, a new [store dashboard](https://docs.magento.com/m2/ce/user_guide/sales-channels/asc/amazon-store-dashboard.html),
+    a streamlined [onboarding process](https://docs.magento.com/m2/ce/user_guide/sales-channels/asc/amazon-onboarding-home.html),
+    and new [default store settings](https://docs.magento.com/m2/ee/user_guide/sales-channels/asc/default-store-settings.html).
+  versions: 2.3.x
+  type: Major Update
+  date: March 24, 2020
+  link: https://github.com/magento/devdocs/pull/6915
+- description: Magento has released a hot fix on March 24, 2020 for Magento 2.3.x.<br/>
+    [Magento Open Source 2.3.4 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-4-open-source.html)<br/>
+    [Magento Commerce 2.3.4 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-4-commerce.html)<br/>
+    [Magento Open Source 2.3.3 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-3-open-source.html)<br/>
+    [Magento Commerce 2.3.3 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-3-commerce.html)<br/>
+    [Magento Open Source 2.3.2 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.2OpenSource.html)<br/>
+    [Magento Commerce 2.3.2 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.2Commerce.html)<br/>
+    [Magento Open Source 2.3.1 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.1OpenSource.html)<br/>
+    [Magento Commerce 2.3.1 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.1Commerce.html)<br/>
+    [Magento Open Source 2.3.0 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.0OpenSource.html)<br/>
+    [Magento Commerce 2.3.0 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.0Commerce.html)
+  versions: 2.3.x
+  type: Major Update
+  date: March 24, 2020
+  link: https://github.com/magento/devdocs/pull/6913
+- description: Added a 'Declaring the new custom no-route processor' section to the
+    [Routing](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/routing.html) topic.
+  versions: 2.3.x
+  type: Major Update
+  date: March 23, 2020
+  link: https://github.com/magento/devdocs/pull/6868
 entries:
 - description: Added a 'Declaring the new custom no-route processor' section to the
     [Routing](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/routing.html) topic.
@@ -18,7 +62,7 @@ entries:
   type: New topic
   date: March 23, 2020
   link: https://github.com/magento/devdocs/pull/6876
-- description: Added a new topic for the [`Container ui-component`](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-form.html).
+- description: Added a topic for the [`Container ui-component`](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-container.html).
   versions: 2.3.x
   type: New topic
   date: March 19, 2020
@@ -34,7 +78,7 @@ entries:
   type: Major update
   date: March 16, 2020
   link: https://github.com/magento/devdocs/pull/6863
-- description: Added topic for [ColumnsResize UI](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-resize.html).
+- description: Added topic for the [ColumnsResize UI Compnent](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-resize.html).
   versions: 2.3.x
   type: New topic
   date: March 12, 2020
@@ -5211,4 +5255,4 @@ entries:
 - description: 'How to programmatically create a category with custom attributes'
   versions: 2.x
   type: New
-  date: Oct 7 2016
+  date: Oct 7 2016
diff --git a/src/_includes/cloud/cli-get-started.md b/src/_includes/cloud/cli-get-started.md
@@ -1,56 +1,56 @@
+{:.procedure}
+To get started with environment branches:
 
-1. Log in to your local development system, or switch to, the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
-1. Change to a directory to which the Magento file system owner has write access.
-1. Enter the following command in a terminal to log in to your project:
+1. On your local workstation, change to your Cloud project directory.
 
-   ```bash
-   magento-cloud login
-   ```
+1. Switch to the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
 
-1. List your projects. With the project ID, you can complete additional commands.
+1. Log in to your Magento project.
 
    ```bash
-   magento-cloud project:list
+   magento-cloud login
    ```
 
-1. If necessary, clone the project to your local. You should have cloned when setting up your local development workspace.
+1. List your projects.
 
    ```bash
-   magento-cloud project:get <project ID>
+   magento-cloud project:list
    ```
 
-1. Change to a project directory. For example, `cd /var/www/html/magento2`
-1. List environments in the project. Every environment includes an active Git branch of your code, database, environment variables, configurations, and services.
+1. List environments in the project. Every environment includes an active Git branch that contains your code, database, environment variables, configurations, and services.
 
    ```bash
    magento-cloud environment:list
    ```
 
    {:.bs-callout-info}
-   `magento-cloud environment:list`—displays environment hierarchies whereas the `git branch` command does not.
+   It is important to use the `magento-cloud environment:list` command because it displays environment hierarchies, whereas the `git branch` command does not.
 
-1. Fetch origin branches to get the latest code:
+1. Fetch origin branches to get the latest code.
 
    ```bash
    git fetch origin
    ```
 
-1. Check out, or switch to, a specific branch and environment. Git commands only checkout the Git branch. The Magento Cloud command also switches to the active environment.
+1. Checkout, or switch to, a specific branch and environment.
 
    ```bash
-   magento-cloud environment:checkout <environment ID>
+   magento-cloud environment:checkout <environment-ID>
    ```
 
-   To create a new environment, use `magento-cloud environment:branch <environment name> <parent environment ID>`
+   Git commands only checkout the Git branch. The `magento-cloud checkout` command checks out the branch and switches to the active environment.
+
+   {:.bs-callout-tip}
+   You can create a new environment branch using the `magento-cloud environment:branch <environment-name> <parent-environment-ID>` command syntax. It may take some additional time to create and activate a new environment branch.
 
-1. Pull any updated code to your local for the environment ID (which is the Git branch):
+1. Use the environment ID to pull any updated code to your local. This is not necessary if the environment branch is new.
 
    ```bash
-   git pull origin <environment ID>
+   git pull origin <environment-ID>
    ```
 
-1. Create a [snapshot]({{ site.baseurl }}/cloud/project/project-webint-snap.html) of the environment as a backup:
+1. (_Optional_) Create a [snapshot]({{ site.baseurl }}/cloud/project/project-webint-snap.html) of the environment as a backup.
 
    ```bash
-   magento-cloud snapshot:create -e <environment ID>
+   magento-cloud snapshot:create -e <environment-ID>
    ```
diff --git a/src/_includes/cloud/composer-name.md b/src/_includes/cloud/composer-name.md
@@ -1,30 +1,36 @@
-This section discusses how to get a module's Composer name and its version from Magento Marketplace. Alternatively, you can find the name and version of *any* module (whether or not you purchased it on Marketplace) in the module's `composer.json` file. Open `composer.json` in a text editor and write down the values of `"name"` and `"version"`.
+## Composer name of an extension
+
+Although this section discusses how to get the Composer name and version of an extension or module from Magento Marketplace, you can find the name and version of *any* module (whether or not you purchased it on Marketplace) in the Composer file of the module. Open the `composer.json` file in a text editor and note the `"name"` and `"version"` values.
 
 {:.procedure}
-To get the module's Composer name from Magento Marketplace:
+To get the Composer name of a module from the Magento Marketplace:
 
 1. Log in to [Magento Marketplace](https://marketplace.magento.com) with the username and password you used to purchase the component.
-1. In the upper right corner, click **&lt;your username>** > **My Account** as the following figure shows.
+
+1. In the upper right corner, click **Username** > **My Account**.
 
    ![Access your Marketplace account]({{ site.baseurl }}/common/images/cloud_marketplace-account.png){:width="650px"}
 
-1. On the My Account page, click **My Purchases** as the following figure shows.
+1. On the _My Account_ page, click **My Purchases**.
 
    ![Marketplace purchase history]({{ site.baseurl }}/common/images/cloud_marketplace-purch-history.png){:width="650px"}
 
-1. On the My Purchases page, click **Technical Details** for the module you purchased as the following figure shows.
+1. On the _My Purchases_ page, click **Technical Details** for the module you purchased.
 
    ![Technical details shows the module's Composer name]({{ site.baseurl }}/common/images/cloud_marketplace-download-invoice.png){:width="200px"}
 
 1. Click **Copy** to copy the component name to the clipboard.
-1. Open a text editor.
-1. Paste the module name in the text editor.
+
+1. Open a text editor and paste the module name.
+
 1. Append a colon character (`:`) to the component name.
-1. In **Technical Details** on the My Purchases page, click **Copy** to copy the version to the clipboard.
+
+1. In **Technical Details** on the _My Purchases_ page, click **Copy** to copy the version to the clipboard.
+
 1. Append the version number to the component name after the colon.
 
    A sample follows:
 
    ```text
    pixlee/magento2:1.0.1
-   ```
+   ```
diff --git a/src/_includes/cloud/tip-creating-branches.md b/src/_includes/cloud/tip-creating-branches.md
@@ -0,0 +1,2 @@
+{:.bs-callout-tip}
+We highly recommend that you have your Magento application fully deployed to an Integration or Staging environment before attempting to add a module. Always work in a development branch when adding a module to your implementation. If you do not have a branch, see [Get started creating branches]({{ site.baseurl }}/cloud/env/environments-start.html#getstarted).
diff --git a/src/cloud/cdn/configure-fastly.md b/src/cloud/cdn/configure-fastly.md
@@ -296,7 +296,7 @@ To check the version of Fastly CDN module for Magento 2:
 {:.procedure}
 To upgrade the Fastly module:
 
-1. In your local Integration environment, use the following module information to [upgrade the Fastly module]({{ site.baseurl }}/cloud/howtos/install-components.html#update).
+1. In your local Integration environment, use the following module information to [upgrade the Fastly module]({{ site.baseurl }}/cloud/howtos/install-components.html).
 
    ```text
    module name: fastly/magento2

diff --git a/src/cloud/cdn/trouble-fastly.md b/src/cloud/cdn/trouble-fastly.md
@@ -266,7 +266,7 @@ Based on the status returned, use the following instructions to update the Fastl
 
 -  `Module does not exist`—If the module does not exist [install and configure](https://github.com/fastly/fastly-magento2/blob/master/Documentation/INSTALLATION.md) the Fastly CDN Module for Magento 2 in an Integration branch. After installation completes, enable and configure the module. See [Set up Fastly]({{ site.baseurl }}/cloud/cdn/configure-fastly.html).
 
--  `Module is disabled`—If the Fastly module is disabled, update the environment configuration on an Integration branch in your local environment to enable it. Then, push the changes to Staging and Production. See [Manage extensions]({{ site.baseurl }}/cloud/howtos/install-components.html#manage).
+-  `Module is disabled`—If the Fastly module is disabled, update the environment configuration on an Integration branch in your local environment to enable it. Then, push the changes to Staging and Production. See [Manage extensions]({{ site.baseurl }}/cloud/howtos/install-components.html).
 
    If you use [Configuration Management]({{site.baseurl}}/cloud/live/sens-data-over.html#cloud-config-specific-recomm), check the Fastly CDN module status in the `app/etc/config.php` configuration file before you push changes to the Production or Staging environment.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{:.bs-callout-tip}
		We highly recommend that you have your Magento application fully deployed to an Integration or Staging environment before attempting to add a module. Always work in a development branch when adding a module to your implementation. If you do not have a branch, see [Get started creating branches]({{ site.baseurl }}/cloud/env/environments-start.html#getstarted).