Merge branch 'main' into flynn/versions

linkerd.io/assets/scss/styles.scss

@@ -368,6 +368,14 @@
       .enterprise-support__entry-content {
         order: 1;
       }
+      .enterprise-support__entry-description {
+        > * {
+          margin-bottom: 24px;
+        }
+        > :last-child {
+          margin-bottom: 0;
+        }
+      }
       .enterprise-support__entry-image {
         order: 2;
       }

linkerd.io/content/2-edge/tasks/multicluster.md

@@ -106,7 +106,7 @@ With a valid trust anchor and issuer credentials, we can install Linkerd on your
 
 ```bash
 # first, install the Linkerd CRDs in both clusters
-linkerd install --crds |
+linkerd install --crds \
   | tee \
     >(kubectl --context=west apply -f -) \
     >(kubectl --context=east apply -f -)

linkerd.io/content/2.12/tasks/multicluster.md

@@ -106,7 +106,7 @@ With a valid trust anchor and issuer credentials, we can install Linkerd on your
 
 ```bash
 # first, install the Linkerd CRDs in both clusters
-linkerd install --crds |
+linkerd install --crds \
   | tee \
     >(kubectl --context=west apply -f -) \
     >(kubectl --context=east apply -f -)

linkerd.io/content/2.13/tasks/multicluster.md

@@ -106,7 +106,7 @@ With a valid trust anchor and issuer credentials, we can install Linkerd on your
 
 ```bash
 # first, install the Linkerd CRDs in both clusters
-linkerd install --crds |
+linkerd install --crds \
   | tee \
     >(kubectl --context=west apply -f -) \
     >(kubectl --context=east apply -f -)

linkerd.io/content/2.14/tasks/multicluster.md

@@ -106,7 +106,7 @@ With a valid trust anchor and issuer credentials, we can install Linkerd on your
 
 ```bash
 # first, install the Linkerd CRDs in both clusters
-linkerd install --crds |
+linkerd install --crds \
   | tee \
     >(kubectl --context=west apply -f -) \
     >(kubectl --context=east apply -f -)

linkerd.io/content/enterprise/_index.md

@@ -7,13 +7,21 @@ layout: enterprise
 type: enterprise
 weight: 1
 top_hero:
-  title: Linkerd Enterprise Support and Training
+  title: Enterprise Support and Training
   description: "Linkerd was created by Buoyant and contributed to the Cloud Native Computing Foundation in 2017. It was the first service mesh to achieve graduated status, and today powers the critical production systems of enterprises around the world.\n\nHere, you'll find commercial products, support, and training for Linkerd."
 support:
-  - title: Enterprise Support
+  - title: Distributions
+    entries:
+      - title: Buoyant Enterprise for Linkerd
+        description: "From the creators of Linkerd. Rust-based network security and reliability for modern applications. Built on open source and designed for the enterprise.\n\n- Uniform encryption, authentication, and authorization across your network\n- Global application traffic management, cluster failover, and cost-aware routing\n- Full L7 visibility\n- FIPS compliant distribution"
+        image: /uploads/enterprise/buoyant.svg
+        button:
+          href: https://buoyant.io/enterprise-linkerd/
+          text: Learn more
+  - title: Support
     entries:
       - title: Enterprise support from Buoyant, creators of Linkerd
-        description: "- 24x7 Enterprise Support\n- FIPS compliant distribution\n- Support, training, architectural reviews, and more"
+        description: "- 24x7 Enterprise Support\n- Support, training, architectural reviews, and more"
         image: /uploads/enterprise/buoyant.svg
         button:
           href: https://buoyant.io/linkerd-support/

linkerd.io/layouts/partials/enterprise/support.html

@@ -13,7 +13,7 @@ <h2 class="title has-text-navy-black">{{ .title }}</h2>
               </div>
               <div class="column is-two-thirds-tablet is-three-quarters-widescreen enterprise-support__entry-content">
                 <h3 class="title has-text-navy-black mb-6">{{ .title }}</h3>
-                <div class="mb-6">{{ .description | markdownify }}</div>
+                <div class="mb-6 enterprise-support__entry-description">{{ .description | markdownify }}</div>
                 <a href="{{ .button.href }}" class="button is-link" target="_blank">
                   {{ .button.text }}
                 </a>