Merge branch 'master' into em_prex-relnotes322

Author: erikmarr

src/_data/vbe.yml

@@ -80,6 +80,19 @@ extensions:
           2.3.4: not supported
           2.3.5-p1: not supported
           2.4.0: 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/extensions/vendor/vendor.md

@@ -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%}

src/release/index.md

@@ -15,7 +15,7 @@ The following table provides the dates for scheduled releases in 2020 and 2021 (
 |---------------------|-------------------------------|-------------------------------------------|--------------------|----------------------|
 | 2020 Q3             | 2.4.0<br>2.3.5-p2             | June 8, 2020                              | None               | July 28, 2020        |
 | 2020 Q4             | 2.4.1<br>2.4.0-p1<br>2.3.6    | September 10, 2020<br>Available for 2.4.1 | October 1, 2020    | October 15, 2020     |
-| 2021 Q1             | 2.4.2<br>2.4.1-p1<br>2.3.6-p1 | December 17, 2021                         | January 26, 2021   | February 9, 2021     |
+| 2021 Q1             | 2.4.2<br>2.4.1-p1<br>2.3.6-p1 | December 17, 2020                         | January 26, 2021   | February 9, 2021     |
 | 2021 Q2<sup>1</sup> | 2.4.2-p1<br>2.3.7             | April 6, 2021                             | April 27, 2021     | May 11, 2021         |
 | 2021 Q3<sup>2</sup> | 2.4.3<br>2.4.2-p2<br>2.3.7-p1 | July 6, 2021                              | July 27, 2021      | August 10, 2021      |
 | 2021 Q4<sup>3</sup> | 2.4.3-p1<br>2.3.7-p2          | None                                      | September 28, 2021 | October 12, 2021     |