diff --git a/website/content/api-docs/agent/index.mdx b/website/content/api-docs/agent/index.mdx
index d76cc1910775..749ea80f291d 100644
--- a/website/content/api-docs/agent/index.mdx
+++ b/website/content/api-docs/agent/index.mdx
@@ -261,6 +261,8 @@ The corresponding CLI command is [`consul members`](/consul/commands/members).
network segment). When querying a server, setting this to the special string `_all`
will show members in all segments.
+@include 'http-api-query-parms-partition.mdx'
+
### Sample Request
```shell-session
diff --git a/website/content/api-docs/peering.mdx b/website/content/api-docs/peering.mdx
index 7604cb6a1954..f0e4d7767710 100644
--- a/website/content/api-docs/peering.mdx
+++ b/website/content/api-docs/peering.mdx
@@ -34,8 +34,7 @@ The table below shows this endpoint's support for
and configuration entries such as `service-intentions`. This field must be a
valid DNS hostname label.
-- `Partition` `(string: "")` - The admin partition that the
- peering token is generated from. Uses `default` when not specified.
+@include 'http-api-body-options-partition.mdx'
- `ServerExternalAddresses` `([]string: )` - The addresses for the cluster that generates the peering token. Addresses take the form `{host or IP}:port`.
You can specify one or more load balancers or external IPs that route external traffic to this cluster's Consul servers.
@@ -100,9 +99,7 @@ The table below shows this endpoint's support for
and configuration entries such as `service-intentions`. This field must be a
valid DNS hostname label.
-- `Partition` `(string: "")` - The admin partition
- that peers to the cluster that generated the peering token. Uses `default`
- when not specified.
+@include 'http-api-body-options-partition.mdx'
- `PeeringToken` `(string: )` - The peering token fetched from the
peer cluster.
@@ -162,8 +159,7 @@ The table below shows this endpoint's support for
### Query Parameters
-- `partition` `(string: "")` - Specifies the partition of the peering
- to read. If not specified will default to `default`.
+@include 'http-api-query-parms-partition.mdx'
### Sample Request
@@ -235,8 +231,7 @@ The table below shows this endpoint's support for
### Query Parameters
-- `partition` `(string: "")` - Specifies the partition of the peerings
- to delete. If not specified will default to `default`.
+@include 'http-api-query-parms-partition.mdx'
### Sample Request
@@ -286,8 +281,7 @@ The table below shows this endpoint's support for
### Query Parameters
-- `partition` `(string: "")` - Specifies the partition of the peerings
- to list. If not specified will default to `default`.
+@include 'http-api-query-parms-partition.mdx'
### Sample Request
diff --git a/website/content/commands/acl/auth-method/create.mdx b/website/content/commands/acl/auth-method/create.mdx
index 7a7ef7ea70ef..4f1015cfb61d 100644
--- a/website/content/commands/acl/auth-method/create.mdx
+++ b/website/content/commands/acl/auth-method/create.mdx
@@ -67,7 +67,7 @@ Usage: `consul acl auth-method create [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/auth-method/delete.mdx b/website/content/commands/acl/auth-method/delete.mdx
index fc2e166d362c..acb095c5872b 100644
--- a/website/content/commands/acl/auth-method/delete.mdx
+++ b/website/content/commands/acl/auth-method/delete.mdx
@@ -31,7 +31,7 @@ Usage: `consul acl auth-method delete [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/auth-method/list.mdx b/website/content/commands/acl/auth-method/list.mdx
index c7d2c0b9c2b4..42d7285ca76d 100644
--- a/website/content/commands/acl/auth-method/list.mdx
+++ b/website/content/commands/acl/auth-method/list.mdx
@@ -34,7 +34,7 @@ Usage: `consul acl auth-method list`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/auth-method/read.mdx b/website/content/commands/acl/auth-method/read.mdx
index 928863846de5..015852f9684c 100644
--- a/website/content/commands/acl/auth-method/read.mdx
+++ b/website/content/commands/acl/auth-method/read.mdx
@@ -36,7 +36,7 @@ Usage: `consul acl auth-method read [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/auth-method/update.mdx b/website/content/commands/acl/auth-method/update.mdx
index aef12ff351c9..d328ea999c2b 100644
--- a/website/content/commands/acl/auth-method/update.mdx
+++ b/website/content/commands/acl/auth-method/update.mdx
@@ -72,7 +72,7 @@ Usage: `consul acl auth-method update [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/binding-rule/create.mdx b/website/content/commands/acl/binding-rule/create.mdx
index 38b2ffb57deb..b32b2ce934e5 100644
--- a/website/content/commands/acl/binding-rule/create.mdx
+++ b/website/content/commands/acl/binding-rule/create.mdx
@@ -47,7 +47,7 @@ Usage: `consul acl binding-rule create [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/binding-rule/delete.mdx b/website/content/commands/acl/binding-rule/delete.mdx
index c78e36031040..9164f62a7c0e 100644
--- a/website/content/commands/acl/binding-rule/delete.mdx
+++ b/website/content/commands/acl/binding-rule/delete.mdx
@@ -32,7 +32,7 @@ Usage: `consul acl binding-rule delete [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/binding-rule/list.mdx b/website/content/commands/acl/binding-rule/list.mdx
index 9d01e9d2b1b7..cbb9c184c821 100644
--- a/website/content/commands/acl/binding-rule/list.mdx
+++ b/website/content/commands/acl/binding-rule/list.mdx
@@ -34,7 +34,7 @@ Usage: `consul acl binding-rule list`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/binding-rule/read.mdx b/website/content/commands/acl/binding-rule/read.mdx
index 86b8b4169c6c..50f1e8112f88 100644
--- a/website/content/commands/acl/binding-rule/read.mdx
+++ b/website/content/commands/acl/binding-rule/read.mdx
@@ -37,7 +37,7 @@ Usage: `consul acl binding-rule read [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/binding-rule/update.mdx b/website/content/commands/acl/binding-rule/update.mdx
index e33b7e026da5..22ad67e0cfc9 100644
--- a/website/content/commands/acl/binding-rule/update.mdx
+++ b/website/content/commands/acl/binding-rule/update.mdx
@@ -54,7 +54,7 @@ Usage: `consul acl binding-rule update [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/policy/create.mdx b/website/content/commands/acl/policy/create.mdx
index cbd4b8d8757d..e178536515e0 100644
--- a/website/content/commands/acl/policy/create.mdx
+++ b/website/content/commands/acl/policy/create.mdx
@@ -49,7 +49,7 @@ Usage: `consul acl policy create [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/policy/delete.mdx b/website/content/commands/acl/policy/delete.mdx
index 074dfea607d1..2b611f5a78dc 100644
--- a/website/content/commands/acl/policy/delete.mdx
+++ b/website/content/commands/acl/policy/delete.mdx
@@ -34,7 +34,7 @@ Usage: `consul acl policy delete [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/policy/list.mdx b/website/content/commands/acl/policy/list.mdx
index 7d56fd6f2137..ad3b114b9793 100644
--- a/website/content/commands/acl/policy/list.mdx
+++ b/website/content/commands/acl/policy/list.mdx
@@ -34,7 +34,7 @@ Usage: `consul acl policy list`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/policy/read.mdx b/website/content/commands/acl/policy/read.mdx
index b84b5d3c3483..28e2f51a79d0 100644
--- a/website/content/commands/acl/policy/read.mdx
+++ b/website/content/commands/acl/policy/read.mdx
@@ -39,7 +39,7 @@ Usage: `consul acl policy read [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/policy/update.mdx b/website/content/commands/acl/policy/update.mdx
index f64a1f79068e..edc529a5da9f 100644
--- a/website/content/commands/acl/policy/update.mdx
+++ b/website/content/commands/acl/policy/update.mdx
@@ -58,7 +58,7 @@ Usage: `consul acl policy update [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/role/create.mdx b/website/content/commands/acl/role/create.mdx
index 44af92bd4e64..82989a2697a1 100644
--- a/website/content/commands/acl/role/create.mdx
+++ b/website/content/commands/acl/role/create.mdx
@@ -52,7 +52,7 @@ Usage: `consul acl role create [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/role/delete.mdx b/website/content/commands/acl/role/delete.mdx
index bb2a179d92e1..9a39e97ab843 100644
--- a/website/content/commands/acl/role/delete.mdx
+++ b/website/content/commands/acl/role/delete.mdx
@@ -34,7 +34,7 @@ Usage: `consul acl role delete [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/role/list.mdx b/website/content/commands/acl/role/list.mdx
index ed3699ce3fa7..afd8c75a41a9 100644
--- a/website/content/commands/acl/role/list.mdx
+++ b/website/content/commands/acl/role/list.mdx
@@ -34,7 +34,7 @@ Usage: `consul acl role list`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/role/read.mdx b/website/content/commands/acl/role/read.mdx
index 7de17d5dcb2c..aa5008f57d5c 100644
--- a/website/content/commands/acl/role/read.mdx
+++ b/website/content/commands/acl/role/read.mdx
@@ -39,7 +39,7 @@ Usage: `consul acl role read [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/role/update.mdx b/website/content/commands/acl/role/update.mdx
index d6991a21e0fb..1308e445ba7f 100644
--- a/website/content/commands/acl/role/update.mdx
+++ b/website/content/commands/acl/role/update.mdx
@@ -63,7 +63,7 @@ Usage: `consul acl role update [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/templated-policy/preview.mdx b/website/content/commands/acl/templated-policy/preview.mdx
index 7e0c38d165c9..cfffa6db7e55 100644
--- a/website/content/commands/acl/templated-policy/preview.mdx
+++ b/website/content/commands/acl/templated-policy/preview.mdx
@@ -36,7 +36,7 @@ Usage: `consul acl templated-policy preview [options] [args]`
### Enterprise options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/token/clone.mdx b/website/content/commands/acl/token/clone.mdx
index 7f2822d6c579..937097fb284d 100644
--- a/website/content/commands/acl/token/clone.mdx
+++ b/website/content/commands/acl/token/clone.mdx
@@ -38,7 +38,7 @@ Usage: `consul acl token clone [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/token/create.mdx b/website/content/commands/acl/token/create.mdx
index f0622ace7ec8..8cd5fb6b948b 100644
--- a/website/content/commands/acl/token/create.mdx
+++ b/website/content/commands/acl/token/create.mdx
@@ -66,7 +66,7 @@ Usage: `consul acl token create [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/token/delete.mdx b/website/content/commands/acl/token/delete.mdx
index 5ba65957589b..13a3ca26e6e3 100644
--- a/website/content/commands/acl/token/delete.mdx
+++ b/website/content/commands/acl/token/delete.mdx
@@ -32,7 +32,7 @@ Usage: `consul acl token delete [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/token/list.mdx b/website/content/commands/acl/token/list.mdx
index 531b4cc68ed8..fd3b6c215114 100644
--- a/website/content/commands/acl/token/list.mdx
+++ b/website/content/commands/acl/token/list.mdx
@@ -34,7 +34,7 @@ Usage: `consul acl token list`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/token/read.mdx b/website/content/commands/acl/token/read.mdx
index e339292d9663..dfcbea12d8e1 100644
--- a/website/content/commands/acl/token/read.mdx
+++ b/website/content/commands/acl/token/read.mdx
@@ -43,7 +43,7 @@ Usage: `consul acl token read [options] [args]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/acl/token/update.mdx b/website/content/commands/acl/token/update.mdx
index 1a1703cb143b..1f89d828641c 100644
--- a/website/content/commands/acl/token/update.mdx
+++ b/website/content/commands/acl/token/update.mdx
@@ -93,7 +93,7 @@ instead.
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/catalog/nodes.mdx b/website/content/commands/catalog/nodes.mdx
index f612627be23d..6efa3ad0716c 100644
--- a/website/content/commands/catalog/nodes.mdx
+++ b/website/content/commands/catalog/nodes.mdx
@@ -85,7 +85,7 @@ Usage: `consul catalog nodes [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/catalog/services.mdx b/website/content/commands/catalog/services.mdx
index 9d05ecbf47ac..a57adcb4a927 100644
--- a/website/content/commands/catalog/services.mdx
+++ b/website/content/commands/catalog/services.mdx
@@ -69,7 +69,7 @@ Usage: `consul catalog services [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/config/delete.mdx b/website/content/commands/config/delete.mdx
index 134d6885e666..085b0e34c411 100644
--- a/website/content/commands/config/delete.mdx
+++ b/website/content/commands/config/delete.mdx
@@ -61,7 +61,7 @@ config entry. This is used in combination with the -cas flag.
@include 'http_api_namespace_options.mdx'
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/config/list.mdx b/website/content/commands/config/list.mdx
index e453b1194319..5f55a7bcff72 100644
--- a/website/content/commands/config/list.mdx
+++ b/website/content/commands/config/list.mdx
@@ -48,7 +48,7 @@ Usage: `consul config list [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/config/read.mdx b/website/content/commands/config/read.mdx
index 7a49482c5b3f..c54a60dfec16 100644
--- a/website/content/commands/config/read.mdx
+++ b/website/content/commands/config/read.mdx
@@ -52,7 +52,7 @@ Usage: `consul config read [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/config/write.mdx b/website/content/commands/config/write.mdx
index bb98d8e49888..f466654c617f 100644
--- a/website/content/commands/config/write.mdx
+++ b/website/content/commands/config/write.mdx
@@ -53,7 +53,7 @@ Usage: `consul config write [options] FILE`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx
index 744873df5656..913adb981dff 100644
--- a/website/content/commands/connect/envoy.mdx
+++ b/website/content/commands/connect/envoy.mdx
@@ -199,7 +199,7 @@ compatibility with Envoy and prevent potential issues. Default is `false`.
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/connect/redirect-traffic.mdx b/website/content/commands/connect/redirect-traffic.mdx
index af59baee56b7..d59fe7928cf6 100644
--- a/website/content/commands/connect/redirect-traffic.mdx
+++ b/website/content/commands/connect/redirect-traffic.mdx
@@ -60,7 +60,7 @@ Usage: `consul connect redirect-traffic [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/intention/check.mdx b/website/content/commands/intention/check.mdx
index fadc8d224bd9..23ae56ceae4e 100644
--- a/website/content/commands/intention/check.mdx
+++ b/website/content/commands/intention/check.mdx
@@ -41,7 +41,7 @@ Usage: `consul intention check [options] SRC DST`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/intention/create.mdx b/website/content/commands/intention/create.mdx
index 71c491b06ad8..bbaccc2be2f4 100644
--- a/website/content/commands/intention/create.mdx
+++ b/website/content/commands/intention/create.mdx
@@ -52,7 +52,7 @@ are not supported from commands, but may be from the corresponding HTTP endpoint
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/intention/delete.mdx b/website/content/commands/intention/delete.mdx
index ad2fca1c97e2..2cfb97a966db 100644
--- a/website/content/commands/intention/delete.mdx
+++ b/website/content/commands/intention/delete.mdx
@@ -37,7 +37,7 @@ Usage:
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/intention/get.mdx b/website/content/commands/intention/get.mdx
index 84b3a86065d0..b3db133fd44e 100644
--- a/website/content/commands/intention/get.mdx
+++ b/website/content/commands/intention/get.mdx
@@ -37,7 +37,7 @@ Usage:
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/intention/match.mdx b/website/content/commands/intention/match.mdx
index 4c727b1fc21c..3d94939b38bf 100644
--- a/website/content/commands/intention/match.mdx
+++ b/website/content/commands/intention/match.mdx
@@ -40,7 +40,7 @@ Usage: `consul intention match [options] SRC_OR_DST`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/kv/delete.mdx b/website/content/commands/kv/delete.mdx
index 90e2e54624bf..17216b0ca78b 100644
--- a/website/content/commands/kv/delete.mdx
+++ b/website/content/commands/kv/delete.mdx
@@ -40,7 +40,7 @@ Usage: `consul kv delete [options] KEY_OR_PREFIX`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/kv/export.mdx b/website/content/commands/kv/export.mdx
index da063e9d826d..c05b2f80f895 100644
--- a/website/content/commands/kv/export.mdx
+++ b/website/content/commands/kv/export.mdx
@@ -28,7 +28,7 @@ Usage: `consul kv export [options] [PREFIX]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/kv/get.mdx b/website/content/commands/kv/get.mdx
index 0e83b2facb52..6534fe35486b 100644
--- a/website/content/commands/kv/get.mdx
+++ b/website/content/commands/kv/get.mdx
@@ -56,7 +56,7 @@ Usage: `consul kv get [options] [KEY_OR_PREFIX]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/kv/import.mdx b/website/content/commands/kv/import.mdx
index 574fdfbd87be..a960b1b738ce 100644
--- a/website/content/commands/kv/import.mdx
+++ b/website/content/commands/kv/import.mdx
@@ -31,7 +31,7 @@ Usage: `consul kv import [options] [DATA]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/kv/put.mdx b/website/content/commands/kv/put.mdx
index efb045179fb8..dcde811fc01c 100644
--- a/website/content/commands/kv/put.mdx
+++ b/website/content/commands/kv/put.mdx
@@ -59,7 +59,7 @@ Usage: `consul kv put [options] KEY [DATA]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/members.mdx b/website/content/commands/members.mdx
index ff1df561a6f4..6299f21e4c82 100644
--- a/website/content/commands/members.mdx
+++ b/website/content/commands/members.mdx
@@ -56,7 +56,7 @@ Usage: `consul members [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/namespace/create.mdx b/website/content/commands/namespace/create.mdx
index f5d611a542e4..068666e5cafd 100644
--- a/website/content/commands/namespace/create.mdx
+++ b/website/content/commands/namespace/create.mdx
@@ -61,7 +61,7 @@ from the CLI arguments.
#### API Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_options_client.mdx'
diff --git a/website/content/commands/namespace/delete.mdx b/website/content/commands/namespace/delete.mdx
index 8742af6f4d61..adc235be6062 100644
--- a/website/content/commands/namespace/delete.mdx
+++ b/website/content/commands/namespace/delete.mdx
@@ -30,7 +30,7 @@ Usage: `consul namespace delete `
#### API Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_options_client.mdx'
diff --git a/website/content/commands/namespace/list.mdx b/website/content/commands/namespace/list.mdx
index 5d15c1f1155c..1b043ed657d6 100644
--- a/website/content/commands/namespace/list.mdx
+++ b/website/content/commands/namespace/list.mdx
@@ -42,7 +42,7 @@ Usage: `consul namespace list`
#### API Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_options_client.mdx'
diff --git a/website/content/commands/namespace/read.mdx b/website/content/commands/namespace/read.mdx
index 4a4621ef06bc..778f672ff5c8 100644
--- a/website/content/commands/namespace/read.mdx
+++ b/website/content/commands/namespace/read.mdx
@@ -41,7 +41,7 @@ Usage: `consul namespace read `
#### API Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_options_client.mdx'
diff --git a/website/content/commands/namespace/update.mdx b/website/content/commands/namespace/update.mdx
index 6349d307f638..4cce12235675 100644
--- a/website/content/commands/namespace/update.mdx
+++ b/website/content/commands/namespace/update.mdx
@@ -68,7 +68,7 @@ with the existing namespace definition.
#### API Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_options_client.mdx'
diff --git a/website/content/commands/namespace/write.mdx b/website/content/commands/namespace/write.mdx
index 678c303a802f..f1a16ec006bd 100644
--- a/website/content/commands/namespace/write.mdx
+++ b/website/content/commands/namespace/write.mdx
@@ -40,7 +40,7 @@ or HCL format. See [here](/consul/docs/enterprise/namespaces#namespace-definitio
#### API Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_options_client.mdx'
diff --git a/website/content/commands/peering/delete.mdx b/website/content/commands/peering/delete.mdx
index 81ba3439dbbc..1bd474dc306f 100644
--- a/website/content/commands/peering/delete.mdx
+++ b/website/content/commands/peering/delete.mdx
@@ -34,7 +34,7 @@ Usage: `consul peering delete [options] -name `
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/peering/establish.mdx b/website/content/commands/peering/establish.mdx
index a00dc332180d..782fb9cda681 100644
--- a/website/content/commands/peering/establish.mdx
+++ b/website/content/commands/peering/establish.mdx
@@ -36,7 +36,7 @@ Usage: `consul peering establish [options] -name -peering-token `
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/peering/generate-token.mdx b/website/content/commands/peering/generate-token.mdx
index 92d007125c69..6ce3fb059cb5 100644
--- a/website/content/commands/peering/generate-token.mdx
+++ b/website/content/commands/peering/generate-token.mdx
@@ -43,7 +43,7 @@ You can specify one or more load balancers or external IPs that route external t
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/peering/list.mdx b/website/content/commands/peering/list.mdx
index f0b1c8377735..9838de3e7bc5 100644
--- a/website/content/commands/peering/list.mdx
+++ b/website/content/commands/peering/list.mdx
@@ -30,7 +30,7 @@ Usage: `consul peering list [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/peering/read.mdx b/website/content/commands/peering/read.mdx
index 596c514520bb..95a41b2701aa 100644
--- a/website/content/commands/peering/read.mdx
+++ b/website/content/commands/peering/read.mdx
@@ -31,7 +31,7 @@ Usage: `consul peering read [options] -name `
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/services/deregister.mdx b/website/content/commands/services/deregister.mdx
index edc493866e1c..138de2e763eb 100644
--- a/website/content/commands/services/deregister.mdx
+++ b/website/content/commands/services/deregister.mdx
@@ -43,7 +43,7 @@ This flexibility makes it easy to pair the command with the
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/services/export.mdx b/website/content/commands/services/export.mdx
index 281d5f23e7d7..370f95dd6437 100644
--- a/website/content/commands/services/export.mdx
+++ b/website/content/commands/services/export.mdx
@@ -40,7 +40,7 @@ Usage: consul services export [options] -name -consumer-peers ` - A comma-separated list of admin partitions within the
same datacenter to export the service to. This flag is optional when `-consumer-peers` is specified.
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/commands/services/exported-services.mdx b/website/content/commands/services/exported-services.mdx
index da1d3dd17703..395ad2cb8b30 100644
--- a/website/content/commands/services/exported-services.mdx
+++ b/website/content/commands/services/exported-services.mdx
@@ -32,7 +32,7 @@ Usage: `consul services exported-services [options]`
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
#### API Options
diff --git a/website/content/commands/services/register.mdx b/website/content/commands/services/register.mdx
index a1cbd8cf580e..01a09d19bfdb 100644
--- a/website/content/commands/services/register.mdx
+++ b/website/content/commands/services/register.mdx
@@ -78,7 +78,7 @@ The following fields specify identical parameters in a standard service definiti
#### Enterprise Options
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
@include 'http_api_namespace_options.mdx'
diff --git a/website/content/partials/http_api_partition_options.mdx b/website/content/partials/cli-http-api-partition-options.mdx
similarity index 100%
rename from website/content/partials/http_api_partition_options.mdx
rename to website/content/partials/cli-http-api-partition-options.mdx
diff --git a/website/content/partials/http-api-body-options-partition.mdx b/website/content/partials/http-api-body-options-partition.mdx
new file mode 100644
index 000000000000..a18edb55bc0f
--- /dev/null
+++ b/website/content/partials/http-api-body-options-partition.mdx
@@ -0,0 +1,3 @@
+
+- `Partition` `(string: "")` - The admin partition that the
+ peering token is generated from. Uses `default` when not specified.
\ No newline at end of file
diff --git a/website/content/partials/http-api-query-parms-partition.mdx b/website/content/partials/http-api-query-parms-partition.mdx
new file mode 100644
index 000000000000..7c5d845b1eb2
--- /dev/null
+++ b/website/content/partials/http-api-query-parms-partition.mdx
@@ -0,0 +1,2 @@
+- `partition` `(string: "")` - Specifies the partition of the peering
+ to read. If not specified, defaults to `default`.
\ No newline at end of file