diff --git a/website/content/api-docs/catalog.mdx b/website/content/api-docs/catalog.mdx
index 5a4d56726a9..33cb1e21d8d 100644
--- a/website/content/api-docs/catalog.mdx
+++ b/website/content/api-docs/catalog.mdx
@@ -551,7 +551,7 @@ The table below shows this endpoint's support for
- `filter` `(string: "")` - Specifies the expression used to filter the
queries results prior to returning the data.
-- `peer` `(string: "")` - Specifies the imported service's peer. Applies only to imported services.
+- `peer` `(string: "")` - Specifies the name of the peer that exported the service. Does not apply when no cluster peering connections exist.
- `merge-central-config` - Include this flag in a request for `connect-proxy` kind or `*-gateway` kind
services to return a fully resolved service definition that includes merged values from the
diff --git a/website/content/commands/operator/usage.mdx b/website/content/commands/operator/usage.mdx
index 83ae028f6c9..3cd5446e6c9 100644
--- a/website/content/commands/operator/usage.mdx
+++ b/website/content/commands/operator/usage.mdx
@@ -105,7 +105,7 @@ Total 3
#### Command Options
-- `-all-datacenters` - Display service counts from all known datacenters.
+- `-all-datacenters` - Display service counts from all known federated datacenters.
Default is `false`.
- `-billable` - Display only billable service information. Default is `false`.
diff --git a/website/content/commands/snapshot/agent.mdx b/website/content/commands/snapshot/agent.mdx
index c642aee2a50..d374c343afb 100644
--- a/website/content/commands/snapshot/agent.mdx
+++ b/website/content/commands/snapshot/agent.mdx
@@ -396,9 +396,16 @@ These options cannot be used when using `backup_destinations` in a config file.
- `-azure-blob-container-name` - Container to use. Required for Azure blob storage, and setting this
disables local storage.
-* `-azure-blob-environment` - Environment to use. Defaults to AZUREPUBLICCLOUD. Other valid environments
+- `-azure-blob-environment` - Environment to use. Defaults to AZUREPUBLICCLOUD. Other valid environments
are AZURECHINACLOUD, AZUREGERMANCLOUD and AZUREUSGOVERNMENTCLOUD. Introduced in Consul 1.7.3.
+~> The following options were introduced in v1.20.1+ent.
+
+- `-azure-blob-service-principal-id` - The ID of the service principal that owns the blob object.
+- `-azure-blob-service-principal-secret` - The secret of the service principal that owns the blob object.
+
+- `-azure-blob-tenant-id` - The ID of the tenant that owns the Azure blob.
+
#### Google Cloud Storage options
~> This option is deprecated when used with a top-level `google_storage` object in a config file. Use `snapshot_agent -> backup_destinations -> google_storage[0]` in a config file instead.
diff --git a/website/content/docs/connect/index.mdx b/website/content/docs/connect/index.mdx
index 3662bb46017..3531850d87b 100644
--- a/website/content/docs/connect/index.mdx
+++ b/website/content/docs/connect/index.mdx
@@ -11,13 +11,7 @@ This page provides an overview of Consul's service mesh features and their confi
## Introduction
-
+
In addition to the service discovery operations available to the Consul instance
that runs on the same node as your workload, you can use Consul to deploy Envoy
diff --git a/website/content/docs/intro.mdx b/website/content/docs/intro.mdx
index 0beb7dbe22b..4c0ad1bb306 100644
--- a/website/content/docs/intro.mdx
+++ b/website/content/docs/intro.mdx
@@ -32,13 +32,9 @@ The core Consul workflow consists of the following stages:
Consul increases application resilience, bolsters uptime, accelerates application deployment, and improves security across service-to-service communications. HashiCorp co-founder and CTO Armon Dadgar explains how Consul solves networking challenges.
-
+
+
+To learn more about Consul and how it compares to similar products, refer to [Consul use cases](/consul/docs/use-case).
To learn more about Consul and how it compares to similar products, refer to [Consul use cases](/consul/docs/use-case).
diff --git a/website/content/docs/reference/proxy/envoy.mdx b/website/content/docs/reference/proxy/envoy.mdx
index 1a85ca3a24e..e0cefefd669 100644
--- a/website/content/docs/reference/proxy/envoy.mdx
+++ b/website/content/docs/reference/proxy/envoy.mdx
@@ -58,13 +58,7 @@ patch releases to ensure users can benefit from bug and security fixes in Envoy.
Unless otherwise noted, rows in the following compatibility table
apply to both Consul Enterprise and Consul community edition (CE).
-| Consul Version | Compatible Envoy Versions |
-| -------------- | -------------------------------------- |
-| 1.20.x CE | 1.31.x, 1.30.x, 1.29.x, 1.28.x |
-| 1.19.x CE | 1.29.x, 1.28.x, 1.27.x, 1.26.x |
-| 1.18.x CE | 1.28.x, 1.27.x, 1.26.x, 1.25.x |
-| 1.17.x | 1.27.x, 1.26.x, 1.25.x, 1.24.x |
-| 1.16.x | 1.26.x, 1.25.x, 1.24.x, 1.23.x |
+@include 'tables/compatibility/envoy/standard-release.mdx'
#### Enterprise Long Term Support releases
@@ -73,10 +67,7 @@ Active Consul Enterprise
releases expand their Envoy version compatibility window
until the LTS release reaches its end of maintenance.
-| Consul Version | Compatible Envoy Versions |
-| -------------- | -----------------------------------------------------------------------------------|
-| 1.18.x Ent | 1.29.x, 1.28.x, 1.27.x, 1.26.x, 1.25.x |
-| 1.15.x Ent | 1.29.x, 1.28.x, 1.27.x, 1.26.x, 1.25.x, 1.24.x, 1.23.x, 1.22.x |
+@include 'tables/compatibility/envoy/lts.mdx'
### Envoy and Consul Dataplane
@@ -106,13 +97,7 @@ the following differences with Consul dataplane compatibility:
Unless otherwise noted, rows in the following compatibility table
apply to both Consul Enterprise and Consul community edition (CE).
-| Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions |
-| -------------- | -------------------------------------|----------------------------------------------|
-| 1.20.x CE | 1.6.x (Envoy 1.31.x) | 1.5.x (Envoy 1.29.x) |
-| 1.19.x CE | 1.5.x (Envoy 1.29.x) | 1.4.x (Envoy 1.28.x) |
-| 1.18.x CE | 1.4.x (Envoy 1.28.x) | 1.3.x (Envoy 1.27.x) |
-| 1.17.x | 1.3.x (Envoy 1.27.x) | 1.4.x (Envoy 1.28.x), 1.2.x (Envoy 1.26.x) |
-| 1.16.x | 1.2.x (Envoy 1.26.x) | 1.3.x (Envoy 1.27.x), 1.1.x (Envoy 1.25.x) |
+@include 'tables/compatibility/consul-dataplane/standard-release.mdx'
#### Enterprise Long Term Support releases
@@ -121,10 +106,7 @@ Active Consul Enterprise
releases expand their Envoy version compatibility window
until the LTS release reaches its end of maintenance.
-| Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions |
-| -------------- | -------------------------------------|----------------------------------------------|
-| 1.18.x Ent | 1.4.x (Envoy 1.28.x) | 1.3.x (Envoy 1.27.x) |
-| 1.15.x Ent | 1.1.x (Envoy 1.26.x) | 1.4.x (Envoy 1.28.x) - 1.0.x (Envoy 1.24.x) |
+@include 'tables/compatibility/consul-dataplane/lts.mdx'
#### Consul dataplane releases that span Envoy major versions
diff --git a/website/content/partials/tables/compatibility/consul-dataplane/lts.mdx b/website/content/partials/tables/compatibility/consul-dataplane/lts.mdx
new file mode 100644
index 00000000000..8b56ca7d728
--- /dev/null
+++ b/website/content/partials/tables/compatibility/consul-dataplane/lts.mdx
@@ -0,0 +1,5 @@
+| Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions |
+| -------------- | -------------------------------------|----------------------------------------------|
+| 1.21.x Ent | 1.7.x (Envoy 1.32.x) | 1.6.x (Envoy 1.31.x) |
+| 1.18.x Ent | 1.4.x (Envoy 1.28.x) | 1.3.x (Envoy 1.27.x) |
+| 1.15.x Ent | 1.1.x (Envoy 1.26.x) | 1.4.x (Envoy 1.28.x) - 1.0.x (Envoy 1.24.x) |
\ No newline at end of file
diff --git a/website/content/partials/tables/compatibility/consul-dataplane/standard-release.mdx b/website/content/partials/tables/compatibility/consul-dataplane/standard-release.mdx
new file mode 100644
index 00000000000..fe75cf5030d
--- /dev/null
+++ b/website/content/partials/tables/compatibility/consul-dataplane/standard-release.mdx
@@ -0,0 +1,8 @@
+| Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions |
+| -------------- | -------------------------------------|----------------------------------------------|
+| 1.21.x CE | 1.7.x (Envoy 1.32.x) | 1.6.x (Envoy 1.31.x) |
+| 1.20.x CE | 1.6.x (Envoy 1.31.x) | 1.5.x (Envoy 1.29.x) |
+| 1.19.x CE | 1.5.x (Envoy 1.29.x) | 1.4.x (Envoy 1.28.x) |
+| 1.18.x CE | 1.4.x (Envoy 1.28.x) | 1.3.x (Envoy 1.27.x) |
+| 1.17.x | 1.3.x (Envoy 1.27.x) | 1.4.x (Envoy 1.28.x), 1.2.x (Envoy 1.26.x) |
+| 1.16.x | 1.2.x (Envoy 1.26.x) | 1.3.x (Envoy 1.27.x), 1.1.x (Envoy 1.25.x) |
\ No newline at end of file
diff --git a/website/content/partials/tables/compatibility/envoy/lts.mdx b/website/content/partials/tables/compatibility/envoy/lts.mdx
new file mode 100644
index 00000000000..a69a82d15f4
--- /dev/null
+++ b/website/content/partials/tables/compatibility/envoy/lts.mdx
@@ -0,0 +1,5 @@
+| Consul Version | Compatible Envoy Versions |
+| -------------- | -----------------------------------------------------------------------------------|
+| 1.21.x Ent | 1.33.x, 1.32.x, 1.31.x, 1.30.x
+| 1.18.x Ent | 1.29.x, 1.28.x, 1.27.x, 1.26.x, 1.25.x |
+| 1.15.x Ent | 1.29.x, 1.28.x, 1.27.x, 1.26.x, 1.25.x, 1.24.x, 1.23.x, 1.22.x |
diff --git a/website/content/partials/tables/compatibility/envoy/standard-release.mdx b/website/content/partials/tables/compatibility/envoy/standard-release.mdx
new file mode 100644
index 00000000000..63c6afffd58
--- /dev/null
+++ b/website/content/partials/tables/compatibility/envoy/standard-release.mdx
@@ -0,0 +1,8 @@
+| Consul Version | Compatible Envoy Versions |
+| -------------- | -------------------------------------- |
+| 1.21.x CE | 1.33.x, 1.32.x, 1.31.x, 1.30.x |
+| 1.20.x CE | 1.31.x, 1.30.x, 1.29.x, 1.28.x |
+| 1.19.x CE | 1.29.x, 1.28.x, 1.27.x, 1.26.x |
+| 1.18.x CE | 1.28.x, 1.27.x, 1.26.x, 1.25.x |
+| 1.17.x | 1.27.x, 1.26.x, 1.25.x, 1.24.x |
+| 1.16.x | 1.26.x, 1.25.x, 1.24.x, 1.23.x |
\ No newline at end of file