Merge branch 'master' into cloud-packages-november-release

Author: maeker12

Docfile.yml

@@ -13,7 +13,7 @@ content_map:
 -
   directory: src/mftf/v2
   repository: magento/magento2-functional-testing-framework
-  branch: 2.6.5
+  branch: 2.x-develop
   filter: true
 -
   directory: src/page-builder

src/_data/mde.yml

@@ -310,7 +310,7 @@ extensions:
     name: Product Recommendations
     versions:
       -
-        name: 3.0.8
+        name: 3.10.0
         support:
           2.3.0: supported
           2.3.1: supported
@@ -321,18 +321,30 @@ extensions:
           2.3.6: supported
           2.4.0: supported
           2.4.1: supported
+      -
+        name: 3.0.8
+        support:
+          2.3.0: compatible
+          2.3.1: compatible
+          2.3.2: compatible
+          2.3.3: compatible
+          2.3.4: compatible
+          2.3.5-p1: compatible
+          2.3.6: compatible
+          2.4.0: compatible
+          2.4.1: compatible
       -
         name: 3.0.6
         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
+          2.3.0: compatible
+          2.3.1: compatible
+          2.3.2: compatible
+          2.3.3: compatible
+          2.3.4: compatible
+          2.3.5-p1: compatible
+          2.3.6: compatible
+          2.4.0: compatible
+          2.4.1: compatible
       -
         name: 3.0.5
         support:
@@ -368,7 +380,7 @@ extensions:
           2.3.5-p1: compatible
           2.3.6: compatible
           2.4.0: not supported
-          2.4.1: compatible
+          2.4.1: not supported
       -
         name: 3.0.2
         support:
@@ -380,7 +392,7 @@ extensions:
           2.3.5-p1: compatible
           2.3.6: compatible
           2.4.0: not supported
-          2.4.1: compatible
+          2.4.1: not supported
       -
         name: 3.0.1
         support:
@@ -392,7 +404,7 @@ extensions:
           2.3.5-p1: compatible
           2.3.6: compatible
           2.4.0: not supported
-          2.4.1: compatible
+          2.4.1: not supported
       -
         name: 3.0.0
         support:

src/_data/toc/configuration-guide.yml

@@ -115,6 +115,9 @@ pages:
         - label: Dependency reports
           url: /config-guide/cli/config-cli-subcommands-depen.html
 
+        - label: Catalog sync
+          url: /config-guide/cli/config-cli-subcommands-catalog-sync.html
+
         - label: Configuration management
           children:
 

src/_data/toc/installation-guide.yml

@@ -6,6 +6,9 @@ pages:
     - label: Installation flow diagram
       url: /install-gde/install-flow-diagram.html
 
+    - label: Magento system requirements
+      url: /install-gde/system-requirements.html
+
     - label: Just the basics
       children:
 
@@ -42,25 +45,6 @@ pages:
             - label: Installation roadmap (reference)
               url: /install-gde/install-roadmap_part1.html
 
-        - label: Magento system requirements
-          url: /install-gde/system-requirements.html
-          children:
-
-            - label: Magento technology stack requirements
-              url: /install-gde/system-requirements-tech.html
-
-            - label: Supported browsers
-              url: /install-gde/system-requirements_browsers.html
-
-            - label: Transport Layer Security (TLS) requirements
-              children:
-
-                - label: TLS 1.2 requirement for PayPal
-                  url: /install-gde/system-requirements_tls1-2.html
-
-                - label: TLS requirement for repo.magento.com
-                  url: /install-gde/system-requirements_repo-tls1-2.html
-
         - label: Prerequisites
           url: /install-gde/prereq/prereq-overview.html
           children:

src/_data/toc/product-recommendations.yml

@@ -4,6 +4,10 @@ pages:
   url: /recommendations/product-recs.html
   versionless: true
 
+- label: How to Implement Product Recommendations
+  url: /recommendations/implementation.html
+  versionless: true
+
 - label: Install and Configure Recommendations
   url: /recommendations/install-configure.html
   versionless: true