Merge branch 'master' into hg-cloudservices

Author: hguthrie

src/_data/toc/configuration-guide.yml

@@ -156,6 +156,7 @@ pages:
 
         - label: Run the support utilities (Adobe Commerce only)
           url: /config-guide/cli/config-cli-subcommands-spt-util.html
+          edition: ee-only
 
     - label: Configuration files
       url: /config-guide/config/config-magento.html
@@ -186,6 +187,7 @@ pages:
 
             - label: B2B Extension configuration paths reference (Adobe Commerce only)
               url: /config-guide/prod/config-reference-b2b.html
+              edition: b2b-only
 
             - label: .gitignore reference
               url: /config-guide/prod/config-reference-gitignore.html
@@ -356,6 +358,7 @@ pages:
 
     - label: Split database performance solution (Adobe Commerce only)
       url: /config-guide/multi-master/multi-master.html
+      edition: ee-only
       children:
 
         - label: Automatically configure master databases

src/_data/toc/live-search.yml

@@ -42,6 +42,10 @@ pages:
       url: /live-search/product-search.html
       versionless: true
 
+- label: Events
+  url: /live-search/events.html
+  versionless: true
+
 - label: Release Notes
   url: /live-search/release-notes.html
   versionless: true

src/_data/toc/php-developer-guide.yml

@@ -315,6 +315,9 @@ pages:
         - label: CSRF
           url: /extension-dev-guide/security/csrf.html
 
+        - label: Working with files
+          url: /extension-dev-guide/security/uploads.html
+
     - label: Versioning
       url: /extension-dev-guide/versioning/
       children:

src/_data/whats-new.yml

@@ -4,8 +4,44 @@ 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: Mon Aug 30 16:00:00 2021
+updated: Tue Sep 7 21:38:19 2021
 entries:
+- description: Added a new [file upload security](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/security/uploads.html)
+    topic.
+  versions: 2.3.x, 2.4.x
+  type: New Topic
+  date: September 3, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2500
+  merge_commit: 883f3b77234ad01ed752284f3f9a3559141f409e
+  contributor: AlexMaxHorkun
+  membership: true
+  labels:
+  - New Topic
+  - 2.3.x
+  - 2.4.x
+- description: An overview of [Storefront Events SDK](https://devdocs.magento.com/live-search/events.html)
+    with a summary of search-related collector functions.
+  versions: 2.4.x
+  type: New Topic
+  date: September 3, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2508
+  merge_commit: 2c5c88524c3ae63145e8bda66e10812fe94c2138
+  contributor: ccondra
+  membership: true
+  labels:
+  - New Topic
+  - 2.4.x
+- description: Updated the [Module Reference Guide](https://devdocs.magento.com/guides/v2.4/mrg/intro.html).
+  versions: 2.4.3
+  type: Major Update
+  date: September 2, 2021
+  link: https://github.com/magento-commerce/devdocs/pull/2501
+  merge_commit: 52a9f4a4bae0d5737fc719740b2e5893cc1adcc3
+  contributor: dshevtsov
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.3
 - description: Added [Community quality patches release notes](https://github.com/magento/quality-patches/blob/master/community-release-notes.md)
     to a table of contents at [Commerce Quality Patches](https://devdocs.magento.com/guides/v2.4/comp-mgr/patching/mqp.html).
   versions: 2.x

src/_includes/compatibility-mde.html

@@ -6,8 +6,7 @@
 
 **Supported**{: .status-light.supported } – version that has been fully tested by Adobe and is supported.
 
-**Compatible**{: .status-light.compatible } – version that is confirmed to be compatible with Adobe Commerce or Magento
-Open Source, but is not supported.
+**Compatible**{: .status-light.compatible } – version that is confirmed to be compatible with {{site.data.var.ee}} or {{site.data.var.ce}}, but is not supported.
 
 **Not supported**{: .status-light.not-supported } - version that is not compatible with a Commerce or Magento release.
 

src/_includes/compatibility-vbe.md

@@ -9,7 +9,7 @@
 
 <!-- **Compatible**{: .status-light.compatible } – independent release version that has not been fully tested by Magento, but is confirmed to be compatible. -->
 
-**Not supported**{: .status-light.not-supported } - version that is not compatible with an Adobe Commerce or Magento Open Source release.
+**Not supported**{: .status-light.not-supported } - version that is not compatible with an {{site.data.var.ee}} or {{site.data.var.ce}} release.
 
 <table class="compatibility-table">
   <thead>

src/_includes/home/intro.html

@@ -1,6 +1,6 @@
 <section class="home-intro">
   <div class="container">
-    <h1 class="spectrum-Heading1 spectrum-Heading--XXL">Adobe Commerce {{ page.guide_version }} Developer Guide</h1>
+    <h1 class="spectrum-Heading1 spectrum-Heading--XXL">{{site.data.var.ee}} {{ page.guide_version }} Developer Guide</h1>
     <p class="lead">Everything you need to build and manage a customized Commerce store.</p>
 
     {% include layout/search-form.html %}

src/_includes/install/composer-overview.md

@@ -3,7 +3,7 @@ We use [Composer](https://getcomposer.org/) to manage Magento components and the
 -  Reuse third-party libraries without bundling them with source code
 -  Reduce extension conflicts and compatibility issues by using a component-based architecture with robust dependency management
 -  Adhere to [PHP-Framework Interoperability Group (FIG)](https://www.php-fig.org/) standards
--  Repackage Magento Open Source with other components
+-  Repackage {{site.data.var.ce}} with other components
 -  Use the Magento software in a production environment
 
 {:.bs-callout-info}