Merge branch 'master' into fix/checkout-step

Author: dobooth

src/_data/whats-new.yml

@@ -4,8 +4,17 @@ 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 4 22:34:52 2021
 entries:
+- 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.

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/install/sampledata/sample-data_list-of-modules.md

@@ -21,7 +21,6 @@
 *  magento/module-theme-sample-data
 *  magento/module-widget-sample-data
 *  magento/module-wishlist-sample-data
-*  magento/sample-data
 *  magento/sample-data-media
 
 {{site.data.var.ee}} only:

src/cloud/project/project-webint-basic.md

@@ -98,7 +98,7 @@ To set environment specific variables in the Project Web Interface:
 
    ![Set environment variables]({{ site.baseurl }}/common/images/cloud/cloud_env-var.png)
 
-1. As needed, select options for **JSON value**, **Visible during build**, and **Visible during runtime**. If you do not have Super User access, you may only see the JSON value option.
+1. As needed, select options for **JSON value**, **Enabled**, **Inheritable by child environments** and **Sensitive**. If you do not have Super User access, you may only see the JSON value option.
 1. Click **Add Variable**. After you add the variable, the environment will deploy. Wait until deployment completes before more edits.
 
 {:.bs-callout-warning}

src/cloud/release-notes/mcd-release-notes.md

@@ -40,6 +40,8 @@ The release notes include:
 
 -  {:.fix}<!--MCLOUD-7442-->**Invalid volume naming**–Fixed an error with invalid volume naming in developer mode.
 
+-  {:.fix}<!--Issue 295-->**NGINX upstream port**—Updated the Docker NGINX 1.19 image to use port 8080 to avoid an infinite loop. *[Fix submitted by Adarsh Manickam](https://github.com/magento/magento-cloud-docker/pull/296).*
+
 ## v1.2.0
 *Release date: November 9, 2020*<br/>
 

src/common/js/glossary-link-enhancer.js

@@ -1,11 +1,11 @@
-//  When loaded, this script finds all link elements that point to the glossary 
+//  When loaded, this script finds all link elements that point to the glossary
 //  and applies the glossary-term style
 //
 //  TODO: Use this script to add pop up functionality when the following issue
 //  is resolved: https://github.com/magento/glossary/issues/13
 
-document.querySelectorAll("a").forEach(element => {
-  if (element.href.indexOf("glossary.magento.com") > -1) {
-    element.className = "glossary-term";
+document.querySelectorAll('a').forEach(element => {
+  if (element.href.indexOf('glossary.magento.com') > -1) {
+    element.className = 'glossary-term'
   }
-});
+})

src/compliance/privacy/gdpr.md

@@ -10,8 +10,8 @@ The European Union (EU) enacted [General Data Protection Regulation](https://ec.
 
 System integrators can use the data flow diagrams and database information in the Personal Information Reference to build scripts to resolve use cases similar to the following:
 
--  A shopper asks for a copy of the data the merchant has stored about her
--  A shopper requests that all information about him be deleted
+-  A shopper asks for a copy of the data the merchant has stored about them
+-  A shopper requests that all information about them be deleted
 
 ## Personal Information Reference
 

src/guides/v2.3/b2b/bk-b2b.md

@@ -46,6 +46,7 @@ ConfigurableSharedCatalog |Enables configurable products to be added to a shared
 GiftCardNegotiableQuote | Enables gift cards to be displayed in a negotiable quote in an B2B environment | No
 GiftCardRequisitionList | Enables gift cards to be displayed in a requisition list | No
 GiftCardSharedCatalog | Enables gift cards to be added to a shared catalog in an B2B environment. | No
+GroupedRequisitionList | Enables grouped products to be displayed in a requisition list | No
 GroupedSharedCatalog | Enables grouped products to be added to a shared catalog in an B2B environment. | No
 NegotiableQuote | Allows a buyer and a seller (admin user) to negotiate product and/or shipping prices before the buyer places an order. | Yes
 NegotiableQuoteSharedCatalog | Enables the `NegotiableQuote` module to interact with a `SharedCatalog` in an B2B environment. | No

src/guides/v2.3/config-guide/prod/config-reference-var-name.md

@@ -140,7 +140,7 @@ To get these values from the database:
 1. Use the following SQL queries to find the relevant values:
 
    ```shell
-   SELECT * FROM STORES;
+   SELECT * FROM STORE;
    SELECT * FROM STORE_WEBSITE;
    ```
 

src/guides/v2.3/config-guide/revert-split-database.md

@@ -8,9 +8,7 @@ functional_areas:
   - Setup
 ---
 
-The [split database]({{ page.baseurl }}/config-guide/multi-master/multi-master.html) feature was deprecated in version 2.4.2 of {{ site.data.var.ee }}. Follow these instructions to revert from a split database to a single database implementation.
-
-## Revert a split database implementation
+For {{ site.data.var.ee }} customers who have implemented [Split Database]({{ page.baseurl }}/config-guide/multi-master/multi-master.html), the following topic describes how to revert or migrate back to a single database. We recommend that {{ site.data.var.ee }} merchants currently using Split Database who are upgrading to 2.4.2 and above review these steps, as well as our [announcement](https://community.magento.com/t5/Magento-DevBlog/Deprecation-of-Split-Database-in-Magento-Commerce/ba-p/465187) on the planned deprecation of Split Database.
 
 Reverting from a split database to a single database implementation involves creating backups of the `magento_quote` and `magento_sales` databases before loading them into the single `magento_main` database.