Merge branch 'develop' into develop

Author: sanganinamrata

_data/toc/msi.yml

@@ -0,0 +1,6 @@
+label: MSI Developer Guide
+versions:  ["2.3"]
+pages:
+
+    - label: Overview
+      url: /msi/index.html

_includes/backward-incompatible-changes/open-source/2.2.0-develop.html

@@ -613,30 +613,6 @@ <h2 id="class">Class</h2>
         <td>Magento\Framework\Setup\Declaration\Schema\Diff\Diff</td>
         <td>Class was added.</td>
     </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\Alias</td>
-        <td>Class was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\AliasFactory</td>
-        <td>Class was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\Dimension</td>
-        <td>Class was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\DimensionFactory</td>
-        <td>Class was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\IndexName</td>
-        <td>Class was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\IndexNameBuilder</td>
-        <td>Class was added.</td>
-    </tr>
     <tr>
         <td>Magento\Framework\MessageQueue\ExchangeFactory</td>
         <td>Class was added.</td>
@@ -1129,22 +1105,6 @@ <h2 id="interface">Interface</h2>
         <td>Magento\Framework\Search\EngineResolverInterface</td>
         <td>Interface was added.</td>
     </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\IndexHandlerInterface</td>
-        <td>Interface was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\IndexNameResolverInterface</td>
-        <td>Interface was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\IndexStructureInterface</td>
-        <td>Interface was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\Framework\MultiDimensionalIndexer\IndexTableSwitcherInterface</td>
-        <td>Interface was added.</td>
-    </tr>
     <tr>
         <td>Magento\Framework\MessageQueue\ConsumerInterface</td>
         <td>Interface was added.</td>

_includes/cloud/note-pro-using-yaml-support.md

@@ -0,0 +1,3 @@
+<div class="bs-callout bs-callout-info" id="info" markdown="1">
+  For Pro projects, the changes you make using this YAML file affects your Integration environment only. To make these changes in a Staging or Production environment, you must create a [Support ticket](http://support.magento.com){:target="_blank"}.
+</div>

_includes/config/config-reference-b2b.md

@@ -1,6 +1,6 @@
 <div markdown="1">
 
-This reference contains unique configuration paths for the Magento Enterprise B2B Extension. The Magento Enterprise B2B Extension supports all configuration paths for Magento Community Edition (CE) and Magento Enterprise Edition (EE) as well.
+This reference contains unique configuration paths for the Magento Enterprise B2B Extension. The Magento Enterprise B2B Extension supports all configuration paths for {{site.data.var.ce}} (formerly Community Edition (CE) and {{site.data.var.ee}} (formerly Enterprise Edition (EE) as well.
 
 ## General category
 This section lists variable names and configuration paths available for options in the Admin under **Stores** > Settings > **Configuration** > **General**.

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

@@ -1,6 +1,6 @@
 <div markdown="1">
 
-These instructions apply to Magento Community Edition (CE) and Magento Enterprise Edition (EE) users *only* if all of the following are true:
+These instructions apply to {{site.data.var.ce}} (formerly Community Edition (CE) and {{site.data.var.ce}} (formerly Enterprise Edition (EE) users *only* if all of the following are true:
 
 *	You have installed optional sample data
 *	You're upgrading to Magento 2.1 (including a Release Candidate) from any earlier version using the command line

_includes/layout/sidebar.html

@@ -99,6 +99,9 @@
 		{% elsif page.group == "graphql" %}
 				{% assign toc = site.data.toc.graphql %}
 
+		{% elsif page.group == "msi" %}
+				{% assign toc = site.data.toc.msi %}
+
 		{% elsif page.group == "modules" %}
 		    {% assign toc = site.data.toc.modules %}
 

guides/m1x/ce19-ee114-home.html

@@ -37,18 +37,18 @@ <h1>Magento Community Edition (CE) 1.9 and Enterprise Edition (EE) 1.14 Document
 					<li><a href="{{ site.m1xgdeurl }}install/installer-privileges_before.html" target="_blank">Before You Install Magento: Recommended File System Ownership and Privileges</a></li>
 					<li><a href="{{ site.m1xgdeurl }}install/installer-privileges_after.html" target="_blank">After You Install Magento: Recommended File System Ownership and Privileges</a></li>
 					<li><A href="{{ site.m1xgdeurl }}ce18-ee113/ht_magento-ce-sample.data.html" target="_blank">Installing Sample Data for Magento Community Edition (CE)</a></li>
-
 				</ul>
 			</li>
 			<li>Upgrade: <a href="{{ site.m1xgdeurl }}install/installing_upgrade_landing.html" target="_blank">Upgrading to and Verifying Magento Community Edition (CE) and Enterprise Edition (EE)&mdash;Part 1</a></li>
 		</ul>
-		</li></div>
+	</div>
 
 	<h2 id="welcome">Welcome</h2>
 	<p>Welcome to the documentation home page for the Community Edition (CE) 1.9 and Magento Enterprise Edition (EE) 1.14 and releases! Let's start out by telling you a little bit about them.</p>
 	<p>Your ability to create captivating online experiences just got even better.  Magento Enterprise Edition 1.14.1, now available for download from My Account, features powerful new merchandising tools and responsive design capabilities that will help you engage customers and stand out from the competition. You’ll also enjoy better performance, faster technical issue resolution, and deeper insights to drive your business forward.</p>
 	<p>The new releases helps you: </p>
-	<ul><li><em>EE only</em>. Merchandise product categories like never before with a new drag-and-drop tool and the ability to set up rules to automatically assign products to categories. </li>
+	<ul>
+		<li><em>EE only</em>. Merchandise product categories like never before with a new drag-and-drop tool and the ability to set up rules to automatically assign products to categories. </li>
 		<li>Boost conversion with swatches that present richer product information to shoppers on category, search result, and product detail pages.</li>
 		<li>Optimize sales on any device with an enhanced responsive design reference theme that now also includes responsive emails.</li>
 		<li>Get a faster, more secure site with support for MySQL 5.6 and PHP 5.5.</li>
@@ -57,8 +57,6 @@ <h2 id="welcome">Welcome</h2>
 		<li>Access deeper shopper insights now that Magento supports Google Universal Analytics.</li>
 		<li>Have an even better Magento experience with more than 70 other product improvements. </li>
 	</ul>
-
-
 </div>
 </body>
 </html>

guides/v2.0/frontend-dev-guide/layouts/xml-manage.md

@@ -251,7 +251,7 @@ Extending layout:
     <arguments>
         <!-- Modified block argument -->
         <argument name="label" xsi:type="string">New Block Label</argument>
-        <!- Newly added block argument -->
+        <!-- Newly added block argument -->
         <argument name="custom_label" xsi:type="string">Custom Block Label</argument>
     </arguments>
 </referenceBlock> 

guides/v2.0/frontend-dev-guide/themes/admin_theme_create.md

@@ -46,7 +46,7 @@ Configure it using the following example (replace placeholders with your {% glos
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
      <title>%Theme title%</title> <!-- your theme's name -->
      <parent>%vendor_dir%/%parent_theme_dir%</parent> <!-- the parent theme. Example: Magento/backend -->
- </theme>
+</theme>
 {%endhighlight%}
 
 If you change the theme title or parent theme information in `theme.xml` after a theme was already [registered](#register_theme), you need to open or reload any {% glossarytooltip 18b930cf-09cc-47c9-a5e5-905f86c43f81 %}Magento Admin{% endglossarytooltip %} page for your changes to be saved in the database.

guides/v2.0/frontend-dev-guide/themes/theme-inherit.md

@@ -40,7 +40,7 @@ the Orange theme by OrangeCo inherits from the Magento Blank theme. The inherita
      <media>
          <preview_image>media/preview.jpg</preview_image>
      </media>
- </theme>
+</theme>
 {% endhighlight xml %}
 
 <div class="bs-callout bs-callout-info" id="info">
@@ -115,15 +115,15 @@ For example, if you must override the `<Magento_Catalog_module_dir>/view/fronten
 
 <u>Example</u>
 By default, according to the module template, in the mini {% glossarytooltip c7ecb18d-cefe-452d-83e2-3c4d5e355db9 %}shopping cart{% endglossarytooltip %} products are listed under the Go to {% glossarytooltip 278c3ce0-cd4c-4ffc-a098-695d94d73bde %}Checkout{% endglossarytooltip %} button:
-<p><img src="{{ site.baseurl }}/common/images/inherit_mini1.png" alt="In the minishopping cart products are listed under the Go to Checkout button "></p>
+<p><img src="{{ site.baseurl }}/common/images/inherit_mini1.png" alt="In the minishopping cart products are listed under the Go to Checkout button"/></p>
 
 The order is defined in the `<Magento_Checkout_module_dir>/view/frontend/templates/cart/minicart.phtml` module template. The Blank theme does not override this template.
 OrangeCo decided they want the product list to be displayed before the Go to Checkout button.
 To do this, they need to add an overriding template for the corresponding module in the Orange theme folder:
 `app/design/frontend/OrangeCo/orange/Magento_Checkout/templates/cart/minicart.phtml`
 Note, that the path to the template inside the `templates` directory in the theme corresponds to that in the module.
 Having changed the order or elements in the templates, OrangeCo got the minicart look like following:
-<p><img src="{{ site.baseurl }}/common/images/inherit_mini2.png" alt="In the minishopping cart products are listed above the Go to Checkout button "></p>
+<p><img src="{{ site.baseurl }}/common/images/inherit_mini2.png" alt="In the minishopping cart products are listed above the Go to Checkout button"/></p>
 You can find out what exactly code changes are required to perform this and other tasks in the <a href="{{ page.baseurl }}/frontend-dev-guide/templates/template-sample.html">Illustration of customizing templates topic</a>.
 
 ## Extend layouts {#theme-inherit-layout}

guides/v2.1/cloud/access-acct/trouble.md

@@ -12,7 +12,7 @@ functional_areas:
   - Deploy
 ---
 
-This topic discusses how to recover if you deployed the Magento application with the incorrect [Magento authentication keys]({{ page.baseurl }}/install-gde/prereq/connect-auth.html). For example, you might have used the keys for another account or you might have used Magento Community Edition (CE) keys instead of Magento Enterprise Edition (EE) keys.
+This topic discusses how to recover if you deployed the Magento application with the incorrect [Magento authentication keys]({{ page.baseurl }}/install-gde/prereq/connect-auth.html). For example, you might have used the keys for another account or you might have used {{site.data.var.ce}} (formerly Community Edition (CE)) keys instead of {{site.data.var.ee}} (formerly Enterprise Edition (EE))  keys.
 
 If you used the incorrect keys, deployment fails. To recover, you must clone the project, add the correct keys to `auth.json`, and push the change to the master branch.