magento
diff --git a/‎.github/CONTRIBUTING.md‎
Lines changed: 2 additions & 3 deletions b/‎.github/CONTRIBUTING.md‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎Gemfile.lock‎
Lines changed: 2 additions & 2 deletions b/‎Gemfile.lock‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎_config.yml‎
Lines changed: 1 addition & 1 deletion b/‎_config.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/_data/codebase/v2_4/mrg/b2b/RequisitionList.yml‎
Lines changed: 1 addition & 1 deletion b/‎src/_data/codebase/v2_4/mrg/b2b/RequisitionList.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/_data/mde.yml‎
Lines changed: 12 additions & 0 deletions b/‎src/_data/mde.yml‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎src/_data/whats-new.yml‎
Lines changed: 1 addition & 1 deletion b/‎src/_data/whats-new.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/_includes/layout/site-nav.html‎
Lines changed: 1 addition & 1 deletion b/‎src/_includes/layout/site-nav.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/cloud/architecture/cloud-architecture.md‎
Lines changed: 2 additions & 2 deletions b/‎src/cloud/architecture/cloud-architecture.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/cloud/cdn/fastly-vcl-allowlist.md‎
Lines changed: 1 addition & 1 deletion b/‎src/cloud/cdn/fastly-vcl-allowlist.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/cloud/docker/docker-development.md‎
Lines changed: 16 additions & 0 deletions b/‎src/cloud/docker/docker-development.md‎
Lines changed: 16 additions & 0 deletions
@@ -46,7 +46,7 @@ The following diagram shows the contribution workflow:
 
    In general, you should use `master` as the base branch when creating a PR. If your contribution is related to a release that is in progress, use a version-specific integration branch, such as `develop`.
 
-1. Complete the pull request template.
+1. Complete the pull request template. Review the [Pull Request Process page](https://github.com/magento/devdocs/wiki/Pull-Request-Process) to learn how to complete a PR (with info about completing the template, adding a `whatsnew`, and more.)
 
     **We will close your pull request if you do not complete the template.**
 
@@ -63,7 +63,7 @@ The following guidelines may answer most of your questions and help you get star
 -  Write content using Markdown. See the [Templates](#templates) section for examples.
 -  Review existing [pull requests](https://github.com/magento/devdocs/pulls) and [issues](https://github.com/magento/devdocs/issues) to avoid duplicating work.
 -  For large contributions, or changes that include multiple files, [open an issue](#report-an-issue) and discuss it with us first. This helps prevent duplicate or unnecessary work.
--  Do not make global find-and-replace changes without first creating an issue and discussing it with us. Global changes can have unintended consequences.
+-  Do not make global find-and-replace changes without first [creating an issue](https://github.com/magento/devdocs/issues/new/choose) and discussing it with us. Global changes can have unintended consequences.
 -  Do not make changes to content in the [`_data/codebase`](https://github.com/magento/devdocs/tree/master/src/_data/codebase) directory, which contains auto-generated data from Magento source code. Any manual changes will be lost when the file regenerates.
 -  Combine multiple small changes (such as minor editorial and technical changes) into a single pull request. This helps us efficiently and effectively facilitate your contribution.
 -  Familiarize yourself with the organization and conventions of our existing documentation before creating a pull request. Changes that are consistent with our style and conventions have a higher acceptance rate.
@@ -110,7 +110,6 @@ We provide templates to help you get started writing new content and understandi
 The Markdown (.md) file's metadata is a set of YAML key-value pairs. The metadata section is located at the top of each file. For more info, see the [Basic Template](https://devdocs.magento.com/contributor-guide/templates/basic_template.html).
 
 ```yaml
-
 ---
 group:
 title:
 
@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: c96131acc7a0ed03629ab3401c8a64d819e7e610
+  revision: 0bd45b1e1816f5c94233c2c36403bc3242a6551a
   specs:
-    devdocs (12)
+    devdocs (14)
       jekyll (>= 4.0)
 
 GEM
 
@@ -3,7 +3,7 @@
 # For more details about available options and defaults, refer to https://jekyllrb.com/docs/configuration/
 #
 title: Magento 2 Developer Documentation
-logo: DevDocs
+logo: Magento DevDocs
 description: Magento 2 Developer Documentation.
 
 # the base protocol and domain
 
@@ -7,7 +7,7 @@ last_modified_at: '2017-02-15 17:02:23 +0300'
 content: "## Overview\n\nThe Magento_RequisitionList module allows a customer to create
   multiple lists of frequently-purchased items and use those lists for order placement.
   This feature is available for both logged-in users and guests.\n \nRequisitionList
-  functionality is similiar to wish lists, but it has the following differences: \n\n*
+  functionality is similar to wish lists, but it has the following differences: \n\n*
   A requisition list is not purged after sending items to the shopping cart. It can
   be used to place multiple orders.\n\n* The UI for requisition lists has been modified
   to a compact view in order to display large number of items. \n\nThe merchant can
 
@@ -309,6 +309,18 @@ extensions:
   -
     name: Product Recommendations
     versions:
+      -
+        name: 3.0.8
+        support:
+          2.3.0: supported
+          2.3.1: supported
+          2.3.2: supported
+          2.3.3: supported
+          2.3.4: supported
+          2.3.5-p1: supported
+          2.3.6: supported
+          2.4.0: supported
+          2.4.1: supported
       -
         name: 3.0.6
         support:
 
@@ -526,7 +526,7 @@ entries:
   contributor: jeff-matthews
   profile: https://github.com/jeff-matthews
 - description: Standardized [release terminology](https://devdocs.magento.com/release/policy/)
-    related to patch releases, hotfixes, invdividual fixes, and custom patches.
+    related to patch releases, hotfixes, individual fixes, and custom patches.
   versions: 2.4.0
   type: Major Update
   date: July 27, 2020
 
@@ -15,7 +15,7 @@
 
     <a class="logo" href="{% if page.guide_version == site.version or page.guide_version == nil %}{{ site.baseurl }}{% else %}{{ page.baseurl }}{% endif %}/">
       <img class="logo-image" src="{{ site.baseurl }}/assets/i/adobe-a.svg" alt="Adobe">
-      <span class="logo-text">Magento</span>
+      <span class="logo-text">Adobe</span>
       <span class="site-logo">{{ site.logo }}</span>
     </a>
 
 
@@ -55,7 +55,7 @@ For comparison, each plan includes the following infrastructure features and sup
           <li>
             <a href="{{ site.baseurl }}/cloud/project/new-relic.html">New Relic</a> Infrastructure on Production + APM (Performance Monitoring) on Staging and Production. The <a href="{{ site.baseurl }}/cloud/project/new-relic.html#monitor-performance-with-managed-alerts">Managed alerts for {{ site.data.var.ee }} policy</a> implements monitoring best practices to proactively notify you about application and infrastructure issues affecting site performance.
           </li>
-          <li>Platform-as-a-service (PaaS) based Integration development environments (8 total active environments) optimized for {{site.data.var.ee}}</li>
+          <li>Platform-as-a-service (PaaS) based Integration development environments (2 total active environments) optimized for {{site.data.var.ee}}</li>
           <li>Infrastructure-as-a-Service (IaaS)—dedicated virtual infrastructure for Production environments and for Staging environments</li>
         </ul>
       </td>
@@ -107,6 +107,6 @@ The [Starter plan architecture]({{ site.baseurl }}/cloud/architecture/starter-ar
 The [Pro plan architecture]({{ site.baseurl }}/cloud/architecture/pro-architecture.html) has a global master with three environments:
 
 -  **Integration**—The Integration environment provides a testable environment that includes a database, web server, caching, some services, environment variables, and configurations. You can develop, deploy, and test your code before merging to the Staging environment.
-   -  _Inactive_—You can have an unlimited number of inactive branches based on the Integration environment.
+   -  _Inactive_—You can have an unlimited number of inactive branches based on the Integration environment, but only one active branch (not including Integration itself).
 -  **Staging**—The Staging environment is for pre-Production testing and includes a database, web server, caching, third-party services, environment variables, configurations, and services, such as Fastly.
 -  **Production**—The Production environment includes a three-node, high-availability architecture for your data, services, caching, and store. This is your live, public store environment with environment variables, configurations, and third-party services.
@@ -114,7 +114,7 @@ After reviewing and updating the code for your environment, use either of the fo
    -  Add the **VCL** snippet content:
 
       ```conf
-      if ((req.url ~ "^/admin") && !(client.ip ~ allowlist) && !req.http.Fastly-FF) { error 403 "Forbidden"}
+      if ((req.url ~ "^/admin") && !(client.ip ~ allowlist) && !req.http.Fastly-FF) { error 403 "Forbidden";}
       ```
 
 1. Click **Create** to generate the VCL snippet file with the name pattern `type_priority_name.vcl`, for example `recv_5_allowlist.vcl`
 
@@ -40,7 +40,23 @@ You can use the Docker environment to emulate the {{site.data.var.ece}} Integrat
 -  [Docker architecture and common commands]({{site.baseurl}}/cloud/docker/docker-containers.html)
 -  [Launch Docker development environment]({{site.baseurl}}/cloud/docker/docker-config.html)
 
+## Getting support for {{site.data.var.mcd-prod}}
+
+{{site.data.var.mcd-prod}} is a Magento Community Engineering project supported by the Magento developer community. You have several options to get support and learn more about {{site.data.var.mcd-prod}} and Magento local development.
+
+-  **[Magento Community Engineering Slack organization]**–For support, questions, or discussion, chat with us in the **#cloud-docker** and **#cloud** channels. To join, send a request to _[email protected]_ or [sign yourself up] using Slack.
+
+-  **[{{site.data.var.mcd-package}} GitHub repository]**–Visit the GitHub repository to read discussions about current issues, check current development, and submit issues or pull requests to improve the project.
+
+-  **Magento Cloud Community Engineering demos**–Magento hosts Cloud demo session where you can learn about developing Magento on the Cloud platform, including information about local development with {{site.data.var.mcd-prod}}. For a schedule and recordings of previous demos, see the [Magento Cloud Community Engineering Demo Schedule].
+
+<!--Link definitions-->
+
 [config docker]: {{site.baseurl}}/cloud/docker/docker-config.html
 [Magento authentication keys]: {{site.baseurl}}/guides/v2.3/install-gde/prereq/connect-auth.html
+[Magento Community Engineering Slack organization]: https://magentocommeng.slack.com/
 [Set up an account]: {{site.baseurl}}/cloud/before/before-workspace.html#newaccount
+[sign yourself up]: https://tinyurl.com/engcom-slack
+[Magento Cloud Community Engineering demo schedule]: https://spark.adobe.com/page/PbxJoujH7oRTc/
+[{{site.data.var.mcd-package}} GitHub repository]: https://github.com/magento/magento-cloud-docker
 [Resolve issues with encryption key]: {{site.baseurl}}/cloud/trouble/trouble-crypt-key-variable.html
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# For more details about available options and defaults, refer to https://jekyllrb.com/docs/configuration/`
`4`	`4`	`#`
`5`	`5`	`title: Magento 2 Developer Documentation`
`6`		`-logo: DevDocs`
	`6`	`+logo: Magento DevDocs`
`7`	`7`	`description: Magento 2 Developer Documentation.`
`8`	`8`
`9`	`9`	`# the base protocol and domain`