Merge pull request #8498 from magento/sync-2.4.2

keharper · web-flow · commit 5de103ae0db7 · 2021-01-11T10:02:16.000-06:00
Sync 2.4.2-develop
diff --git a/src/_includes/graphql/create-customer.md b/src/_includes/graphql/create-customer.md
@@ -1,6 +1,6 @@
 Attribute |  Data Type | Description
 --- | --- | ---
-`date_of_birth` | String | The customer’s date of birth
+`date_of_birth` | String | The customer’s date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer’s date of birth
 `email` | String | The customer’s email address. Required to create a customer
 `firstname` | String | The customer’s first name. Required to create a customer
diff --git a/src/_includes/graphql/customer-input-24.md b/src/_includes/graphql/customer-input-24.md
@@ -2,7 +2,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressInput) | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
diff --git a/src/_includes/graphql/customer-input.md b/src/_includes/graphql/customer-input.md
@@ -2,7 +2,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressInput) | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
diff --git a/src/_includes/graphql/customer-output-24.md b/src/_includes/graphql/customer-output-24.md
@@ -19,7 +19,7 @@ Attribute |  Data Type | Description
 `addresses` | {{ customeraddress_text }}  | An array containing the customer's shipping and billing addresses
 `allow_remote_shopping_assistance` | Boolean! | Indicates whether the customer has enabled remote shopping assistance
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
diff --git a/src/_includes/graphql/customer-output.md b/src/_includes/graphql/customer-output.md
@@ -2,7 +2,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressOutput)  | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
diff --git a/src/cloud/howtos/debug.md b/src/cloud/howtos/debug.md
@@ -91,7 +91,7 @@ To configure PhpStorm to work with Xdebug:
 
 1. In your PhpStorm project, open the settings panel.
 
-   -  _Mac OS X_—Select **File** > **Preferences**.
+   -  _Mac OS X_—Select **PhpStorm** > **Preferences**.
    -  _Windows/Linux_—Select **File** > **Settings**.
 
 1. In the _Settings_ panel, expand and locate the **Languages & Frameworks** > **PHP** > **Servers** section.
diff --git a/src/compliance/privacy/pi-data-reference-m2.md b/src/compliance/privacy/pi-data-reference-m2.md
@@ -45,7 +45,7 @@ Magento 2 primarily stores customer-specific information in customer, address, o
 
 ### Customer data {#customer-data}
 
-Magento 2 stores the following customer attributes:
+Magento 2 can be figured to store the following customer attributes:
 
 -  Date of Birth
 -  Email
@@ -56,6 +56,9 @@ Magento 2 stores the following customer attributes:
 -  Name Prefix
 -  Name Suffix
 
+{:.bs-callout-info}
+In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
+
 #### `customer_entity` and 'customer_entity' references
 
 The following columns in the `customer_entity` table contain customer information:
diff --git a/src/guides/v2.3/config-guide/prod/config-reference-most.md b/src/guides/v2.3/config-guide/prod/config-reference-most.md
@@ -405,7 +405,7 @@ Prefix Dropdown Options | `customer/address/prefix_options` | <!-- ![Not EE-only
 Show Middle Name (initial) | `customer/address/middlename_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Show Suffix | `customer/address/suffix_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Suffix Dropdown Options | `customer/address/suffix_options` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
-Show Date of Birth | `customer/address/dob_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
+Show Date of Birth | `customer/address/dob_show`<br>In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.| <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Show Tax/VAT Number | `customer/address/taxvat_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Show Gender | `customer/address/gender_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
 Enable Store Credit Functionality | `customer/magento_customerbalance/is_enabled` | ![EE-only]({{ site.baseurl }}/common/images/cloud_ee.png) |
diff --git a/src/guides/v2.3/extension-dev-guide/configuration/sensitive-and-environment-settings.md b/src/guides/v2.3/extension-dev-guide/configuration/sensitive-and-environment-settings.md
@@ -28,6 +28,9 @@ Examples of sensitive information include:
 *  E-mail addresses
 *  Any personally identifiable information (e.g., address, phone number, date of birth, government identification number, etc.)
 
+{:.bs-callout-info}
+In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
+
 ### Environment or system-specific values
 
 _Environment_ or _system-specific_ values are unique to the system where Magento is deployed.
diff --git a/src/guides/v2.3/frontend-dev-guide/themes/theme-structure.md b/src/guides/v2.3/frontend-dev-guide/themes/theme-structure.md
@@ -282,7 +282,7 @@ The key difference between static files and other theme files is that static fil
 Static view files that can be accessed by a direct link from the storefront, are distinguished as public theme files.
 
 {:.bs-callout-info}
-  To be actually accessible for browsers public static files are [published]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html#config-cli-static-overview) to the `/pub/static/frontend/<Vendor>/<theme>/<language>/css/` directory.
+  To be actually accessible for browsers public static files are [published]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html#config-cli-static-overview) to the `/pub/static/frontend/<Vendor>/<theme>/<locale>/css/` directory.
 
 ### Dynamic view files
 
diff --git a/src/guides/v2.3/graphql/develop/resolvers.md b/src/guides/v2.3/graphql/develop/resolvers.md
@@ -284,14 +284,17 @@ input CustomerInput {
     lastname: String @doc(description: "The customer's family name")
     suffix: String @doc(description: "A value such as Sr., Jr., or III")
     email: String @doc(description: "The customer's email address. Required")
-    date_of_birth: String @doc(description: "The customer's date of birth")
+    date_of_birth: String @doc(description: "The customer's date of birth.")
     taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
     gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)")
     password: String @doc(description: "The customer's password")
     is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
 }
 ```
 
+{:.bs-callout-info}
+In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
+
 The `createCustomer` mutation returns `CustomerOutput` object
 
 ```text
@@ -319,7 +322,9 @@ type Customer @doc(description: "Customer defines the customer name and address
     addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses")
     gender: Int @doc(description: "The customer's gender (Male - 1, Female - 2)")
 }
-```
+
+{:.bs-callout-info}
+In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 
 The following example shows the `createCustomer` mutation in action:
 
diff --git a/src/guides/v2.3/graphql/queries/category.md b/src/guides/v2.3/graphql/queries/category.md
@@ -212,3 +212,10 @@ The query returns a `CategoryTree` object, which implements [`CategoryInterface`
 Attribute | Data type | Description
 --- | --- | ---
 `children` | `CategoryTree` | An array containing the next level of subcategories. By default, you can specify up to 10 levels of child categories
+
+## Errors
+
+Error | Description
+--- | ---
+`Category doesn't exist` | The specified category ID value does not exist.
+`Field "category" argument "id" requires type Int, found "XXX"` | The specified `id` argument value has the wrong type.
diff --git a/src/guides/v2.3/graphql/queries/directory-country.md b/src/guides/v2.3/graphql/queries/directory-country.md
@@ -112,3 +112,10 @@ The query returns a single `Country` object.
 
 *  [countries query]({{page.baseurl}}/graphql/queries/directory-countries.html)
 *  [currency query]({{page.baseurl}}/graphql/queries/directory-currency.html)
+
+## Errors
+
+Error | Description
+--- | ---
+`Country \"id\" value should be specified"` | The Country ID value must be specified to find the mapped country.
+`The country isn't available` | There is no country mapped to the given country ID.
diff --git a/src/guides/v2.3/howdoi/checkout/checkout_new_step.md b/src/guides/v2.3/howdoi/checkout/checkout_new_step.md
diff --git a/src/guides/v2.3/javascript-dev-guide/javascript/js-resources.md b/src/guides/v2.3/javascript-dev-guide/javascript/js-resources.md
diff --git a/src/guides/v2.4/config-guide/prod/config-reference-most.md b/src/guides/v2.4/config-guide/prod/config-reference-most.md
diff --git a/src/guides/v2.4/graphql/mutations/create-customer-v2.md b/src/guides/v2.4/graphql/mutations/create-customer-v2.md
diff --git a/src/guides/v2.4/graphql/mutations/update-customer-v2.md b/src/guides/v2.4/graphql/mutations/update-customer-v2.md
diff --git a/src/guides/v2.4/graphql/queries/category.md b/src/guides/v2.4/graphql/queries/category.md
