Merge branch 'master' into hg-cloudfixes

hguthrie · web-flow · commit 75529891509e · 2021-12-09T16:24:42.000-06:00
diff --git a/src/_data/toc/live-search.yml b/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
diff --git a/src/_data/toc/page-builder.yml b/src/_data/toc/page-builder.yml
@@ -90,8 +90,8 @@ pages:
           url: /page-builder/docs/content-types/create/add-icon.html
           versionless: true
 
-        - label: Workflow tips
-          url: /page-builder/docs/content-types/create/Troubleshooting.html
+        - label: Troubleshooting
+          url: /page-builder/docs/content-types/create/troubleshooting.html
           versionless: true
 
     - label: 'Customize'
diff --git a/src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-2.png b/src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-2.png
diff --git a/src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-3.png b/src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-3.png
diff --git a/src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-4.png b/src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-4.png
diff --git a/src/common/images/phpstorm/built-in-uct/uct-inspections-settings.png b/src/common/images/phpstorm/built-in-uct/uct-inspections-settings.png
diff --git a/src/contributor-guide/contributing.md b/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.
diff --git a/src/guides/v2.3/ext-best-practices/phpstorm/built-in-upgrade-compatibility-tool.md b/src/guides/v2.3/ext-best-practices/phpstorm/built-in-upgrade-compatibility-tool.md
@@ -6,22 +6,11 @@ functional_areas:
 ---
 
 The built-in Upgrade Compatibility Tool aims to achieve the same issues coverage as original Adobe Commerce [Upgrade Compatibility Tool]({{site.baseurl}}/upgrade-compatibility-tool/introduction.html).
-There are issues that covered by this MVP version:
-
-| Code | Name |
-| ----- | ------ |
-| 1131 | extending from @deprecated class |
-| 1132 | importing @deprecated class |
-| 1332 | importing @deprecated interface |
-| 1134 | using @deprecated class |
-| 1334 | using @deprecated interface |
-| 1234 | using @deprecated constant |
-| 1534 | using @deprecated property |
-| 1235 | overriding @deprecated constant |
-| 1535 | overriding @deprecated property |
-| 1337 | inherited from @deprecated interface |
-| 1338 | implemented @deprecated interface |
-| 1439 | call @deprecated method |
+There are three types of inspections covered by this MVP version:
+
+*  Deprecation (severity level: WARNING)
+*  API coverage (severity level: ERROR)
+*  Existence (severity level: CRITICAL)
 
 A complete list of inspections that are already available in the original tool, can be found by the [following link]({{site.baseurl}}/upgrade-compatibility-tool/errors.html).
 
@@ -41,6 +30,9 @@ It allows you to see the problematic code just in real time, without running it
 **The result of the real time inspection is most suitable for use during development, to be always compatible with future versions**:
 
 ![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting.png)
+![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-2.png)
+![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-3.png)
+![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-4.png)
 
 The second IntelliJ IDEA tool that we can use for running UCT inspections is called **Inspect Code**. It is available under menu item
 `Code -> Inspect Code`. Also, you can open a context menu under the target directory that allows IntelliJ IDEA to populate the path to analyse for you automatically:
diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/layout-override.md b/src/guides/v2.3/frontend-dev-guide/layouts/layout-override.md
@@ -7,7 +7,7 @@ functional_areas:
 
 ## What's in this topic {#fedg_layout_override_overview}
 
-Not all layout customizations can be performed by [extending layouts]. If the amount of customizations is large, you can use the overriding function for the needed layout file. This means that the new file that you place in the theme will be used instead of the parent [theme] layout file of [base] layout file.
+Not all layout customizations can be performed by [extending layouts]. If the amount of customizations is large, you can use the overriding function for the needed layout file. This means that the new file that you place in the theme will be used instead of the parent [theme] layout file or [base] layout file.
 
 In this article, [page layouts], [page configurations], and [generic layouts] are referred to as *layout files*, as the mechanism of overriding is similar for all of them.
 
diff --git a/src/guides/v2.4/extension-dev-guide/routing.md b/src/guides/v2.4/extension-dev-guide/routing.md
@@ -71,7 +71,7 @@ define the `match()` function in this class to use your own route matching logic
 
 If you need route configuration data, use the Route [`Config`] class.
 
-To add your custom router to the list of routers for the `FrontController`, add the following entry in your module's `di.xml` file:
+To add your custom router to the list of routers for the `FrontController`, add the following entry in your module's `frontend/di.xml` file:
 
 ```xml
 <type name="Magento\Framework\App\RouterList">
diff --git a/src/guides/v2.4/graphql/caching.md b/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.
diff --git a/src/live-search/install.md b/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)
diff --git a/src/live-search/overview.md b/src/live-search/overview.md
@@ -17,4 +17,4 @@ Live Search is deployed as a service. The {{site.data.var.ee}} side includes hos
 ![Live Search architecture diagram]({{ page.baseurl }}/live-search/images/architecture-diagram.svg)
 _Live Search architecture_
 
-After the Live Search module (with catalog modules as dependencies) is installed and configured, {{site.data.var.ee}} begins sharing search and catalog data with SaaS services. At this point, Admin users can set up, customize, and manage search facets, synonyms, and merchandising rules.
+After the Live Search module (with catalog modules as dependencies) is [installed and configured]({{ site.user_guide_url }}/live-search/install.html), {{site.data.var.ee}} begins sharing search and catalog data with SaaS services. At this point, Admin users can set up, customize, and manage search facets, synonyms, and merchandising rules.
diff --git a/src/live-search/release-notes.md b/src/live-search/release-notes.md
@@ -2,6 +2,7 @@
 group: live-search
 title: Live Search Release Notes
 ee_only: True
+redirect_to: https://docs.magento.com/user-guide/live-search/release-notes.html
 ---
 
 These release notes describe the latest versions of Live Search and include:
@@ -55,5 +56,4 @@ To learn more:
 
 -  [{{site.data.var.ee}} Developer Documentation]({{ site.baseurl }}/live-search/overview.html)
 -  [{{site.data.var.ee}} User Guide]({{ site.user_guide_url }}/live-search/overview.html)
--  [Support Knowledge Base](https://support.magento.com/hc/en-us)
 -  [Live Search on Marketplace](https://marketplace.magento.com/magento-live-search.html)
diff --git a/src/live-search/storefront-popover.md b/src/live-search/storefront-popover.md
@@ -3,7 +3,7 @@ group: live-search
 title: Storefront Popover
 ee_only: True
 ---
-When Live Search is installed, a popover appears in the storefront as shoppers type in the [Search]({{ site.user_guide_url }}/catalog/search-quick.html) box. With each character typed, the popover is updated with suggested products and thumbnail images of the top search results.
+When Live Search is [installed]({{ site.user_guide_url }}/live-search/install.html), a popover appears in the storefront as shoppers type in the [Search]({{ site.user_guide_url }}/catalog/search-quick.html) box. With each character typed, the popover is updated with suggested products and thumbnail images of the top search results.
 
 Live Search returns results for a query of two characters or more. For a partial match, the maximum number of characters per word is 20. The number of characters in a "search as you type" query is not configurable.
 
