Merge branch 'master' into sync-2.4.2

Author: jeff-matthews

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/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/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/frontend-dev-guide/themes/admin_theme_apply.md

@@ -42,9 +42,9 @@ Each step is described further with more details.
 
 ## Specify the custom Admin theme in `di.xml` {#specify_di}
 
-You need to specify the admin theme to be used in the `<your_module_dir>/etc/adminhtml/di.xml` file. Add it, if the file does not yet exist in your module.
+You need to specify the admin theme to be used in the `<your_module_dir>/etc/di.xml` file. Add it, if the file does not yet exist in your module.
 
-In `<your_module_dir>/etc/adminhtml/di.xml` add the following (replace the placeholders with the vendor name and theme code of your Admin theme):
+In `<your_module_dir>/etc/di.xml` add the following (replace the placeholders with the vendor name and theme code of your Admin theme):
 
 ```xml
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">

src/guides/v2.3/graphql/authorization-tokens.md

@@ -43,8 +43,12 @@ You can now use this token in the Authorization request header field for any que
 
 If necessary, you also can [revoke the customer's token]({{ page.baseurl }}/graphql/mutations/revoke-customer-token.html
 
+By default, a customer token is valid for 1 hour. You can change these values from Admin by selecting **Stores** > **Settings** > **Configuration** > **Services** > **OAuth** > **Access Token Expiration** > **Customer Token Lifetime**.
+
 ## Admin tokens
 
 In Magento GraphQL, you specify an admin token only if you need to query products, categories, price rules, or other entities that are scheduled to be in a campaign (staged content). Staging is supported in {{site.data.var.ee}} only. See [Staging queries]({{page.baseurl}}/graphql/queries/index.html#staging) for more information.
 
 Magento does not provide a GraphQL mutation that generates an admin token. You must use the `POST /V1/integration/admin/token` REST endpoint instead. [Generate the admin token]({{page.baseurl}}/rest/tutorials/prerequisite-tasks/create-admin-token.html) shows how to use this endpoint.
+
+By default, an admin token is valid for 4 hours. You can change these values from Admin by selecting **Stores** > **Settings** > **Configuration** > **Services** > **OAuth** > **Access Token Expiration** > **Admin Token Lifetime**.

src/guides/v2.3/graphql/mutations/apply-store-credit.md

@@ -110,3 +110,11 @@ Attribute |  Data Type | Description
 {% include graphql/cart-object.md %}
 
 [Cart query output]({{page.baseurl}}/graphql/queries/cart.html#cart-output) provides more information about the `Cart` object.
+
+## Errors
+
+Error | Description
+--- | ---
+`Could not find a cart with ID \"xxxxx\"` | The ID provided in the `cart_id` field is invalid or the cart does not exist for the customer.
+`The cart isn't active` | The cart with the given cart ID is unavailable, because the items have been purchased and the cart ID becomes inactive.
+`Field ApplyStoreCreditToCartInput.cart_id of required type String! was not provided` | The value specified in the `ApplyStoreCreditToCartInput.cart_id` argument is empty.