Merge branch 'master' into 2.4.2-develop

Author: magento-docs

.github/ISSUE_TEMPLATE/NEW_FEATURE.md

@@ -36,4 +36,3 @@ Issues that do not comply with our Code of Conduct or do not contain enough info
 
 Feel free to remove this section before creating this issue.
 -->
-

.github/workflows/linter.yml

@@ -19,10 +19,6 @@ on:
     branches:
       - master
       - 2.*-develop
-    paths-ignore:
-      - '**.md'
-      - '**.html'
-      - '**.xml'
 
 ###############
 # Set the Job #
@@ -54,4 +50,4 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: master
           VALIDATE_HTML: false
-          VALIDATE_MARKDOWN: false
+          MARKDOWN_CONFIG_FILE: .markdownlint.json

_checks/html_check_hook.rb

@@ -33,7 +33,7 @@
     if url_ignore
       url_ignore.push(jekyll_excludes_as_regex).flatten!.uniq!
     else
-      checks_config['html-proofer'].merge!(url_ignore: jekyll_excludes_as_regex)
+      checks_config['html-proofer'][:url_ignore] = jekyll_excludes_as_regex
     end
 
     # Read configuration options for html-proofer

src/_data/mde.yml

@@ -310,7 +310,7 @@ extensions:
     name: Product Recommendations
     versions:
       -
-        name: 3.10.0
+        name: 3.2.1
         support:
           2.3.0: supported
           2.3.1: supported
@@ -321,6 +321,18 @@ extensions:
           2.3.6: supported
           2.4.0: supported
           2.4.1: supported
+      -
+        name: 3.10.0
+        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.8
         support:

src/_data/toc/how-do-i.yml

@@ -55,3 +55,6 @@ pages:
 
       - label: Customize the list of shipping methods
         url: /howdoi/checkout/checkout_shipping_methods.html
+
+  - label: Customize Magento Admin design
+    url: /howdoi/admin/customize_admin.html

src/_data/vbe.yml

@@ -120,6 +120,19 @@ extensions:
           2.4.0: not supported
           2.4.1: not supported
           2.4.2: not supported
+  -
+    name: Braintree
+    versions:
+      -
+        name: 4.1.0
+        support:
+          2.3.0: not supported
+          2.3.1: not supported
+          2.3.2: not supported
+          2.3.3: not supported
+          2.3.4: not supported
+          2.3.5-p1: not supported
+          2.4.0: supported
   -
     name: dotdigital
     versions:

src/cloud/cdn/configure-fastly.md

@@ -209,7 +209,7 @@ To update your DNS configuration for development:
 
    -  Use the Magento CLI to change the base URL for your store.
 
-      ```
+      ```bash
       php bin/magento setup:store-config:set --base-url="https://mcstaging.your-domain.com/"
       ```
 

src/cloud/live/site-launch-checklist.md

@@ -77,7 +77,7 @@ To update DNS configuration for site launch:
 
    -  Use the Magento CLI to change the base URL for your store.
 
-      ```
+      ```bash
       php bin/magento setup:store-config:set --base-url="https://www.your-domain.com/"
       ```
 

src/common/images/design_conf2.png

@@ -8,11 +8,12 @@ Vendor Bundled Extensions (VBEs) are third-party extensions that we have thoroug
 
 Current VBEs include:
 
--  [Amazon Pay](https://docs.magento.com/m2/ce/user_guide/payment/amazon-pay.html)
--  [dotdigital](https://docs.magento.com/m2/ce/user_guide/marketing/engagement-cloud.html) (formerly Dotmailer)
--  [Klarna](https://docs.magento.com/m2/ce/user_guide/payment/klarna.html)
--  [Vertex](https://docs.magento.com/m2/ce/user_guide/tax/vertex.html)
--  [Yotpo](https://docs.magento.com/m2/ce/user_guide/marketing/yotpo-reviews-intro.html)
+-  [Amazon Pay](https://docs.magento.com/user-guide/payment/amazon-pay.html)
+-  [dotdigital](https://docs.magento.com/user-guide/marketing/engagement-cloud.html) (formerly Dotmailer)
+-  [Klarna](https://docs.magento.com/user-guide/payment/klarna.html)
+-  [Vertex](https://docs.magento.com/user-guide/tax/vertex.html)
+-  [Yotpo](https://docs.magento.com/user-guide/marketing/yotpo-reviews-intro.html)
+-  [Braintree](https://docs.magento.com/user-guide/payment/braintree.html) (formerly part of core Magento)
 
 {:.bs-callout-info}
 Installing or upgrading Magento also installs VBEs, but you may need to set up an account with a vendor to configure and use an extension.
@@ -21,4 +22,4 @@ Installing or upgrading Magento also installs VBEs, but you may need to set up a
 
 The following table shows VBE version compatibility with Magento:
 
-{% include compatibility-vbe.md data=site.data.vbe%}
+{% include compatibility-vbe.md data=site.data.vbe%}