Merge branch 'master' into whatsnew-update

Author: dobooth

src/_data/toc/live-search.yml

@@ -4,10 +4,6 @@ pages:
   url: /live-search/overview.html
   versionless: true
 
-- label: Install Live Search
-  url: /live-search/install.html
-  versionless: true
-
 - label: Storefront Popover
   url: /live-search/storefront-popover.html
   versionless: true
@@ -45,7 +41,3 @@ pages:
 - label: Events
   url: /live-search/events.html
   versionless: true
-
-- label: Release Notes
-  url: /live-search/release-notes.html
-  versionless: true

src/cloud/cdn/configure-fastly.md

@@ -150,11 +150,11 @@ When domain validation completes, Adobe provisions the Let's Encrypt TLS/SSL cer
 
 During the initial Fastly setup process, you can use the following URLs to configure and test Fastly caching in Staging and Production environments:
 
--  Pro projects:
+-  For Pro Staging and Production:
    -  `mcprod.<your-domain>.com`
    -  `mcstaging.<your-domain>.com`
 
--  Starter projects:
+-  For Starter Production only:
    -  `mcprod.<your-domain>.com`
 
 {:.bs-callout-info}

src/cloud/project/project-multi-sites.md

@@ -11,7 +11,7 @@ functional_areas:
 You can configure {{site.data.var.ee}} to have multiple websites or stores, such as an English store, a French store, and a German store. See [Understanding websites, stores, and store views]({{ site.baseurl }}/cloud/configure/configure-best-practices.html#sites).
 
 {:.bs-callout-warning}
-Be aware that catalog data expands as you increase the number of websites and stores. Depending on your project architecture, the additional stores can lead to a longer indexing process and slower response times for non-cached catalog pages. Adobe recommends that you monitor site performance closely.
+Catalog data expands as you increase the number of websites and stores. Depending on your project architecture, the additional stores can lead to a longer indexing process and slower response times for non-cached catalog pages. Adobe recommends that you monitor site performance closely.
 
 The process to set up multiple stores depends on whether you choose to use unique or shared domains.
 
@@ -36,15 +36,17 @@ To add a store view to the site base URL, you do not have to create multiple dir
 
 ## Add New Domains
 
-The process to add a new domain depends on the type of Cloud account:
+Custom domains can be added to Pro Staging and any Production environment; they cannot be added to Integration environments.
 
--  For Pro
+The process to add a domain depends on the type of Cloud account:
 
-   You must open a Support ticket to request new domains to be added to the cluster.
+-  For Pro Staging and Production
 
--  For Starter
+   Add the new domain to Fastly, see [Manage domains][], or open a support ticket to request assistance. In addition, you must open a Support ticket to request new domains to be added to a cluster.
 
-   You can add the new domain to Fastly for Production, or you can create a support ticket to request assistance. You must add the new domain to the **Domains** tab in the Program UI: `https://<zone>.magento.cloud/projects/<project-ID>/edit`
+-  For Starter Production only
+
+   Add the new domain to Fastly, see [Manage domains][], or open a support ticket to request assistance. In addition, you must add the new domain to the **Domains** tab in the Project Web Interface: `https://<zone>.magento.cloud/projects/<project-ID>/edit`
 
 ## Configure local installation
 
@@ -337,3 +339,4 @@ Adobe recommends fully testing in the Staging environment before pushing to the
 
 [addstorecode]: {{ site.baseurl }}/guides/v2.4/config-guide/multi-site/ms_websites.html#multi-storecode-baseurl
 [config-multiweb]: {{ site.baseurl }}/guides/v2.4/config-guide/multi-site/ms_over.html
+[Manage domains]: {{ site.baseurl }}cloud/cdn/configure-fastly-customize-cache.html#manage-domains

src/cloud/project/project-upgrade.md

@@ -22,9 +22,6 @@ Review the [{{site.data.var.ece}} service versions][version compatibility matrix
 -  Upgrade third-party extensions to the latest supported version.
 -  Update the `.gitignore` file.
 
-{:.bs-callout-info}
-If you upgrade the PHP version, you must also submit a Support ticket to update the New Relic service.
-
 ### Configuration management
 
 Older versions of {{site.data.var.ee}}, such as 2.1.4 or later to 2.2.x or later, used a `config.local.php` file for Configuration Management. {{site.data.var.ee}} version 2.2.0 and later use the `config.php` file, which works exactly like the `config.local.php` file, but it has different configuration settings that include a list of your enabled modules and additional configuration options.

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

@@ -1,10 +1,6 @@
 ---
 group: cloud-guide
-subgroup: 100_project
 title: Configure your project
-menu_title: Configure your project
-menu_order: 5
-menu_node:
 functional_areas:
   - Cloud
   - Configuration
@@ -30,7 +26,7 @@ The Project Web Interface provides several ways to access your project and envir
 To access projects and environments through the Project Web Interface:
 
 1. [Log in to your project](https://account.magento.com/customer/account/login/).
-1. Click **Access Project** for a list of URLs and SSH.
+1. Click **Access Site** for a list of URLs for web access and the command for SSH access.
 
    ![Access your project by URL or SSH]({{ site.baseurl }}/common/images/cloud/cloud_project-access.png){:width="600px"}
 

src/cloud/project/services-mysql.md

@@ -8,13 +8,13 @@ redirect_from:
   - /cloud/project/project-conf-files_services-mysql.html  
 ---
 
-The `mysql` service provides persistent data storage based on [MariaDB](https://mariadb.com/) versions 10.2-10.4, supporting the [XtraDB](https://www.percona.com/software/mysql-database/percona-server/xtradb) storage engine and reimplemented features from MySQL 5.6 and 5.7.
+The `mysql` service provides persistent data storage based on [MariaDB](https://mariadb.com/) versions 10.2 to 10.4, supporting the [XtraDB](https://www.percona.com/software/mysql-database/percona-server/xtradb) storage engine and reimplemented features from MySQL 5.6 and 5.7.
 
 {% include install/maria-db.md %}
 
 {:.bs-callout-warning}
 Be careful when upgrading MariaDB from version 10.1 to 10.2.
-MariaDB 10.1 is the last version that support XtraDB as the storage engine. Version 10.2 uses InnoDB for the storage engine. Once you upgrade from 10.1 to 10.2, you cannot rollback the change. {{site.data.var.ee}} supports both storage engines; however, you must check extensions and other systems used by your project to make sure they are compatible with MariaDB 10.2. Read about this [backwards incompatible change](https://mariadb.com/kb/en/upgrading-from-mariadb-101-to-mariadb-102/#incompatible-changes-between-101-and-102).
+MariaDB 10.1 is the last version that supports XtraDB as the storage engine. Version 10.2 uses InnoDB for the storage engine. Once you upgrade from 10.1 to 10.2, you cannot rollback the change. {{site.data.var.ee}} supports both storage engines; however, you must check extensions and other systems used by your project to make sure they are compatible with MariaDB 10.2. Read about this [backwards incompatible change](https://mariadb.com/kb/en/upgrading-from-mariadb-101-to-mariadb-102/#incompatible-changes-between-101-and-102).
 
 {% include cloud/service-config-integration-starter.md %}
 
@@ -50,12 +50,12 @@ MariaDB 10.1 is the last version that support XtraDB as the storage engine. Vers
 
 ## Set up multiple database users
 
-Optionally, you can set up multiple databases as well as multiple users with different permissions.
+Optionally, you can set up multiple databases and multiple users with different permissions.
 
-An _endpoint_ is a set of credentials (or users) with specific privileges. By default, there is one endpoint named `mysql` that has administrator access to all defined databases. To set up multiple database users, you must define multiple endpoints in the services.yaml file and declare the relationships in the .magento.app.yaml file.
+An _endpoint_ is a set of credentials (or users) with specific privileges. By default, there is one endpoint named `mysql` that has administrator access to all defined databases. To set up multiple database users, you must define multiple endpoints in the services.yaml file and declare the relationships in the `.magento.app.yaml` file. For Pro Staging and Production environments, submit a Support ticket to request the additional user.
 
 {:.bs-callout-warning}
-You cannot use multiple _databases_ with {{site.data.var.ee}} at this time, but you **can** create multiple endpoints to restrict access to the `main` database.
+You cannot use multiple _databases_ with {{site.data.var.ee}}, but you **can** create multiple endpoints to restrict access to the `main` database.
 
 Use a nested array to define the endpoints for specific user access. Each endpoint can designate access to one or more schemas (databases) and different levels of permission on each.
 
@@ -87,13 +87,13 @@ mysql:
                     main: rw
 ```
 
-In the preceding example, the `admin` endpoint provides admin-level access to the `main` database, the `reporter` endpoint provides read-only access, and the `importer` endpoint provides read-write access. This means that:
+In the preceding example, the `admin` endpoint provides admin-level access to the `main` database, the `reporter` endpoint provides read-only access, and the `importer` endpoint provides read-write access, which means:
 
 -  The `admin` user has full control of the database.
 -  The `reporter` user has SELECT privileges only.
 -  The `importer` user has SELECT, INSERT, UPDATE, and DELETE privileges.
 
-You must add the endpoints defined in the above example to the `relationships` property of the `.magento.app.yaml` file. For example:
+Add the endpoints defined in the above example to the `relationships` property of the `.magento.app.yaml` file. For example:
 
 ```yaml
 relationships:
@@ -103,13 +103,17 @@ relationships:
 ```
 
 {:.bs-callout-info}
-If you configure one MySQL user, you cannot use the [`DEFINER`](http://dev.mysql.com/doc/refman/5.6/en/show-grants.html) access control mechanism for stored procedures and views.
+If you configure one MySQL user, you cannot use the [`DEFINER`](https://dev.mysql.com/doc/refman/5.6/en/show-grants.html) access control mechanism for stored procedures and views.
 
 ## Connect to the database
 
-Accessing the MariaDB database directly requires you to use a SSH to log in to the remote server, and connect to the database.
+Accessing the MariaDB database directly requires you to use a SSH to log in to the remote Cloud environment, and connect to the database.
 
-1. Log in to the remote server using SSH.
+1. Use SSH to log in to the remote environment.
+
+   ```bash
+   magento-cloud ssh
+   ```
 
 1. Retrieve the MySQL login credentials from the `database` and `type` properties in the [$MAGENTO_CLOUD_RELATIONSHIPS]({{ site.baseurl }}/cloud/project/magento-app-properties.html#relationships) variable.
 
@@ -147,7 +151,7 @@ Accessing the MariaDB database directly requires you to use a SSH to log in to t
    ],
    ```
 
-1. Connect to the database:
+1. Connect to the database.
 
    -  For Starter, use the following command:
 
@@ -161,13 +165,16 @@ Accessing the MariaDB database directly requires you to use a SSH to log in to t
       mysql -h <hostname> -P <number> -u <username> -p'<password>'
       ```
 
+{:.bs-callout-tip}
+You can use the `magento-cloud db:sql` command to connect to the remote database and run SQL commands.
+
 ## Connect to secondary database
 
-In some cases, you might need to connect to the secondary database, for example to improve database performance or resolve database locking issues. If this configuration is required, use `"port" : 3304` to establish the connection. See the [{{ site.data.var.ece }} database best practice](https://support.magento.com/hc/en-us/articles/360049045351) article in the _{{site.data.var.ee}} Help Center_.
+Sometimes, you have to connect to the secondary database to improve database performance or resolve database locking issues. If this configuration is required, use `"port" : 3304` to establish the connection. See the [{{ site.data.var.ece }} database best practice](https://support.magento.com/hc/en-us/articles/360049045351) article in the _{{site.data.var.ee}} Help Center_.
 
 ## Troubleshooting
 
-See the following {{site.data.var.ee}} Support articles for help troubleshooting MySQL problems:
+See the following {{site.data.var.ee}} Support articles for help with troubleshooting MySQL problems:
 
 -  [Checking slow queries and processes MySQL](https://support.magento.com/hc/en-us/articles/360030903091-Checking-slow-queries-and-processes-MySQL-)
 -  [Create database dump on Cloud](https://support.magento.com/hc/en-us/articles/360003254334-Create-database-dump-on-Cloud)

src/contributor-guide/contributing.md

@@ -20,7 +20,7 @@ The Community Engineering Team reviews all issues and contributions submitted by
 When the Community Engineering Team works on reviewing the suggested changes, we will add a label to the issue to indicate certain information, like the status or who is working the issue. See [Labels](#labels) to learn more.
 
 {:.bs-callout-tip}
-Refer to [Magento Contributor Agreement](http://www.magento.com/legaldocuments/mca) for detailed information about the License Agreement. All contributors are required to submit a click-through form to agree to the terms.
+Refer to the [Adobe Contributor Agreement](https://opensource.adobe.com/cla.html) for detailed information about the License Agreement. All contributors are required to submit a click-through form to agree to the terms.
 
 ## Community Backlog Priority {#backlog}
 
@@ -97,13 +97,13 @@ It helps maintainers decide:
 
 ## GitHub and two-factor authentication {#two-factor}
 
-Magento **requires all Partners** who contribute code to enable 2FA on their GitHub accounts. You can use a mobile device or 2FA application for added protection. See [Configuring two-factor authentication](https://help.github.com/en/articles/configuring-two-factor-authentication) in the GitHub help.
+Adobe **requires all Partners** who contribute code to enable 2FA on their GitHub accounts. You can use a mobile device or 2FA application for added protection. See [Configuring two-factor authentication](https://help.github.com/en/articles/configuring-two-factor-authentication) in the GitHub help.
 
 We also recommend creating a personal access token for your account to use when interacting with GitHub in scripts and on the command line. See [Creating a personal access token for the command line](https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line) in the GitHub help.
 
 ## Questions or enhancement requests? {#question}
 
-We capture code-related issues in the [Magento 2 repo](https://github.com/magento/magento2) and documentation-related issues in the [Magento DevDocs repo](https://github.com/magento/devdocs). If you have questions about Magento functionality or processes, we recommend posting them to a question-and-answer site, such as [Stack Exchange](https://magento.stackexchange.com/) and the [Magento Forums](https://community.magento.com/), where Magento community members can quickly provide recommendations and advice.
+We capture code-related issues in the [Magento 2 repo](https://github.com/magento/magento2) and documentation-related issues in the [DevDocs repo](https://github.com/magento/devdocs). If you have questions about Magento functionality or processes, we recommend posting them to a question-and-answer site, such as [Stack Exchange](https://magento.stackexchange.com/) and the [Magento Forums](https://community.magento.com/), where Magento community members can quickly provide recommendations and advice.
 
 Submit feature requests or enhancement suggestions to the [Magento 2 Feature Requests and Improvements forum](https://community.magento.com/t5/Magento-2-Feature-Requests-and/idb-p/feature-requests). For details about how requests are managed, see [Improvements to GitHub Management](https://community.magento.com/t5/News-Announcements/Improvements-to-GitHub-Management/m-p/44572#M96).
 
@@ -117,8 +117,8 @@ Review the following supported and accepted pull request rules. We defined these
 
 ## Contribution requirements {#requirements}
 
-1. Contributions must adhere to [Magento coding standards]({{ site.gdeurl }}/coding-standards/bk-coding-standards.html).
-1. Refer to the Magento development team's [Definition of Done]({{ site.baseurl }}/contributor-guide/contributing_dod.html). We use these guidelines internally to ensure that we deliver well-tested, well-documented, and solid code. We encourage you to use this as well!
+1. Contributions must adhere to the [coding standards]({{ site.gdeurl }}/coding-standards/bk-coding-standards.html).
+1. Refer to the [Definition of Done]({{ site.baseurl }}/contributor-guide/contributing_dod.html). We use these guidelines internally to ensure that we deliver well-tested, well-documented, and solid code. We encourage you to use this as well!
 1. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances that a pull request is merged quickly and without additional clarification requests.
 1. Commits must be accompanied by meaningful commit messages.
 1. PRs that include bug fixes must be accompanied by a step-by-step description of how to reproduce the bug.
@@ -131,7 +131,7 @@ Review the following supported and accepted pull request rules. We defined these
 
 ## Forks and pull requests
 
-For complete information about contributing to Magento projects, see the [Beginner Guides](https://github.com/magento/magento2/wiki/Getting-Started) on the Magento 2 repository. These guides help you:
+For complete information about contributing to Magento Open Source projects, see the [Beginner Guides](https://github.com/magento/magento2/wiki/Getting-Started) on the Magento 2 repository. These guides help you:
 
 -  Select an issue to work on and self-assign
 -  Fork a repository
@@ -402,7 +402,7 @@ Stating preconditions is very important. Provide information on:
 
 Example:
 
-1. Magento CE 2.0.0 without sample data is installed.
+1. Magento Open Source 2.0.0 without sample data is installed.
 1. PayPal payment method is set up.
 1. Test category is set up.
 1. Virtual Product is created and assigned to the Test Category.

src/guides/v2.4/graphql/caching.md

@@ -5,6 +5,8 @@ title: GraphQL caching
 
 Magento can cache pages rendered from the results of certain GraphQL queries with [full-page caching]({{page.baseurl}}/extension-dev-guide/cache/page-caching.html). Full-page caching improves response time and reduces the load on the server. Without caching, each page might need to run blocks of code and retrieve large amounts of information from the database. Only queries submitted with an HTTP GET operation can be cached. POST queries cannot be cached.
 
+The GraphQL schema is cached in the Configuration cache, which can be refreshed from the Cache Management page (**System** > **Tools** > **Cache Management**).
+
 ## Cached and uncached queries
 
 The definitions for some queries include cache tags. Full page caching uses these tags to keep track of cached content. They also allow public content to be invalidated. Private content invalidation is handled on the client side.

src/live-search/install.md

@@ -2,11 +2,11 @@
 group: live-search
 title: Install Live Search
 ee_only: True
-redirect_from: 
-  - /live-search/config-connect.html
+redirect_from: /live-search/config-connect.html
+redirect_to: https://docs.magento.com/user-guide/live-search/install.html
 ---
 
-Live Search is a set of standalone meta packages that replaces standard {{site.data.var.ce}} and {{site.data.var.ee}} search capabilities.  This topic provides instructions to do the following:
+Live Search is a set of standalone meta packages that replaces standard {{site.data.var.ce}} and {{site.data.var.ee}} search capabilities. This topic provides instructions to do the following:
 
 -  [Installing Live Search](#before-you-begin) (Methods 1 and 2)
 -  [Updating Live Search](#updating-live-search)