Merge branch 'master' into hg-typos

hguthrie · web-flow · commit 9ec85a809b28 · 2021-01-15T09:07:35.000-06:00
diff --git a/src/cloud/project/sendgrid.md b/src/cloud/project/sendgrid.md
@@ -24,6 +24,9 @@ s2.example.com IN CNAME <s2.example.sendgrid.net>
 {: .bs-callout-tip}
 You can find Sendgrid details for your account in the Onboarding UI. Use the `https://cloud.magento.com/project/_project-id_/setup/project_details` URL and select the **Project Details** > **Hosting Info** tab.
 
-The CNAME records resolve to the Domain Keys Identified Mail (DKIM) and Sender Policy Framework (SPF) records managed by SendGrid, so that spam filters are less likely to inhibit your messages.
+For {{site.data.var.ece}} Pro, the CNAME records resolve to the Domain Keys Identified Mail (DKIM) and Sender Policy Framework (SPF) records managed by SendGrid, so that spam filters are less likely to inhibit your messages.
+
+{: .bs-callout-info}
+**SendGrid DKIM signatures** are not available in Commerce Cloud Starter. They are only available in Commerce Cloud Pro.
 
 Magento does not support allowlists, but you can review the [Sender Policy Framework (SPF)](https://sendgrid.com/docs/Glossary/spf.html) guidelines to improve delivery.
diff --git a/src/guides/v2.3/config-guide/cli/config-cli-subcommands-catalog-sync.md b/src/guides/v2.3/config-guide/cli/config-cli-subcommands-catalog-sync.md
@@ -5,6 +5,9 @@ title: Catalog Sync
 
 Magento compiles catalog data into tables using indexers. This process is automatically [triggered by several events](https://docs.magento.com/user-guide/system/index-management-events.html), such as changes to a product's price or inventory levels. To allow some Magento services to use that catalog data, a catalog sync process runs hourly. The catalog sync process exports product data from the Magento server to SaaS services on an ongoing basis. For example, the [Product Recommendations](https://docs.magento.com/user-guide/marketing/product-recommendations.html) feature needs up-to-date catalog information so that it can accurately return recommendations with correct names, pricing, and availability. Use the command-line interface to trigger the catalog sync and reindex product data for consumption by SaaS services.
 
+{:.bs-callout-info}
+To use the catalog sync commands, you must have an [API key and a SaaS environment configured](https://docs.magento.com/user-guide/system/saas.html). If you do not have an API key and have not configured a SaaS environment, you can still reindex product data but that data will not be exported to SaaS services.
+
 The commands used to sync catalog data are part of the `magento/saas-export` package. See [Install and configure Product Recommendations]({{ site.baseurl }}/recommendations/install-configure.html) for more information.
 
 {:.bs-callout-info}
diff --git a/src/guides/v2.3/migration/bk-migration-guide.md b/src/guides/v2.3/migration/bk-migration-guide.md
@@ -21,8 +21,6 @@ We have developed the **Magento 2 Data Migration Tool** to help you efficiently
 ### Extensions and custom code {#migrate-extensions-code}
 We have been working hard with the development community to help you use your Magento 1 extensions in Magento 2. Now we are proud to present the [Magento Marketplace](https://marketplace.magento.com/){:target="_blank"}, where you can download or purchase the latest versions of your favorite extensions.
 
-Also, we have developed the [Code Migration Toolkit](https://github.com/magento/code-migration){:target="_blank"}, which will help to port your extensions and custom code to Magento 2, significantly reducing your efforts.
-
 More information on developing extensions for Magento 2 is available in the [PHP Developer Guide]({{ page.baseurl }}/extension-dev-guide/bk-extension-dev-guide.html){:target="_blank"}.
 
 ### Themes and customizations {#migrate-themes-customizations}
diff --git a/src/guides/v2.3/rest/tutorials/configurable-product/create-configurable-product.md b/src/guides/v2.3/rest/tutorials/configurable-product/create-configurable-product.md
@@ -19,6 +19,15 @@ The sample payload does not contain the price or the size. These attributes will
 
 The `visibility` attribute is set to 4, meaning the product can be found by browsing or searching. This value will be changed for the simple products.
 
+The below table shows the equivalent code for the visibility attribute
+
+Visibility | Code
+--- | ---
+`Not Visible Individually` | 1
+`Catalog` | 2
+`Search` | 3
+`Catalog, Search` | 4
+
 {:.bs-callout-info}
 Before you using this code sample, verify that the attribute values are the same in your installation. See [Get the list of attributes defined in an attribute searchCriteria]({{ page.baseurl }}/rest/tutorials/configurable-product/plan-product.html#get-attributes) for more information.
 
diff --git a/src/guides/v2.3/rest/tutorials/configurable-product/plan-product.md b/src/guides/v2.3/rest/tutorials/configurable-product/plan-product.md
@@ -53,15 +53,19 @@ We'll make several calls to find the values needed to create the product
 
 The sample data provides multiple attribute sets, including Default, Top, and Bottom. To assign the Top attribute set to the product, we need to know the corresponding `attribute_set_id`.
 
-Use the following call to search for the attribute set named `Top`.
+Use the following call to search for the attribute set named `Top` and `entity_type_id` equals to `4`.
+By default, the `catalog_product` entity has the `entity_type_id` value as `4`.
 
 **Endpoint:**
 
 ```html
 GET <host>/rest/<store_code>/V1/eav/attribute-sets/list?
 searchCriteria[filter_groups][0][filters][0][field]=attribute_set_name&
 searchCriteria[filter_groups][0][filters][0][value]=Top&
-searchCriteria[filter_groups][0][filters][0][condition_type]=eq
+searchCriteria[filter_groups][0][filters][0][condition_type]=eq&
+searchCriteria[filter_groups][1][filters][0][field]=entity_type_id&
+searchCriteria[filter_groups][1][filters][0][value]=4&
+searchCriteria[filter_groups][1][filters][0][condition_type]=eq
 ```
 
 **Response:**
@@ -88,6 +92,15 @@ The `attribute_set_id` for the Top attribute set is `9`.
                         "condition_type": "eq"
                     }
                 ]
+            },
+            {
+                "filters": [
+                    {
+                        "field": "entity_type_id",
+                        "value": "4",
+                        "condition_type": "eq"
+                    }
+                ]
             }
         ]
     },
@@ -101,11 +114,51 @@ Use the `GET V1/products/attribute-sets/:attributeSetId/attributes` call to retu
 
 **Endpoint:**
 
-`GET <host>/rest/default/V1/products/attribute-sets/9/attributes`
+```html
+GET <host>/rest/default/V1/products/attribute-sets/9/attributes
+```
 
 **Response:**
 
-The response contains almost 3,000 lines. The following table provides a summary of the attributes that are relevant in this tutorial.
+```json
+[
+    {
+        "attribute_id": 141,
+        "attribute_code": "size",
+        "frontend_input": "select",
+        "entity_type_id": "4",
+        "is_required": false,
+        "options": [
+            {
+                "label": " ",
+                "value": ""
+            },
+            {
+                "label": "Small",
+                "value": "168"
+            },
+            {
+                "label": "Medium",
+                "value": "169"
+            },
+            {
+                "label": "Large",
+                "value": "170"
+            }
+        ],
+        "is_user_defined": true,
+        "default_frontend_label": "Size",
+        "frontend_labels": [],
+        "backend_type": "int",
+        "source_model": "Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Table",
+        "default_value": "",
+        "is_unique": "0",
+        "validation_rules": []
+    }
+]
+```
+
+The response contains almost 3,000 lines and the above is a part of the response from the endpoint. The following table provides a summary of the attributes that are relevant in this tutorial.
 
 Admin label | Selected value | Attribute ID | attribute_code  | Attribute value
 --- | --- | --- | --- | ---
@@ -125,13 +178,41 @@ You must assign the product to one or more categories to enable customers to fin
 
 Use the following call to search for all categories (`id` is greater than or equal to `0`).
 
+**Endpoint:**
+
 ```html
 GET <host>/rest/default/V1/categories?
 searchCriteria[filter_groups][0][filters][0][field]=id&
 searchCriteria[filter_groups][0][filters][0][value]=1&
 searchCriteria[filter_groups][0][filters][0][condition_type]=gte
 ```
 
+**Response:**
+
+```json
+{
+    "id": 2,
+    "parent_id": 1,
+    "name": "Default Category",
+    "is_active": true,
+    "position": 1,
+    "level": 1,
+    "product_count": 0,
+    "children_data": [
+        {
+            "id": 11,
+            "parent_id": 2,
+            "name": "Men",
+            "is_active": true,
+            "position": 1,
+            "level": 2,
+            "product_count": 1,
+            "children_data": []
+        }
+    ]
+}
+```
+
 Note that women's tops and tees have different ids than men's tops and tees. The values for men's clothing are:
 
 *  Men - `11`
