fix merge conflict in b2b notes

Author: jfrontain

src/_data/toc/contributor-guide.yml

@@ -14,6 +14,10 @@ pages:
           url: /contributor-guide/backward-compatible-development/
           versionless: true
 
+        - label: Pull Request Tests
+          url: /contributor-guide/pull-request-tests.html
+          versionless: true
+
     - label: Docs Contributions
       children:
         - label: Contribution Guidelines

src/_data/toc/software-update-guide.yml

@@ -21,6 +21,28 @@ pages:
         - label: Update and upgrade checklist
           url: /comp-mgr/prereq/prereq_compman-checklist.html
 
+    - label: Safe Upgrade Tool
+      url: /safe-upgrade-tool/introduction.html
+      versionless: true
+      edition: ee-only
+      children:
+
+        - label: Prerequisites
+          url: /safe-upgrade-tool/prerequisites.html
+          versionless: true
+
+        - label: Install
+          url: /safe-upgrade-tool/install.html
+          versionless: true
+
+        - label: Run the tool
+          url: /safe-upgrade-tool/run.html
+          versionless: true
+
+        - label: Developer information
+          url: /safe-upgrade-tool/developer.html
+          versionless: true
+
     - label: Magento Marketplace example
       url: /comp-mgr/marketplace/marketplace.html
       include_versions: ["2.3"]

src/_data/toc/testing.yml

@@ -70,6 +70,9 @@ pages:
         - label: Running Static Tests
           url: /test/static/static_test_execution.html
 
+        - label: Setting up for Static Analysis
+          url: /test/static/static-analysis.html
+
     - label: Semantic Version Checker
       children:
 

src/_data/var.yml

@@ -31,7 +31,7 @@ mcp-package: magento/magento-cloud-patches
 mcp-release: 1.0.8
 mcd-package: magento/magento-cloud-docker
 mcd-prod: Magento Cloud Docker
-mcd-release: 1.2.0
+mcd-release: 1.2.1
 mcc-prod: Magento Cloud Components
 mcc-package: magento/magento-cloud-components
 mcc-release: 1.0.7

src/_data/whats-new.yml

@@ -4,8 +4,47 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Wed Dec 16 16:19:47 2020
+updated: Mon Jan 18 15:45:43 2021
 entries:
+- description: SendGrid DKIM signatures are available only on Magento Commerce Cloud
+    Pro projects.  For more information on SendGrid, see https://devdocs.magento.com/cloud/project/sendgrid.html.
+  versions: 2.4.x
+  type: Major Update
+  date: January 14, 2021
+  link: https://github.com/magento/devdocs/pull/8440
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: New Relic Alerts now include Redis and MariaDB. See https://devdocs.magento.com/cloud/project/new-relic.html#monitor-performance-with-managed-alerts.
+  versions: 2.4.x
+  type: Major Update
+  date: January 12, 2021
+  link: https://github.com/magento/devdocs/pull/8503
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: Added a [legal disclaimer](https://devdocs.magento.com/compliance/privacy/pi-data-reference-m2.html#customer-data)
+    to references of the `date_of_birth` attribute of the `customer` database entity.
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: January 8, 2021
+  link: https://github.com/magento/devdocs/pull/8488
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
+- description: Published release notes for [Cloud Docker 1.2.1](https://devdocs.magento.com/cloud/release-notes/mcd-release-notes.html#v121).
+  versions: 2.4.x
+  type: Major Update
+  date: December 22, 2020
+  link: https://github.com/magento/devdocs/pull/8429
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: Added a new topic with instructions for [reverting from a split database
+    to a single database](https://devdocs.magento.com/guides/v2.4/config-guide/revert-split-database.html)
+    implementation.
+  versions: 2.3.x, 2.4.x
+  type: New Topic
+  date: December 21, 2020
+  link: https://github.com/magento/devdocs/pull/8422
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
 - description: Added an [example](https://devdocs.magento.com/guides/v2.4/javascript-dev-guide/javascript/requirejs.html)
     of overwriting a Knockout JS .html template file in the `requirejs-config.js`
     file.
@@ -1620,7 +1659,7 @@ entries:
   type: Technical
   date: April 9, 2020
   link: https://github.com/magento/devdocs/pull/7016
-- description: Fixed a config entry in the the [Custom import entity](https://devdocs.magento.com/guides/v2.3/ext-best-practices/tutorials/custom-import-entity.html)
+- description: Fixed a config entry in the [Custom import entity](https://devdocs.magento.com/guides/v2.3/ext-best-practices/tutorials/custom-import-entity.html)
     topic.
   versions: 2.3.x
   type: Technical

src/_includes/cloud/enable-ssh.md

@@ -38,34 +38,23 @@ If the directory does not exist or has no SSH key files, you must generate at le
 
 If you have at least one SSH key in your directory, add the key to your Magento and GitHub accounts:
 
--  [Add an SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
+-  [Add an SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) and [test the SSH connection](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/testing-your-ssh-connection).
 -  [Add your public SSH key to your Magento account](#ssh-add-to-account)
 
-### Test the SSH keys {#test}
-
-After adding the SSH keys, test the SSH connection to GitHub:
-
-1. In the terminal, enter the following command:
-
-   ```bash
-   ssh -T git@github.com
-   ```
-
-1. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
-
-1. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
-
 ## Add a public SSH key to your Magento account {#ssh-add-to-account}
 
 You can add SSH keys to your account in any of the following ways:
 
 -  Using the [{{site.data.var.ece}} CLI](#add-key-cli)
 -  Using the [{{site.data.var.ece}} Web Interface](#add-key-web)
+-  Using the [{{site.data.var.ece}} Cloud account Dashboard](#add-key-cloud)
+
+After you add a key, you must [redeploy active Cloud environments](#update-cloud-environments-with-a-new-ssh-key) to upload the key.
 
 ### Add your SSH key using the CLI {#add-key-cli}
 
 {:.procedure}
-To add an SSH key using the CLI:
+To add an SSH key using the [Magento Cloud CLI]({{site.baseurl}}/cloud/reference/cli-ref-topic.html):
 
 1. Open a terminal application on your local workstation.
 
@@ -118,8 +107,23 @@ To add an SSH key using the Project Web interface:
 
    -  Follow the prompts on your screen to complete the task.
 
-{:.bs-callout-tip}
-You can view and manage the SSH keys on your account in _Account settings_. In the upper right corner of the Project Web interface, click **your-user-name** > **Account Settings**.
+### Add a key from the Cloud Account dashboard {#add-key-cloud}
+
+You can add your SSH public key directly from the Cloud _Account Settings_ page.
+
+1. Open your [Cloud account page](https://accounts.magento.cloud) and log in if required.
+1. On the Cloud account dashboard, click the **Account Settings** tab.
+1. Under _SSH keys_, click **Add a public key**.
+
+## Update Cloud environments with a new SSH key
+
+After you add an SSH key, redeploy each active Cloud environment to upload the new key.
+
+Use the [Magento Cloud CLI]({{site.baseurl}}/cloud/reference/cli-ref-topic.html) to redeploy the environment:
+
+```bash
+magento-cloud redeploy --project <project-name> --host <host-name> --environment <environment-name>
+```
 
 ## Set global Git variables
 

src/_includes/cloud/error-codes.md

@@ -48,7 +48,7 @@ Critical errors indicate a problem with the {{ site.data.var.ece }} project conf
 | 106 |  | Unable to read the `.schema.yaml` file |  |
 | 107 | pre-deploy: clean-redis-cache | Failed to clean the Redis cache | Failed to clean the Redis cache. Check that the Redis cache configuration is correct and that the Redis service is available. See [Setup Redis service](https://devdocs.magento.com/cloud/project/services-redis.html). |
 | 108 | pre-deploy: set-production-mode | Command `/bin/magento maintenance:enable` failed | Check the `cloud.log` for more information. For more detailed command output, add the `VERBOSE_COMMANDS: '-vvv'` option to the `.magento.env.yaml` file. |
-| 109 | validate-config | Incorrect database configuration | Check that the the `DATABASE_CONFIGURATION` environment variable is configured correctly. |
+| 109 | validate-config | Incorrect database configuration | Check that the `DATABASE_CONFIGURATION` environment variable is configured correctly. |
 | 110 | validate-config | Incorrect session configuration | Check that the `SESSION_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `save` parameter. |
 | 111 | validate-config | Incorrect search configuration | Check that the `SEARCH_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `engine` parameter. |
 | 112 | validate-config | Incorrect resource configuration | Check that the `RESOURCE_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least `connection` parameter. |

src/_includes/graphql/company-team.md

@@ -3,5 +3,5 @@ The `CompanyTeam` object contains details about a company team. It contains the
 Attribute |  Data Type | Description
 --- | --- | ---
 `description` | String | An optional description of the team
-`id` | ID! | A string that contains the encoded team ID
+`id` | ID! | The unique ID for a `CompanyTeam` object
 `name` | String | The display name of the team

src/_includes/graphql/company.md

@@ -7,20 +7,20 @@ Attribute | Data type | Description
 `credit` | CompanyCredit! | The company credit balance
 `credit_history(filter: CompanyCreditHistoryFilterInput, pageSize: Int = 20, currentPage: Int = 1)` | CompanyCreditHistory! | A history of company credit operations
 `email` | String | The email address of the company contact
-`id` | ID! | The ID assigned to the company
+`id` | ID! | The unique ID of a `Company` object
 `legal_address` | [CompanyLegalAddress](#CompanyLegalAddress) | The address where the company is registered to conduct business
 `legal_name` | String | The full legal name of the company
 `name` | String | The name of the company
 `payment_methods` | [String] | The list of payment methods available to a company
 `reseller_id` | String | The resale number that is assigned to the company for tax reporting purposes
-`role(id: ID!)` | [CompanyRole](#CompanyRole) | Returns information about the specified company role
+`role(id: ID!)` | [CompanyRole](#CompanyRole) | Returns a company role filtered by the unique ID for a `CompanyRole` object
 `roles(pageSize: Int = 20, currentPage: Int = 1 )` | [CompanyRoles!](#CompanyRoles) | Returns the list of company roles
 `sales_representative` |  [CompanySalesRepresentative](#CompanySalesRepresentative) | The company sales representative
 `structure(rootId: ID = 0 depth: Int = 10 )` | [CompanyStructure](#CompanyStructure) | Returns the company structure of teams and customers in depth-first order
-`team(id: ID!)` | [CompanyTeam](#CompanyTeam) | Returns the specified company team
-`user(id: ID!)` | [Customer]({{page.baseurl}}/graphql/queries/customer.html) | Returns the specified company user
-`users(filter: CompanyUsersFilterInput, pageSize: Int = 20, currentPage: Int = 1)`| [CompanyUsers](#CompanyUsers) | Returns the company users that match the specified filter
-`vat_id` | String | The value-added tax number that is assigned to the company by some jurisdictions for tax reporting purposes
+`team(id: ID!)` | [CompanyTeam](#CompanyTeam) | Returns company team data filtered by the unique ID for a `CompanyTeam` object
+`user(id: ID!)` | [Customer]({{page.baseurl}}/graphql/queries/customer.html) | Returns a company user filtered by the unique ID for a `Customer` object
+`users(filter: CompanyUsersFilterInput, pageSize: Int = 20, currentPage: Int = 1)`| [CompanyUsers](#CompanyUsers) | Returns a list of company users based on activity status
+`vat_tax_id` | String | The value-added tax number that is assigned to the company by some jurisdictions for tax reporting purposes
 
 ### CompanyAclResource attributes {#CompanyAclResource}
 
@@ -29,8 +29,8 @@ The `CompanyAclResource` object can contain the following attributes.
 Attribute |  Data Type | Description
 --- | --- | ---
 `children` | [CompanyAclResource!] | An array of sub-resources
-`id` | ID! | The ID assigned to the ACL resource
-`sort_order` | Int | ACL resource sort order
+`id` | ID! | The unique ID for a `CompanyAclResource` object
+`sort_order` | Int | The sort order of an ACL resource
 `text` | String | The label assigned to the ACL resource
 
 ### CompanyAdmin attributes {#CompanyAdmin}
@@ -42,7 +42,7 @@ Attribute |  Data Type | Description
 `email` | String! | The email address of the company administrator
 `firstname` | String! | The company administrator's first name
 `gender` | Int | The company administrator's gender (Male - 1, Female - 2, Not Specified - 3)
-`id` | ID! | The ID assigned to the company administrator
+`id` | ID! | The unique ID for a `CompanyAdmin` object
 `job_title` | String | The job title of the company administrator
 `lastname` | String! | The company administrator's last name
 
@@ -105,8 +105,8 @@ The `CompanyLegalAddress` object can contain the following attributes.
 Attribute |  Data Type | Description
 --- | --- | ---
 `city` | String! | The city where the company is registered to conduct business
-`country_id` | CountryCodeEnum! | Company's country ID. See the [`countries` query]({{page.baseurl}}/graphql/queries/directory-countries.html)
-`postcode` | String! | The ZIP/postal code of the company
+`country_code` | CountryCodeEnum! | Company's country ID. See the [`countries` query]({{page.baseurl}}/graphql/queries/directory-countries.html)
+`postcode` | String! | The company's postal code
 `region` | CustomerAddressRegionInput! | An object containing the region name and/or region ID where the company is registered to conduct business
 `street` | [String!]! | An array of strings that define the street address where the company is registered to conduct business
 `telephone` | String! | The primary phone number of the company.
@@ -117,7 +117,7 @@ The `CompanyRole` object can contain the following attributes.
 
 Attribute |  Data Type | Description
 --- | --- | ---
-`id`| ID! | The ID assigned to the role
+`id`| ID! | The unique ID for a `CompanyRole` object
 `name` | String | The name assigned to the role
 `permissions` | [CompanyAclResource] | A list of permission resources defined for a role
 `users_count` | Int | The total number of users assigned the specified role
@@ -129,7 +129,7 @@ The `CompanyRoles` object can contain the following attributes.
 Attribute |  Data Type | Description
 --- | --- | ---
 `items` | [CompanyRole]! | A list of company roles that match the specified filter criteria
-`page_info` | SearchResultPageInfo | Pagination meta data
+`page_info` | SearchResultPageInfo | Pagination metadata
 `total_count` | Int! | The total number of roles matching the specified filter
 
 ### CompanySalesRepresentative attributes {#CompanySalesRepresentative}
@@ -157,8 +157,8 @@ The `CompanyStructureItem` object can contain the following attributes.
 Attribute |  Data Type | Description
 --- | --- | ---
 `entity` | CompanyStructureEntity | A union of [CompanyTeam](#CompanyTeam) and [Customer]({{page.baseurl}}/graphql/queries/customer.html) objects
-`id` | ID! | The ID of the item in the hierarchy
-`parent_id` | ID | The ID of the parent item in the hierarchy
+`id` | ID! | The unique ID for a `CompanyStructureItem` object
+`parent_id` | ID | The ID of the parent item in the company hierarchy
 
 ### CompanyTeam attributes {#CompanyTeam}
 
@@ -169,6 +169,6 @@ The `CompanyUsers` object can contain the following attributes.
 
 Attribute |  Data Type | Description
 --- | --- | ---
-`items` | [[Customer]!]({{page.baseurl}}/graphql/queries/customer.html) | An array of `CompanyUser` objects that match the specified search criteria
-`page_info` | SearchResultPageInfo | Pagination meta data
+`items` | [[Customer]!]({{page.baseurl}}/graphql/queries/customer.html) | An array of `CompanyUser` objects that match the specified filter criteria
+`page_info` | SearchResultPageInfo | Pagination metadata
 `total_count` | Int! | The number of objects returned

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