diff --git a/website/content/api-docs/acl/auth-methods.mdx b/website/content/api-docs/acl/auth-methods.mdx
index 805a9ee93c..34f59cb866 100644
--- a/website/content/api-docs/acl/auth-methods.mdx
+++ b/website/content/api-docs/acl/auth-methods.mdx
@@ -107,6 +107,8 @@ The corresponding CLI command is [`consul acl auth-method create`](/consul/comma
     prefixed-${serviceaccount.name}
     ```
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -175,9 +177,11 @@ The corresponding CLI command is [`consul acl auth-method read`](/consul/command
 
 ### Query Parameters
 
-- `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the auth method you lookup.
+- `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the auth method you look up.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -291,9 +295,11 @@ The corresponding CLI command is [`consul acl auth-method update`](/consul/comma
     same values that are usable by the `Selector` syntax. For example:
 
     ```text
-    prefixed-${serviceaccount.name}
+    prefixed-${serviceaccount.name}    
     ```
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -369,6 +375,8 @@ The corresponding CLI command is [`consul acl auth-method delete`](/consul/comma
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the auth method you delete.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -408,8 +416,9 @@ The corresponding CLI command is [`consul acl auth-method list`](/consul/command
   The namespace may be specified as '\*' to return results for all namespaces.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
-The namespace may be specified as '\*' and then
-  results will be returned for all namespaces.
+  The namespace may be specified as '\*' and then results are returned for all namespaces.
+
+@include 'http-api-query-parms-partition.mdx'
 
 ## Sample Request
 
diff --git a/website/content/api-docs/acl/binding-rules.mdx b/website/content/api-docs/acl/binding-rules.mdx
index 9894ce21c7..34edeadc4a 100644
--- a/website/content/api-docs/acl/binding-rules.mdx
+++ b/website/content/api-docs/acl/binding-rules.mdx
@@ -172,6 +172,8 @@ The corresponding CLI command is [`consul acl binding-rule create`](/consul/comm
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -238,6 +240,8 @@ The corresponding CLI command is [`consul acl binding-rule read`](/consul/comman
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the binding rule you lookup.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -423,6 +427,8 @@ The corresponding CLI command is [`consul acl binding-rule update`](/consul/comm
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -489,6 +495,8 @@ The corresponding CLI command is [`consul acl binding-rule delete`](/consul/comm
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the binding rule you delete.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -522,7 +530,7 @@ The table below shows this endpoint's support for
 
 The corresponding CLI command is [`consul acl binding-rule list`](/consul/commands/acl/binding-rule/list).
 
-## Query Parameters
+### Query Parameters
 
 - `authmethod` `(string: "")` - Filters the binding rule list to those binding
   rules that are linked with the specific named auth method.
@@ -531,7 +539,9 @@ The corresponding CLI command is [`consul acl binding-rule list`](/consul/comman
   The namespace may be specified as '\*' to return results for all namespaces.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
-## Sample Request
+@include 'http-api-query-parms-partition.mdx'
+
+### Sample Request
 
 ```shell-session
 $ curl --request GET http://127.0.0.1:8500/v1/acl/binding-rules
diff --git a/website/content/api-docs/acl/policies.mdx b/website/content/api-docs/acl/policies.mdx
index c41583626b..1d46fa1b51 100644
--- a/website/content/api-docs/acl/policies.mdx
+++ b/website/content/api-docs/acl/policies.mdx
@@ -57,6 +57,8 @@ The corresponding CLI command is [`consul acl policy create`](/consul/commands/a
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -170,6 +172,8 @@ The corresponding CLI command is [`consul acl policy read -name=<string>`](/cons
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the policy you lookup.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -242,6 +246,8 @@ The corresponding CLI command is [`consul acl policy update`](/consul/commands/a
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -307,6 +313,8 @@ The corresponding CLI command is [`consul acl policy delete`](/consul/commands/a
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the policy you delete.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -346,7 +354,9 @@ The corresponding CLI command is [`consul acl policy list`](/consul/commands/acl
   The namespace may be specified as '\*' to return results for all namespaces.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
-## Sample Request
+@include 'http-api-query-parms-partition.mdx'
+
+### Sample Request
 
 ```shell-session
 $ curl --request GET http://127.0.0.1:8500/v1/acl/policies
diff --git a/website/content/api-docs/acl/roles.mdx b/website/content/api-docs/acl/roles.mdx
index fbcb8d8b72..e54e9a54b0 100644
--- a/website/content/api-docs/acl/roles.mdx
+++ b/website/content/api-docs/acl/roles.mdx
@@ -95,6 +95,8 @@ The corresponding CLI command is [`consul acl role create`](/consul/commands/acl
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -223,6 +225,8 @@ The corresponding CLI command is [`consul acl role read`](/consul/commands/acl/r
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the role you lookup.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -306,6 +310,8 @@ The corresponding CLI command is [`consul acl role read -name=<string>`](/consul
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the role you lookup.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -418,6 +424,8 @@ The corresponding CLI command is [`consul acl role update`](/consul/commands/acl
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -523,6 +531,8 @@ The corresponding CLI command is [`consul acl role delete`](/consul/commands/acl
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the role you delete.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -565,6 +575,8 @@ The corresponding CLI command is [`consul acl role list`](/consul/commands/acl/r
   The namespace may be specified as '\*' to return results for all namespaces.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ## Sample Request
 
 ```shell-session
diff --git a/website/content/api-docs/acl/templated-policies.mdx b/website/content/api-docs/acl/templated-policies.mdx
index 5805449dd5..de3a6b59ae 100644
--- a/website/content/api-docs/acl/templated-policies.mdx
+++ b/website/content/api-docs/acl/templated-policies.mdx
@@ -87,6 +87,8 @@ The corresponding CLI command is [`consul acl templated-policy preview`](/consul
 
 - `Name` `(string: <optional>)` - Specifies the value of the `name` variable in the templated policy variables.
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample payload
 
 ```json
diff --git a/website/content/api-docs/acl/tokens.mdx b/website/content/api-docs/acl/tokens.mdx
index a741ec3a70..af629a3500 100644
--- a/website/content/api-docs/acl/tokens.mdx
+++ b/website/content/api-docs/acl/tokens.mdx
@@ -118,6 +118,8 @@ The corresponding CLI command is [`consul acl token create`](/consul/commands/ac
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -217,6 +219,8 @@ The corresponding CLI command is [`consul acl token read`](/consul/commands/acl/
 - `expanded` `(bool: false)` - If this field is set, the contents of all policies and
   roles affecting the token will also be returned.
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -497,6 +501,8 @@ The corresponding CLI command is [`consul acl token update`](/consul/commands/ac
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -591,6 +597,8 @@ The corresponding CLI command is [`consul acl token clone`](/consul/commands/acl
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -668,6 +676,8 @@ The corresponding CLI command is [`consul acl token delete`](/consul/commands/ac
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the token you delete.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -723,6 +733,8 @@ The corresponding CLI command is [`consul acl token list`](/consul/commands/acl/
   The namespace may be specified as '\*' to return results for all namespaces.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
diff --git a/website/content/api-docs/agent/index.mdx b/website/content/api-docs/agent/index.mdx
index d76cc19107..749ea80f29 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/agent/service.mdx b/website/content/api-docs/agent/service.mdx
index eee3dd471e..3018274182 100644
--- a/website/content/api-docs/agent/service.mdx
+++ b/website/content/api-docs/agent/service.mdx
@@ -684,6 +684,8 @@ The `/agent/service/register` endpoint supports camel case and _snake case_ for
   `false`. See [anti-entropy syncs](/consul/docs/architecture/anti-entropy) for
   additional information.
 
+@include 'http-api-body-options-partition.mdx'
+
 #### Connect Structure
 
 For the `Connect` field, the parameters are:
@@ -769,6 +771,8 @@ The corresponding CLI command is [`consul services deregister`](/consul/commands
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the service you deregister.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
diff --git a/website/content/api-docs/catalog.mdx b/website/content/api-docs/catalog.mdx
index 8af4a2f011..8c549b3043 100644
--- a/website/content/api-docs/catalog.mdx
+++ b/website/content/api-docs/catalog.mdx
@@ -327,6 +327,8 @@ The corresponding CLI command is [`consul catalog nodes`](/consul/commands/catal
 - `filter` `(string: "")` - Specifies the expression used to filter the
   queries results prior to returning the data.
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -422,6 +424,8 @@ The corresponding CLI command is [`consul catalog services`](/consul/commands/ca
 - `filter` `(string: "")` - Specifies the expression used to filter the
   queries results prior to returning the data.
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Filtering
 
 The filter will be executed against each Service mapping within the catalog.
diff --git a/website/content/api-docs/config.mdx b/website/content/api-docs/config.mdx
index 79407b325a..49243da094 100644
--- a/website/content/api-docs/config.mdx
+++ b/website/content/api-docs/config.mdx
@@ -71,6 +71,8 @@ The ACL required depends on the config entry being written:
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the config entry you apply.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -150,6 +152,8 @@ The ACL required depends on the config entry kind being read:
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the config entry you lookup
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -228,6 +232,8 @@ The corresponding CLI command is [`consul config list`](/consul/commands/config/
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the config entries you lookup.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -321,6 +327,8 @@ The corresponding CLI command is [`consul config delete`](/consul/commands/confi
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace of the config entry you delete.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
diff --git a/website/content/api-docs/connect/intentions.mdx b/website/content/api-docs/connect/intentions.mdx
index ebe835ac90..95a5cfca60 100644
--- a/website/content/api-docs/connect/intentions.mdx
+++ b/website/content/api-docs/connect/intentions.mdx
@@ -60,6 +60,8 @@ The corresponding CLI command is [`consul intention create -replace`](/consul/co
   as shown in the [source and destination naming conventions](/consul/commands/intention#source-and-destination-naming).
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### JSON Request Body Schema
 
 - `SourceType` `(string: "")` - The type for the `SourceName` value.
@@ -151,6 +153,8 @@ The corresponding CLI command is [`consul intention create`](/consul/commands/in
   as shown in the [source and destination naming conventions](/consul/commands/intention#source-and-destination-naming).
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### JSON Request Body Schema
 
 - `SourceName` `(string: <required>)` - The source of the intention.
@@ -290,6 +294,8 @@ The corresponding CLI command is [`consul intention get`](/consul/commands/inten
   as shown in the [source and destination naming conventions](/consul/commands/intention#source-and-destination-naming).
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -404,6 +410,8 @@ The corresponding CLI command is [`consul intention list`](/consul/commands/inte
   The `*` wildcard may be used to list intentions from all namespaces.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -485,6 +493,8 @@ The corresponding CLI command is [`consul intention delete`](/consul/commands/in
   as shown in the [source and destination naming conventions](/consul/commands/intention#source-and-destination-naming).
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -628,6 +638,8 @@ The corresponding CLI command is [`consul intention match`](/consul/commands/int
   as shown in the [source and destination naming conventions](/consul/commands/intention#source-and-destination-naming).
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
diff --git a/website/content/api-docs/exported-services.mdx b/website/content/api-docs/exported-services.mdx
index aa6521f62f..f7c89d4999 100644
--- a/website/content/api-docs/exported-services.mdx
+++ b/website/content/api-docs/exported-services.mdx
@@ -36,8 +36,7 @@ The table below shows this endpoint's support for
 
 ### Query Parameters
 
-- `partition` `(string: "")` <EnterpriseAlert inline /> - Specifies the admin partition the services are exported from. When not specified, assumes the default value `default`.
-
+@include 'http-api-query-parms-partition.mdx'
 
 ### Sample Request
 
diff --git a/website/content/api-docs/kv.mdx b/website/content/api-docs/kv.mdx
index 29aa32cbe6..912a8b6944 100644
--- a/website/content/api-docs/kv.mdx
+++ b/website/content/api-docs/kv.mdx
@@ -79,6 +79,8 @@ The corresponding CLI command is [`consul kv get`](/consul/commands/kv/get).
   For recursive lookups, the namespace may be specified as '\*'
   to return results for all namespaces.
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -220,6 +222,8 @@ The corresponding CLI command is [`consul kv put`](/consul/commands/kv/put).
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace to query.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Payload
 
 The payload is arbitrary, and is loaded directly into Consul as supplied.
@@ -289,6 +293,8 @@ The corresponding CLI command is [`consul kv delete`](/consul/commands/kv/delete
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the namespace to query.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
 
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
diff --git a/website/content/api-docs/namespaces.mdx b/website/content/api-docs/namespaces.mdx
index 2dd41a7e9b..8c963d80a9 100644
--- a/website/content/api-docs/namespaces.mdx
+++ b/website/content/api-docs/namespaces.mdx
@@ -67,6 +67,8 @@ The corresponding CLI command is [`consul namespace create`](/consul/commands/na
 - `Meta` `(map<string|string>: <optional>)` - Specifies arbitrary KV metadata
   to associate with the namespace.
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -169,6 +171,10 @@ The corresponding CLI command is [`consul namespace read`](/consul/commands/name
 
 - `name` `(string: <required>)` - Specifies the namespace to read.
 
+### Query Parameters
+
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -272,6 +278,8 @@ The corresponding CLI command is [`consul namespace update`](/consul/commands/na
 - `Meta` `(map<string|string>: <optional>)` - Specifies arbitrary KV metadata
   to associate with the namespace.
 
+@include 'http-api-body-options-partition.mdx'
+
 ### Sample Payload
 
 ```json
@@ -348,18 +356,15 @@ $ curl --request PUT \
 
 ## Delete a Namespace
 
-This endpoint marks a Namespace for deletion. Once marked Consul will
-deleted all the associated Namespaced data in the background. Only once
-all associated data has been deleted will the Namespace actually disappear.
-Until then, further reads can be performed on the namespace and a `DeletedAt`
-field will now be populated with the timestamp of when the Namespace was
-marked for deletion.
+This endpoint marks a Namespace for deletion. Once marked, Consul deletes all the associated Namespaced data in the background. Only after all associated data has been deleted, Consul deletes the Namespace.
+Until then, you can perform further reads on the namespace, and a `DeletedAt`
+field is populated with the timestamp of when the Namespace was marked for deletion.
 
 | Method   | Path               | Produces |
 | -------- | ------------------ | -------- |
 | `DELETE` | `/namespace/:name` | N/A      |
 
-This endpoint will return no data. Success or failure is indicated by the status
+This endpoint returns no data. Success or failure is indicated by the status
 code returned.
 
 The table below shows this endpoint's support for
@@ -378,6 +383,10 @@ The corresponding CLI command is [`consul namespace delete`](/consul/commands/na
 
 - `name` `(string: <required>)` - Specifies the namespace to delete.
 
+### Query Parameters
+
+@include 'http-api-query-parms-partition.mdx'
+
 ### Sample Request
 
 ```shell-session
@@ -449,6 +458,10 @@ the request has been granted any access in the namespace (read, list or write).
 
 The corresponding CLI command is [`consul namespace list`](/consul/commands/namespace/list).
 
+### Query Parameters
+
+@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 7604cb6a19..f0e4d77677 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: "")` - <EnterpriseAlert inline /> The admin partition that the
-  peering token is generated from. Uses `default` when not specified.
+@include 'http-api-body-options-partition.mdx'
 
 - `ServerExternalAddresses` `([]string: <optional>)` - 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: "")` - <EnterpriseAlert inline /> 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: <required>)` - 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: "")` <EnterpriseAlert inline /> - 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: "")` <EnterpriseAlert inline /> - 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: "")` <EnterpriseAlert inline /> - 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 7a7ef7ea70..4f1015cfb6 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 fc2e166d36..acb095c587 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 c7d2c0b9c2..42d7285ca7 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 928863846d..015852f968 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 aef12ff351..d328ea999c 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 38b2ffb57d..b32b2ce934 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 c78e360310..9164f62a7c 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 9d01e9d2b1..cbb9c184c8 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 86b8b4169c..50f1e8112f 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 e33b7e026d..22ad67e0cf 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 cbd4b8d875..e178536515 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 074dfea607..2b611f5a78 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 7d56fd6f21..ad3b114b97 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 b84b5d3c34..28e2f51a79 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 f64a1f7906..edc529a5da 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 44af92bd4e..82989a2697 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 bb2a179d92..9a39e97ab8 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 ed3699ce3f..afd8c75a41 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 7de17d5dcb..aa5008f57d 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 d6991a21e0..1308e445ba 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 7e0c38d165..cfffa6db7e 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 7f2822d6c5..937097fb28 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 f0622ace7e..8cd5fb6b94 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 5ba6595758..13a3ca26e6 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 531b4cc68e..fd3b6c2151 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 e339292d96..dfcbea12d8 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 1a1703cb14..1f89d82864 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 f612627be2..6efa3ad071 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 9d05ecbf47..a57adcb4a9 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 134d6885e6..085b0e34c4 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 e453b11943..5f55a7bcff 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 7a49482c5b..c54a60dfec 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 bb98d8e498..f466654c61 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 744873df56..913adb981d 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 af59baee56..d59fe7928c 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 fadc8d224b..23ae56ceae 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 71c491b06a..bbaccc2be2 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 ad2fca1c97..2cfb97a966 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 84b3a86065..b3db133fd4 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 4c727b1fc2..3d94939b38 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 90e2e54624..17216b0ca7 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 da063e9d82..c05b2f80f8 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 0e83b2facb..6534fe3548 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 574fdfbd87..a960b1b738 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 efb045179f..dcde811fc0 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 ff1df561a6..6299f21e4c 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 f5d611a542..068666e5ca 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 8742af6f4d..adc235be60 100644
--- a/website/content/commands/namespace/delete.mdx
+++ b/website/content/commands/namespace/delete.mdx
@@ -30,7 +30,7 @@ Usage: `consul namespace delete <name>`
 
 #### 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 5d15c1f115..1b043ed657 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 4a4621ef06..778f672ff5 100644
--- a/website/content/commands/namespace/read.mdx
+++ b/website/content/commands/namespace/read.mdx
@@ -41,7 +41,7 @@ Usage: `consul namespace read <name>`
 
 #### 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 6349d307f6..4cce122356 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 678c303a80..f1a16ec006 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 81ba3439db..1bd474dc30 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 <peer 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 a00dc33218..782fb9cda6 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 <peer name> -peering-token <tok
 
 #### Enterprise Options
 
-@include 'http_api_partition_options.mdx'
+@include 'cli-http-api-partition-options.mdx'
 
 #### API Options
 
diff --git a/website/content/commands/peering/exported-services.mdx b/website/content/commands/peering/exported-services.mdx
index 316b6daf21..b8b708060a 100644
--- a/website/content/commands/peering/exported-services.mdx
+++ b/website/content/commands/peering/exported-services.mdx
@@ -31,7 +31,7 @@ Usage: `consul peering exported-services [options] -name <peer 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/generate-token.mdx b/website/content/commands/peering/generate-token.mdx
index 92d007125c..6ce3fb059c 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 f0b1c83777..9838de3e7b 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 596c514520..95a41b2701 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 <peer 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 edc493866e..138de2e763 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 281d5f23e7..370f95dd64 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 <service name> -consumer-peers <ot
 - `-consumer-partitions=<string>` - 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 da1d3dd177..395ad2cb8b 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 a1cbd8cf58..01a09d19bf 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/cli-http-api-partition-options.mdx b/website/content/partials/cli-http-api-partition-options.mdx
new file mode 100644
index 0000000000..eb96310a37
--- /dev/null
+++ b/website/content/partials/cli-http-api-partition-options.mdx
@@ -0,0 +1 @@
+- `-partition=<string>` -  <EnterpriseAlert inline /> Specifies the admin partition to query. If not provided, the partition is inferred from the request's ACL token, or defaults to the `default` partition. 
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 0000000000..cf2acd813c
--- /dev/null
+++ b/website/content/partials/http-api-body-options-partition.mdx
@@ -0,0 +1,2 @@
+
+- `Partition` `(string: "")` - <EnterpriseAlert inline /> The admin partition to use. If not provided, the partition is inferred from the request's ACL token, or defaults to the `default` partition. 
\ 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 0000000000..8d954d86c5
--- /dev/null
+++ b/website/content/partials/http-api-query-parms-partition.mdx
@@ -0,0 +1 @@
+- `partition` `(string: "")` <EnterpriseAlert inline /> - The admin partition to use. If not provided, the partition is inferred from the request's ACL token, or defaults to the `default` partition. 
\ No newline at end of file
diff --git a/website/content/partials/http_api_partition_options.mdx b/website/content/partials/http_api_partition_options.mdx
deleted file mode 100644
index a290c38201..0000000000
--- a/website/content/partials/http_api_partition_options.mdx
+++ /dev/null
@@ -1 +0,0 @@
-- `-partition=<string>` - Specifies the partition to query. If not provided, the partition will be inferred from the request's ACL token, or will default to the `default` partition. Partitions are a Consul Enterprise feature added in v1.11.0.