Merge pull request #5132 from atwixfirster/migration-tool-updates1

magento/devdocs#: Data Migration Tool. Updates Content.

Author: dobooth

guides/v2.2/migration/migration-migrate-data.md

@@ -19,7 +19,9 @@ See the [First steps]({{ page.baseurl }}/migration/migration-migrate.html#migrat
 
 To start migrating data, run:
 
-    bin/magento migrate:data [-r|--reset] [-a|--auto] {<path to config.xml>}
+```bash
+bin/magento migrate:data [-r|--reset] [-a|--auto] {<path to config.xml>}
+```
 
 where:
 
@@ -35,49 +37,23 @@ To force the Data Migration Tool to run from the beginning, use the `--reset` ar
 
 ## Possible consistency errors {#migrate-command-data}
 
-While running, the Data Migration Tool may report inconsistencies between Magento 1 and Magento 2 databases, and display messages like this:
-
-```xml
-Source documents are not mapped: <EXTENSION_TABLE>
-```
+While running, the Data Migration Tool may report inconsistencies between Magento 1 and Magento 2 databases, and display messages like the following:
+
+- `Source documents are missing: <EXTENSION_TABLE_1>,<EXTENSION_TABLE_2>,...<EXTENSION_TABLE_N>`
+- `Destination documents are missing: <EXTENSION_TABLE_1>,<EXTENSION_TABLE_2>,...<EXTENSION_TABLE_N>`
+- `Source documents are not mapped: <EXTENSION_TABLE_1>,<EXTENSION_TABLE_2>,...<EXTENSION_TABLE_N>`
+- `Destination documents are not mapped: <EXTENSION_TABLE_1>,<EXTENSION_TABLE_2>,...<EXTENSION_TABLE_N>`
+- `Source fields are missing. Document: <EXTENSION_TABLE>. Fields: <FIELD_1>,<FIELD_2>...<FIELD_N>`
+- `Destination fields are missing. Document: <EXTENSION_TABLE>. Fields: <FIELD_1>,<FIELD_2>...<FIELD_N>`
+- `Source fields are not mapped. Document: <EXTENSION_TABLE>. Fields: <FIELD_1>,<FIELD_2>...<FIELD_N>`
+- `Destination fields are not mapped. Document: <EXTENSION_TABLE>. Fields: <FIELD_1>,<FIELD_2>...<FIELD_N>`
+- `Mismatch of data types. Source document: <EXTENSION_TABLE>. Fields: <FIELD_1>,<FIELD_2>...<FIELD_N>`
+- `Mismatch of data types. Destination document: <EXTENSION_TABLE>. Fields: <FIELD_1>,<FIELD_2>...<FIELD_N>`
+- `Incompatibility in data. Source document: <EXTENSION_TABLE>. Field: <FIELD>. Error: <ERROR_MESSAGE>`
+- `Incompatibility in data. Destination document: <EXTENSION_TABLE>. Field: <FIELD>. Error: <ERROR_MESSAGE>`
 
 See the [Troubleshooting]({{ page.baseurl }}/migration/migration-troubleshooting.html) section of this guide for more information and recommendations.
 
-<!--
-
-When you migrate data, the Data Migration Tool verifies that tables and fields are consistent between Magento 1 and Magento 2. If they are inconsistent, you will see an error message that lists the problematic tables and fields, for example:
-
-    Source fields are not mapped. Document: <document_name>. Fields: <field_name>
-
-**Possible reason for error:** some database entities belong to Magento 1 extensions that do not exist in the Magento 2 database.
-
-Below are the possible ways to handle these errors.
-
-### Fix errors: Install corresponding Magento 2 extensions
-
-Visit [Magento Marketplace](https://marketplace.magento.com/){:target:"_blank"} to find the latest [extension](https://glossary.magento.com/extension) versions or contact your extension provider.
-
-### Fix errors: Ignore entities
-
-You may tell the Data Migration Tool to ignore the problematic entities.
-
-To do that, add the `<ignore>` tag to an entity in the `map.xml` file, like this:
-
-```xml
-<ignore>
-    <field>sales_order_address_id</field>
-</ignore>
-```
-
-{: .bs-callout .bs-callout-warning }
-Before ignoring entities, make sure you don't need the affected data in your Magento 2 store.
-
-### Verify fixes
-
-To know if the issues have been resolved successfully, run the Data Migration Tool again.
-
--->
-
 ## Next migration step
 
 [Migrate changes]({{ page.baseurl }}/migration/migration-migrate-delta.html)

guides/v2.2/migration/migration-troubleshooting.md

@@ -38,9 +38,22 @@ This message appears because the Data Migration Tool runs internal tests to veri
 To ignore database entities, add the `<ignore>` tag to an entity in the `map.xml` file, like this:
 
 ```xml
-<ignore>
-   <field>sales_order_address_id</field>
-</ignore>
+    ...
+    <source>
+        <document_rules>
+            ...
+            <!-- Ignore `sales_flat_invoice_grid` table -->
+            <ignore>
+                <document>sales_flat_invoice_grid</document>
+            </ignore>
+            <!-- Ignore `address_id` field of `sales_flat_order_address` table -->
+            <ignore>
+                <field>sales_flat_order_address.address_id</field>
+            </ignore>
+            ...
+        </document_rules>
+    </source>
+    ...
 ```
 
 {: .bs-callout .bs-callout-warning }
@@ -108,7 +121,7 @@ This configuration adds a hash-string to the conflicting records of [URL](https:
 ### Mismatch of entities
 
 ```xml
-Mismatch of entities in the document: <DOCUMENT>
+Mismatch of entities in the document: <DOCUMENT> Source: <COUNT_ITEMS_IN_SOURCE_TABLE> Destination: <COUNT_ITEMS_IN_DESTINATION_TABLE>
 ```
 
 #### Explanation