Merge branch 'master' into ds_upd-dev

Author: dshevtsov

_data/toc/javascript-developer-guide.yml

@@ -46,6 +46,9 @@ pages:
         - label: Alert widget
           url: /javascript-dev-guide/widgets/widget_alert.html
 
+        - label: Breadcrumbs widget
+          url: /javascript-dev-guide/widgets/widget-breadcrumbs.html
+
         - label: Calendar widget
           url: /javascript-dev-guide/widgets/widget_calendar.html
 
@@ -79,6 +82,9 @@ pages:
         - label: Modal widget
           url: /javascript-dev-guide/widgets/widget_modal.html
 
+        - label: Multiselect widget
+          url: /javascript-dev-guide/widgets/widget-multiselect.html
+
         - label: Navigation widget
           url: /javascript-dev-guide/widgets/widget_navigation.html
 
@@ -97,6 +103,9 @@ pages:
         - label: RedirectUrl widget
           url: /javascript-dev-guide/widgets/widget_redirectUrl.html
 
+        - label: RowBuilder widget
+          url: /javascript-dev-guide/widgets/widget-row-builder.html
+
         - label: Tabs widget
           url: /javascript-dev-guide/widgets/widget_tabs.html
 

_data/toc/php-developer-guide.yml

@@ -256,6 +256,10 @@ pages:
         - label: Adapters
           url: /extension-dev-guide/adapters.html
 
+        - label: View models
+          include_versions: ["2.2", "2.3"]
+          url: /extension-dev-guide/view-models.html
+
         - label: Variable Pool
           include_versions: ["2.3"]
           url: /extension-dev-guide/variable-pool/

_includes/config/split-deploy/example_save-shared-config.md

@@ -31,7 +31,7 @@
     ```
 
     {:.bs-callout .bs-callout-warning}
-    Do _not_ submit changes to the `generated`, `pub/media`, or `pub/static` directories to source control. You'll generate those files on your build system. The production system likely has code, themes, and so on that aren't ready to use on production.
+    Do _not_ submit changes to the `generated`, `pub/media`, or `pub/static` directories to source control. You'll generate those files on your build system. The development system likely has code, themes, and so on that are not ready for use on the production system.
 
 1.  Check in your changes to `app/etc/config.php` only to source control.
 

_includes/mrg/note.md

@@ -1,4 +1,3 @@
-<div class="bs-callout bs-callout-info" markdown="1">
+{: .bs-callout-info }
 This topic is generated automatically from the corresponding README in the Magento codebase.
 If you want to contribute, refer to [Magento Code Contributions]({{ page.baseurl] }}/contributor-guide/contributing.html).
-</div>

_includes/reference/cli-template.md

@@ -12,80 +12,82 @@ The initial list is auto generated using the `{{ tool }} list` command at the {{
 
 {{ intro }}
 
+## Reference
+
+{: .bs-callout-info }
+This reference is generated from the Magento codebase. To add or update the content, you must update the source code for the corresponding CLI command in the [Magento 2 codebase](https://github.com/magento/magento2) repository and submit your changes for review.  For contribution guidelines, see [Magento Code Contributions]({{ page.baseurl] }}/contributor-guide/contributing.html).
+
 {% for command in commands %}
   {% assign arguments = command.definition.arguments %}
   {% assign options = command.definition.options %}
 
-## `{{ command.name }}`
+### `{{ command.name }}`
 
 {{ command.description }}
 
 ```bash
 {{ tool }} {{ command.usage }}
 ```
 
-  {% unless arguments.size == 0 %}
+{% unless arguments.size == 0 %}
 
-### Arguments
-{: .no_toc}
+#### Arguments
 
-  {% for argument in arguments %}
+{% for argument in arguments %}
   {% for item in argument %}
-  {% if item.name %}
-
-  {% if item.default == empty %}
-  {% endif %}
-
-#### `{{ item.name }}`
-
-- Description: {{ item.description }}
-{% unless item.default == nil %}
-  {% if item.default == false or (item.default == empty and item.default != '') %}
-- Default: `{{ item.default | inspect }}`
-  {% else %}
-- Default: `{{ item.default }}`
-  {% endif %}
-{% endunless %}
-  {% if item.is_required %}
-- Required
-  {% endif %}
-  {% if item.is_array %}
-- Array
-  {% endif %}
-  {% endif %}
-  {% endfor %}
-  {% endfor %}
-
-### Options
-{: .no_toc}
+    {% if item.name %}
+      {% if item.default == empty %}
+      {% endif %}
+
+##### `{{ item.name }}`
+
+-  Description: {{ item.description }}
+   {% unless item.default == nil %}
+   {% if item.default == false or (item.default == empty and item.default != '') %}
+-  Default: `{{ item.default | inspect }}`
+   {% else %}
+-  Default: `{{ item.default }}`
+   {% endif %}
+   {% endunless %}
+   {% if item.is_required %}
+-  Required
+   {% endif %}
+   {% if item.is_array %}
+-  Array
+   {% endif %}
+   {% endif %}
+   {% endfor %}
+   {% endfor %}
+
+#### Options
 
  {% for option in options %}
  {% assign opt = option[1] %}
 
-#### {{ option[0] }}
-
-- Option: `{{ opt.name }}`
-{% if opt.shortcut contains '-' %}
-- Shortcut: `{{ opt.shortcut }}`
-{% endif %}
-- Description: {{ opt.description }}
-{% unless opt.default == nil %}
-  {% if opt.default == false or (opt.default == empty and opt.default != '') %}
-- Default: `{{ opt.default | inspect }}`
-  {% else %}
-- Default: `{{ opt.default }}`
-  {% endif %}
-{% endunless %}
-{% if opt.is_value_required %}
-- Requires a value
-{% elsif opt.accept_value and opt.is_multiple %}
-- Accepts multiple values
-{% elsif opt.accept_value and opt.is_multiple == false %}
-- Accepts a value
-{% else %}
-- Does not accept a value
-{% endif %}
-{% endfor %}
+##### `{{ option[0] }}`
+
+-  Option: `{{ opt.name }}`
+   {% if opt.shortcut contains '-' %}
+-  Shortcut: `{{ opt.shortcut }}`
+   {% endif %}
+-  Description: {{ opt.description }}
+   {% unless opt.default == nil %}
+   {% if opt.default == false or (opt.default == empty and opt.default != '') %}
+-  Default: `{{ opt.default | inspect }}`
+   {% else %}
+-  Default: `{{ opt.default }}`
+   {% endif %}
+   {% endunless %}
+   {% if opt.is_value_required %}
+-  Requires a value
+   {% elsif opt.accept_value and opt.is_multiple %}
+-  Accepts multiple values
+   {% elsif opt.accept_value and opt.is_multiple == false %}
+-  Accepts a value
+   {% else %}
+-  Does not accept a value
+   {% endif %}
+   {% endfor %}
 
 {% endunless %}
 {% endfor %}