Merge branch 'develop' into Cloud-2002.0.10

_data/toc/migration-guide.yml

@@ -32,6 +32,9 @@ pages:
         - label: Configure migration
           url: migration/migration-tool-configure.html
 
+        - label: Extend the tool
+          url: migration/extend-the-tool.html
+
     - label: Migrate using Data Migration Tool
       url: migration/migration-migrate.html
       children:

_includes/changes/ce/2.2.0-develop.html

@@ -93,6 +93,10 @@ <h2 id="class">Class</h2>
         <td>Magento\Framework\File\Uploader::getDispersionPath</td>
         <td>[public] Method has been added.</td>
     </tr>
+    <tr>
+        <td>Magento\Framework\Exception\AbstractAggregateException::addException</td>
+        <td>[public] Method has been added.</td>
+    </tr>
     <tr>
         <td>Magento\Framework\DB\Ddl\Table::OPTION_DEFAULT</td>
         <td>Constant has been added.</td>
@@ -177,6 +181,18 @@ <h2 id="class">Class</h2>
         <td>Magento\Theme\Block\Html\Footer::getCacheLifetime</td>
         <td>[protected] Method has been added.</td>
     </tr>
+    <tr>
+        <td>Magento\Swatches\Block\Product\Renderer\Listing\Configurable::__construct</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Swatches\Block\Product\Renderer\Listing\Configurable::getPriceFormatJson</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Swatches\Block\Product\Renderer\Listing\Configurable::getPricesJson</td>
+        <td>[public] Method has been added.</td>
+    </tr>
     <tr>
         <td>Magento\Store\Model\Store::getIsActive</td>
         <td>[public] Method has been added.</td>
@@ -229,6 +245,10 @@ <h2 id="class">Class</h2>
         <td>Magento\Newsletter\Model\Subscriber::beforeSave</td>
         <td>[public] Method has been added.</td>
     </tr>
+    <tr>
+        <td>Magento\ImportExport\Model\Export::FILTER_TYPE_MULTISELECT</td>
+        <td>Constant has been added.</td>
+    </tr>
     <tr>
         <td>Magento\ImportExport\Helper\Report::getDelimiter</td>
         <td>[public] Method has been added.</td>
@@ -297,6 +317,10 @@ <h2 id="class">Class</h2>
         <td>Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection::_beforeLoad</td>
         <td>[protected] Method has been added.</td>
     </tr>
+    <tr>
+        <td>Magento\ConfigurableProduct\Block\Product\View\Type\Configurable::__construct</td>
+        <td>[public] Added optional parameter(s).</td>
+    </tr>
     <tr>
         <td>Magento\Config\Model\Config\Structure\ConcealInProductionConfigList::__construct</td>
         <td>[public] Added optional parameter(s).</td>
@@ -373,6 +397,14 @@ <h2 id="class">Class</h2>
         <td>Magento\CatalogImportExport\Model\Export\Product::loadCollection</td>
         <td>[protected] Method has been added.</td>
     </tr>
+    <tr>
+        <td>Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider::__construct</td>
+        <td>[public] Added optional parameter(s).</td>
+    </tr>
+    <tr>
+        <td>Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider::getMeta</td>
+        <td>[public] Method has been added.</td>
+    </tr>
     <tr>
         <td>Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::__construct</td>
         <td>[public] Added optional parameter(s).</td>
@@ -513,6 +545,10 @@ <h2 id="class">Class</h2>
         <td>Magento\Framework\MessageQueue\Bulk\ExchangeFactory</td>
         <td>Class was added.</td>
     </tr>
+    <tr>
+        <td>Magento\Framework\Exception\BulkException</td>
+        <td>Class was added.</td>
+    </tr>
     <tr>
         <td>Magento\Framework\Amqp\Config</td>
         <td>Class was added.</td>
@@ -537,6 +573,10 @@ <h2 id="class">Class</h2>
         <td>Magento\Framework\Amqp\QueueFactory</td>
         <td>Class was added.</td>
     </tr>
+    <tr>
+        <td>Magento\WebapiAsync\Model\ServiceConfig</td>
+        <td>Class was added.</td>
+    </tr>
     <tr>
         <td>Magento\Ui\DataProvider\SearchResultFactory</td>
         <td>Class was added.</td>
@@ -721,6 +761,14 @@ <h2 id="class">Class</h2>
         <td>Magento\EavGraphQl\Model\Resolver\Query\Type</td>
         <td>Class was added.</td>
     </tr>
+    <tr>
+        <td>Magento\CatalogInventory\Model\ResourceModel\Stock\Status</td>
+        <td>Class was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\CatalogInventory\Helper\Stock</td>
+        <td>Class was added.</td>
+    </tr>
     <tr>
         <td>Magento\Backend\Ui\Component\Listing\Column\EditAction</td>
         <td>Class was added.</td>
@@ -1013,10 +1061,18 @@ <h2 id="interface">Interface</h2>
         <td>Magento\Framework\Bulk\OperationManagementInterface</td>
         <td>Interface was added.</td>
     </tr>
+    <tr>
+        <td>Magento\Framework\App\Config\Storage\WriterInterface</td>
+        <td>Interface was added.</td>
+    </tr>
     <tr>
         <td>Magento\Ui\DataProvider\Modifier\WysiwygModifierInterface</td>
         <td>Interface was added.</td>
     </tr>
+    <tr>
+        <td>Magento\Swagger\Api\Data\SchemaTypeInterface</td>
+        <td>Interface was added.</td>
+    </tr>
     <tr>
         <td>Magento\Sitemap\Model\SitemapConfigReaderInterface</td>
         <td>Interface was added.</td>
@@ -1169,10 +1225,38 @@ <h2 id="interface">Interface</h2>
         <td>Magento\CatalogImportExport\Model\StockItemImporterInterface</td>
         <td>Interface was added.</td>
     </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Model\ConfigInterface</td>
+        <td>Interface was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Api\BulkStatusInterface</td>
+        <td>Interface was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface</td>
+        <td>Interface was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface</td>
+        <td>Interface was added.</td>
+    </tr>
     <tr>
         <td>Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface</td>
         <td>Interface was added.</td>
     </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface</td>
+        <td>Interface was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface</td>
+        <td>Interface was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Api\Data\ItemStatusInterface</td>
+        <td>Interface was added.</td>
+    </tr>
     <tr>
         <td>Magento\AsynchronousOperations\Api\Data\OperationInterface</td>
         <td>Interface was added.</td>
@@ -1181,6 +1265,10 @@ <h2 id="interface">Interface</h2>
         <td>Magento\AsynchronousOperations\Api\Data\OperationListInterface</td>
         <td>Interface was added.</td>
     </tr>
+    <tr>
+        <td>Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface</td>
+        <td>Interface was added.</td>
+    </tr>
     <tr>
         <td>Magento\Analytics\Model\Connector\Http\ConverterInterface</td>
         <td>Interface was added.</td>

guides/v2.0/architecture/archi_perspectives/framework.md

@@ -74,30 +74,30 @@ The Magento Framework (`lib/internal/Magento/Framework/`) provides a robust rang
          </td>
          <td>Provides standard functionality for storing and retrieving data through magic methods. This is the base class for many Magento classes.</td>
       </tr><tr>
-         <td><code>Magento\Framework\DataObject\Model</code>
+         <td><code>Magento\Framework\Model</code>
          </td>
          <td>Contains base Model classes that almost all Magento Model classes extend from.</td>
       </tr><tr>
-         <td><code>Magento\Framework\DataObject\AbstractModel</code>
+         <td><code>Magento\Framework\Model\AbstractModel</code>
          </td>
          <td></td>
       </tr>
       <tr>
-         <td><code>Magento\Framework\DataObject\AbstractResource</code></td>
+         <td><code>Magento\Framework\Model\ResourceModel\AbstractResource</code></td>
          <td></td>
       </tr>
       <tr>
-         <td><code>Magento\Framework\DataObject\Controller</code></td>
+         <td><code>Magento\Framework\Controller</code></td>
          <td>Contains classes to help return different types of results (for example, JSON and redirects).</td>
       </tr>
       <tr>
-         <td><code>Magento\Framework\DataObject\View</code></td>
+         <td><code>Magento\Framework\View</code></td>
          <td>Contains code to render pages and layouts.</td>
       </tr><tr>
-         <td><code>Magento\Framework\DataObject\Data</code></td>
+         <td><code>Magento\Framework\Data</code></td>
          <td>Contains additional classes that handle forms.</td>
       </tr><tr>
-         <td><code>Magento\Framework\DataObject\URL</code></td>
+         <td><code>Magento\Framework\Url</code></td>
          <td>Contains code to look up other pages in Magento.</td>
       </tr>
    </tbody>

guides/v2.0/cloud/access-acct/fastly.md

@@ -253,7 +253,11 @@ The following list contains examples of DNS providers for informational purposes
 
 Many other DNS providers also offer workarounds to accomplish this goal. The most common is to add a CNAME record for the `www` host on the domain and then use the DNS provider's redirect service to redirect the apex over to the `www` version of the domain. Consult your DNS provider for more information.
 
-Another option for apex domain is to add an A record, which maps a domain name to the Fastly IP address: `150.101.113.124`.
+Another option for apex domain is to add A records, which maps a domain name to the Fastly IP addresses:
+* `151.101.1.124`
+* `151.101.65.124`
+* `151.101.129.124`
+* `151.101.193.124`
 
 Refer to [Go live checklist]({{page.baseurl}}cloud/live/go-live-checklist.html) for more information.
 

guides/v2.0/cloud/basic-information/cloud-plans.md

@@ -100,9 +100,4 @@ To further customize your {{site.data.var.ece}} project and account, you can pur
 ### Domain-Validated SSL (HTTP) certificate {#ssl}
 If you don't want to use the shared SSL certificate, you can purchase this option as part of your subscription. The cost of the service includes adding and deploying the Domain-Validated SSL certificate to all Fastly servers and services.
 
-This service is an additional cost for your contract.
-
-### AWS Managed VPN Connection Service access {#vpn}
-If you need access to your own Virtual Private Network (VPN) to access your {{site.data.var.ee}} environment, you can purchase this option to gain access to the AWS Managed VPN Connection Service. We will provide information required for configurations including the required IPs and modes.
-
-This service is an additional cost for your contract. VPN configurations require technical resources and requirements for configuring. For information on the AWS service, see their [AWS Managed VPN Connections](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_VPN.html){:target="\_blank"} and  [VPN Connections](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/vpn-connections.html){:target="\_blank"}.
+This service is an additional cost for your contract.

guides/v2.0/cloud/live/go-live-checklist.md

@@ -55,7 +55,11 @@ The following list contains examples of DNS providers for informational purposes
 
 Many other DNS providers also offer workarounds to accomplish this goal. The most common is to add a CNAME record for the `www` host on the domain and then use the DNS provider's redirect service to redirect the apex over to the `www` version of the domain. Consult your DNS provider for more information.
 
-Another option for <em>apex domain</em> is to add an A record which maps a domain name to the Fastly IP address: `150.101.113.124`.
+Another option for apex domain is to add A records, which maps a domain name to the Fastly IP addresses:
+* `151.101.1.124`
+* `151.101.65.124`
+* `151.101.129.124`
+* `151.101.193.124`
 
 ### TLS and Fastly {#fastly-tls}
 If you use TLS with Fastly enabled in your environment, you must provide your DNS provider with a TXT record from Fastly. We provide a Domain Validated SSL certificate with Subject Alternative Name enabled, issued by GLobalSign. When entering your [Support ticket](#dns) for DNS information and going live, let us know you are using TLS, provide your domain names and request the TXT record. You can then send this record to your DNS provider. The domain validation process is executed by Fastly.

guides/v2.0/cloud/live/stage-prod-migrate.md

@@ -1,11 +1,7 @@
 ---
 layout: default
 group: cloud
-subgroup: 160_deploy
 title: Deploy code and migrate static files and data
-menu_title: Deploy code and migrate static files and data
-menu_order: 50
-menu_node:
 version: 2.0
 github_link: cloud/live/stage-prod-migrate.md
 functional_areas:
@@ -190,18 +186,22 @@ To migrate a database:
 ### Troubleshooting the database migration
 If you encounter the following error, you can try to create a database dump with the DEFINER replaced:
 
-	ERROR 1277 (42000) at line <number>: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+```
+ERROR 1277 (42000) at line <number>: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+```
 
 This error occurs because the DEFINER for the triggers in the SQL dump is the production user. This user requires administrative permissions.
 
 To solve the issue, you can generate a new database dump changing or removing the `DEFINER` clause. The following is one example of completing this change:
 
-	mysqldump -h <database host> --user=<database user name> --password=<password> --single-transaction main  | sed 's/DEFINER[ ]*=[ ]*[^*]*\*/\*/g' | gzip > /tmp/database_no-definer.sql.gz
+```bash
+mysqldump -h <database host> --user=<database user name> --password=<password> --single-transaction main  | sed -e 's/DEFINER[ ]*=[ ]*[^*]*\*/\*/' | gzip > /tmp/database_no-definer.sql.gz
+```
 
 Use the database dump you just created to [migrate the database](#cloud-live-migrate-db).
 
-<div class="bs-callout bs-callout-info" id="info">
-  <p>After migrating the database, you can set up your stored procedures or views in Staging or Production the same way you did in your Integration environment.</p>
+<div class="bs-callout bs-callout-info" id="info" markdown="1">
+After migrating the database, you can set up your stored procedures or views in Staging or Production the same way you did in your Integration environment.
 </div>
 
 #### Next step

guides/v2.0/cloud/live/stage-prod-test.md

@@ -152,7 +152,7 @@ If you encounter issues, save your reproduction steps, error messages, strange s
 <li>Check all themes and assets load correctly</li>
 <li>Verify CSS displays correctly, including responsive media sizes</li>
 <li>Check Terms & Conditions, refund policy, and other policy information</li>
-<li>Check contant information, links, and more about your company</li>
+<li>Check contact information, links, and more about your company</li>
 <li>Search for products and content, check filtering of results</li>
 <li>Verify the footer block and top navigation blocks</li>
 <li>Test the 404 and Maintenance pages</li>

guides/v2.0/javascript-dev-guide/widgets/widget_tabs.md

@@ -31,7 +31,7 @@ $("#element").tabs();
 Where:
 <ul>
 <li><code>#element</code> is the selector of the element for tabs is initialized.</li>
-<ul>
+</ul>
 
 Phtml template file examples using script: