diff --git a/website/content/docs/enterprise/audit/exclusion.mdx b/website/content/docs/enterprise/audit/exclusion.mdx
index e6ebccec5b..4f63790602 100644
--- a/website/content/docs/enterprise/audit/exclusion.mdx
+++ b/website/content/docs/enterprise/audit/exclusion.mdx
@@ -1,11 +1,11 @@
---
layout: docs
-page_title: Exclusion syntax for audit results
+page_title: Exclusion syntax for audit data
description: >-
Learn about the behavior and syntax for excluding audit data in Vault Enterprise.
---
-# Exclusion syntax for audit results
+# Exclusion syntax for audit data
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/audit/filtering.mdx b/website/content/docs/enterprise/audit/filtering.mdx
index db653f5056..c700270b57 100644
--- a/website/content/docs/enterprise/audit/filtering.mdx
+++ b/website/content/docs/enterprise/audit/filtering.mdx
@@ -1,11 +1,11 @@
---
layout: docs
-page_title: Filter syntax for audit results
+page_title: Filter syntax for audit data
description: >-
Learn about the behavior and syntax for filtering audit data in Vault Enterprise.
---
-# Filter syntax for audit results
+# Filter syntax for audit data
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx b/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx
index 13455e81e6..9da7867b93 100644
--- a/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx
+++ b/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx
@@ -1,13 +1,12 @@
---
layout: docs
-page_title: Vault Enterprise Automated Integrated Storage Snapshots
-description: |-
- Vault Enterprise can be configured to take automated snapshots
- when using raft Integrated Storage and store them locally or
- in the cloud.
+page_title: Automatic snapshots with integrated storage
+description: >-
+ Configure Vault to take and store automated snapshots of backend storage when
+ using integrated storage.
---
-# Automated integrated storage snapshots
+# Automatic snapshots with integrated storage
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/automated-upgrades.mdx b/website/content/docs/enterprise/automated-upgrades.mdx
index a9a6cc6e8b..658dd33091 100644
--- a/website/content/docs/enterprise/automated-upgrades.mdx
+++ b/website/content/docs/enterprise/automated-upgrades.mdx
@@ -1,11 +1,11 @@
---
layout: docs
-page_title: Vault Enterprise Automated Upgrades
-description: |-
- Vault Enterprise can upgrade itself automatically.
+page_title: Automatically upgrade Vault clusters
+description: >-
+ Use automated upgrades to simplify cluster upgrades.
---
-# Automated upgrades
+# Automatically upgrade Vault clusters
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/consistency.mdx b/website/content/docs/enterprise/consistency.mdx
index 7639ee3a20..a463205c0d 100644
--- a/website/content/docs/enterprise/consistency.mdx
+++ b/website/content/docs/enterprise/consistency.mdx
@@ -1,30 +1,31 @@
---
layout: docs
-page_title: Vault Enterprise Eventual Consistency
-description: Vault Enterprise Consistency Model
+page_title: Data consistency in Vault replication
+description: >-
+ Learn how Vault establishes data consistency in replicated deployments.
---
-# Vault eventual consistency
+# Eventual consistency in Vault replication
@include 'alerts/enterprise-and-hcp.mdx'
When running in a cluster, Vault has an eventual consistency model.
-Only one node (the leader) can write to Vault's storage.
+Only one node (the leader) can write to backend storage.
Users generally expect read-after-write consistency: in other
words, after writing foo=1, a subsequent read of foo should return 1. Depending
on the Vault configuration this isn't always the case. When using performance
-standbys with Integrated Storage, or when using performance replication,
+standbys with integrated storage, or when using performance replication,
there are some sequences of operations that don't always yield read-after-write
consistency.
## Performance standby nodes
-When using the Integrated Storage backend without performance standbys, only
+When using the integrated storage backend without performance standbys, only
a single Vault node (the active node) handles requests. Requests sent to
regular standbys are handled by forwarding them to the active node. This Vault configuration
gives Vault the same behavior as the default Consul consistency model.
-When using the Integrated Storage backend with performance standbys, both the
+When using the integrated storage backend with performance standbys, both the
active node and performance standbys can handle requests. If a performance standby
handles a login request, or a request that generates a dynamic secret, the
performance standby will issue a remote procedure call (RPC) to the active node to store the token
@@ -32,7 +33,7 @@ and/or lease. If the performance standby handles any other request that
results in a storage write, it will forward that request to the active node
in the same way a regular standby forwards all requests.
-With Integrated Storage, all writes occur on the active node, which then issues
+With integrated storage, all writes occur on the active node, which then issues
RPCs to update the local storage on every other node. Between when the active
node writes the data to its local disk, and when those RPCs are handled on the
other nodes to write the data to their local disks, those nodes present a stale
@@ -56,7 +57,7 @@ it won't be visible on the secondary cluster until the data has been replicated
from the primary. Therefore, on the secondary cluster, it initially appears as if
the data write hasn't happened.
-If the secondary cluster is using Integrated Storage, and the read request is
+If the secondary cluster is using integrated storage, and the read request is
being handled on one of its performance standbys, the problem is exacerbated because it
has to be sent first from the primary active node to the secondary active node,
and then from there to the secondary performance standby, each of which can
diff --git a/website/content/docs/enterprise/control-groups.mdx b/website/content/docs/enterprise/control-groups.mdx
index d3d681e906..076c97c2f4 100644
--- a/website/content/docs/enterprise/control-groups.mdx
+++ b/website/content/docs/enterprise/control-groups.mdx
@@ -1,10 +1,12 @@
---
layout: docs
-page_title: Vault Enterprise Control Groups
-description: Vault Enterprise has support for Control Group Authorization.
+page_title: Use control groups for authorization
+description: >-
+ Use control group authorization to add authorization to existing
+ authentication request.
---
-# Vault Enterprise control groups
+# Use control groups for authorization
@include 'alerts/enterprise-and-hcp.mdx'
diff --git a/website/content/docs/enterprise/entropy-augmentation.mdx b/website/content/docs/enterprise/entropy-augmentation.mdx
index e3ae7a6d20..a46813be77 100644
--- a/website/content/docs/enterprise/entropy-augmentation.mdx
+++ b/website/content/docs/enterprise/entropy-augmentation.mdx
@@ -1,12 +1,11 @@
---
layout: docs
-page_title: Vault Enterprise Entropy Augmentation
-description: |-
- Vault Enterprise features a mechanism to sample entropy from external
- cryptographic modules.
+page_title: Augment entropy with external sampling
+description: >-
+ Sample entropy from external cryptographic modules to augment Vault defaults.
---
-# Entropy augmentation
+# Augment entropy with external sampling
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/fips/fips1402.mdx b/website/content/docs/enterprise/fips/fips1402.mdx
index 4d46dfa46d..916edd934c 100644
--- a/website/content/docs/enterprise/fips/fips1402.mdx
+++ b/website/content/docs/enterprise/fips/fips1402.mdx
@@ -1,12 +1,12 @@
---
layout: docs
-page_title: Vault Enterprise FIPS 140-2 Inside
-description: |-
- Vault Enterprise features a special build with FIPS 140-2 support built into
- the Vault binary. This can directly be used for FIPS compliance.
+page_title: Built-in FIPS 140-2 support
+description: >-
+ Learn about the FIPS build of Vault, which has FIPS 140-2 support built into
+ the Vault binary for FIPS compliance.
---
-# FIPS 140-2 inside
+# Built-in FIPS 140-2 support
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/fips/index.mdx b/website/content/docs/enterprise/fips/index.mdx
index ee2cbf207e..c2a6750c74 100644
--- a/website/content/docs/enterprise/fips/index.mdx
+++ b/website/content/docs/enterprise/fips/index.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: Vault Enterprise FIPS
-description: An overview of FIPS compliance in Vault.
+page_title: FIPS compliance in Vault
+description: >-
+ Learn about FIPS compliance options in Vault.
---
-# FIPS
+# FIPS compliance in Vault
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/fips/sealwrap.mdx b/website/content/docs/enterprise/fips/sealwrap.mdx
index fd0614986c..b5aca02e3f 100644
--- a/website/content/docs/enterprise/fips/sealwrap.mdx
+++ b/website/content/docs/enterprise/fips/sealwrap.mdx
@@ -1,10 +1,9 @@
---
layout: docs
-page_title: Vault Enterprise FIPS Seal Wrap
-description: |-
- Vault Enterprise features a mechanism to wrap values with an extra layer of
- encryption for supporting seals. This can be used for FIPS Compliance with
- a certified HSM.
+page_title: Seal wrap for FIPS compliance
+description: >-
+ Learn how Vault Enterprise wraps values with an extra layer of encryption for
+ applicable seals for FIPS Compliance with a certified HSM.
---
# Seal wrap for FIPS compliance
diff --git a/website/content/docs/enterprise/hsm/behavior.mdx b/website/content/docs/enterprise/hsm/behavior.mdx
index 1ab5ed409a..cf0963ae7d 100644
--- a/website/content/docs/enterprise/hsm/behavior.mdx
+++ b/website/content/docs/enterprise/hsm/behavior.mdx
@@ -1,12 +1,12 @@
---
layout: docs
-page_title: Behavioral Changes - HSM Integration - Vault Enterprise
+page_title: How HSM support changes Vault behavioral
description: >-
- Vault Enterprise HSM support changes the way Vault works with regard to unseal
- and recovery keys as well as rekey and recovery operations.
+ Understand how HSM support changes the way Vault works with unseal/recovery
+ keys and rekey/recovery operations.
---
-# Vault enterprise HSM behavioral changes
+# How HSM support changes Vault behavioral
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/hsm/index.mdx b/website/content/docs/enterprise/hsm/index.mdx
index 9597b78042..002059637f 100644
--- a/website/content/docs/enterprise/hsm/index.mdx
+++ b/website/content/docs/enterprise/hsm/index.mdx
@@ -1,12 +1,12 @@
---
layout: docs
-page_title: HSM Integration - Vault Enterprise
+page_title: Vault HSM support overview
description: >-
- Vault Enterprise has HSM support, allowing for external root key storage and
+ Review how HSM support in Vault works with external root key storage and
automatic unsealing.
---
-# Vault enterprise HSM support
+# Vault HSM support overview
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/hsm/security.mdx b/website/content/docs/enterprise/hsm/security.mdx
index deec782426..9b9eea54a5 100644
--- a/website/content/docs/enterprise/hsm/security.mdx
+++ b/website/content/docs/enterprise/hsm/security.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: Security Details - HSM Integration - Vault Enterprise
-description: Recommendations to ensure the security of a Vault Enterprise HSM deployment.
+page_title: HSM security details
+description: >-
+ Understand how to ensure the security of a Vault Enterprise HSM deployment.
---
-# Vault enterprise HSM security details
+# HSM security details
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx
index d96eabda79..0f301fd466 100644
--- a/website/content/docs/enterprise/index.mdx
+++ b/website/content/docs/enterprise/index.mdx
@@ -1,9 +1,9 @@
---
layout: docs
page_title: Vault Enterprise
-description: |-
- Vault Enterprise features a number of capabilities beyond the open
- source offering that may be beneficial in certain workflows.
+description: >-
+ Upgrade to Vault Enterprise to access enterprise-critical functionality not
+ available in the open source offering.
---
# Vault Enterprise
diff --git a/website/content/docs/enterprise/lease-count-quotas.mdx b/website/content/docs/enterprise/lease-count-quotas.mdx
index a8897119cc..7f85870b14 100644
--- a/website/content/docs/enterprise/lease-count-quotas.mdx
+++ b/website/content/docs/enterprise/lease-count-quotas.mdx
@@ -1,11 +1,11 @@
---
layout: docs
-page_title: Vault Enterprise Lease Count Quotas
-description: |-
- Vault Enterprise features a mechanism to create lease count quotas.
+page_title: Enforce lease count quotas
+description: >-
+ Configure Vault Enterprise to establish and enforce lease count quotas.
---
-# Lease count quotas
+# Enforce lease count quotas
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/license/autoloading.mdx b/website/content/docs/enterprise/license/autoloading.mdx
index d153c4a199..0aed68c0ed 100644
--- a/website/content/docs/enterprise/license/autoloading.mdx
+++ b/website/content/docs/enterprise/license/autoloading.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: License Autoloading
-description: An overview of license autoloading.
+page_title: Autoload an enterprise license
+description: >-
+ Learn how Vault automatically loads enterprise licenses.
---
-# License autoloading
+# Automatically load a Vault enterprise license
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/license/faq.mdx b/website/content/docs/enterprise/license/faq.mdx
index fc92ea638e..a579408c9c 100644
--- a/website/content/docs/enterprise/license/faq.mdx
+++ b/website/content/docs/enterprise/license/faq.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: Frequently Asked Questions (FAQ)
-description: An overview of license.
+page_title: Vault licensing FAQ
+description: >-
+ Frequently asked questions about Vault Enterprise licensing.
---
-# License FAQ
+# Vault licensing FAQ
This FAQ section is for license changes and updates introduced for Vault Enterprise.
- [Q: How do the license termination changes affect upgrades?](#q-how-do-the-license-termination-changes-affect-upgrades)
diff --git a/website/content/docs/enterprise/license/index.mdx b/website/content/docs/enterprise/license/index.mdx
index 6f2635507f..61c1b32205 100644
--- a/website/content/docs/enterprise/license/index.mdx
+++ b/website/content/docs/enterprise/license/index.mdx
@@ -1,13 +1,45 @@
---
layout: docs
-page_title: Vault Enterprise License
-description: An overview of license.
+page_title: Vault Enterprise licensing
+description: >-
+ Find documentation related to Vault Enterprise licensing
---
-# Vault license
+# Vault Enterprise licensing
@include 'alerts/enterprise-only.mdx'
-Licenses and EULA enhancements have been introduced in Vault 1.8 release. Please refer to the [FAQ](/vault/docs/enterprise/license/faq) for common questions concerning these changes.
+Vault 1.8 introduced licenses and EULA enhancements that gate enterprise
+features in Vault.
-The [Install a HashiCorp Enterprise License](/vault/tutorials/enterprise/hashicorp-enterprise-license) tutorial provides the instruction to load your Vault license.
+
+
+
+
+- [Automatically load a Vault enterprise license](/vault/docs/enterprise/license/autoloading) -
+ Learn how Vault automatically loads enterprise licenses.
+
+- [Automated license utilization reporting](/vault/docs/enterprise/license/autoloading) -
+ Learn about the data HashiCorp collects automatically to meter Enterprise
+ license utilization and how to enable or disable automated reporting
+
+- [Manual license utilization reporting](/vault/docs/enterprise/license/manual-reporting) -
+ Learn how to manually export, review, and send license utilization data to
+ HashiCorp through the Vault CLI or HCP web portal.
+
+- [Anonymous product usage reporting](/vault/docs/enterprise/license/product-usage-reporting) -
+ Learn about the anonymized data HashiCorp collects automatically for product
+ usage reporting and how to enable or disable data collection.
+
+- [Vault licensing FAQ](/vault/docs/enterprise/license/faq)
+
+
+
+
+
+- [Install a HashiCorp Enterprise License](/vault/tutorials/enterprise/hashicorp-enterprise-license) -
+ guided walkthrough for loading a Vault license.
+
+
+
+
diff --git a/website/content/docs/enterprise/license/manual-reporting.mdx b/website/content/docs/enterprise/license/manual-reporting.mdx
index 26b573de34..52cab9ee6f 100644
--- a/website/content/docs/enterprise/license/manual-reporting.mdx
+++ b/website/content/docs/enterprise/license/manual-reporting.mdx
@@ -2,7 +2,8 @@
layout: docs
page_title: Manual license utilization reporting
description: >-
- Manual license utilization reporting allows you to export, review, and send license utilization data to HashiCorp through the CLI or HCP Web Portal.
+ Learn how to manually export, review, and send license utilization data to
+ HashiCorp through the Vault CLI or HCP web portal.
---
# Manual license utilization reporting
@@ -10,7 +11,8 @@ description: >-
@include 'alerts/enterprise-only.mdx'
Manual license utilization reporting allows you to export, review, and send
-license utilization data to HashiCorp via the CLI or HCP Web Portal. Use these
+license utilization data to HashiCorp via the CLI or
+[HCP web portal](https://portal.cloud.hashicorp.com/). Use these
reports to understand how much more you can deploy under your current contract,
protect against overutilization, and budget for predicted consumption. Manual
reporting shares the minimum data required to validate license utilization as
diff --git a/website/content/docs/enterprise/license/product-usage-reporting.mdx b/website/content/docs/enterprise/license/product-usage-reporting.mdx
index cc6331f43f..2a62a4efd1 100644
--- a/website/content/docs/enterprise/license/product-usage-reporting.mdx
+++ b/website/content/docs/enterprise/license/product-usage-reporting.mdx
@@ -1,11 +1,12 @@
---
layout: docs
-page_title: Product usage reporting
+page_title: Anonymous product usage reporting
description: >-
- Learn what anonymous usage data HashiCorp collects as part of Enterprise utilization reporting. Enable or disable collection.
+ Learn about the anonymized data HashiCorp collects automatically for product
+ usage reporting and how to enable or disable data collection.
---
-# Product usage reporting
+# Anonymous product usage reporting
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/license/utilization-reporting.mdx b/website/content/docs/enterprise/license/utilization-reporting.mdx
index 7625d3249b..7993145091 100644
--- a/website/content/docs/enterprise/license/utilization-reporting.mdx
+++ b/website/content/docs/enterprise/license/utilization-reporting.mdx
@@ -2,7 +2,8 @@
layout: docs
page_title: Automated license utilization reporting
description: >-
- Learn what data HashiCorp collects to meter Enterprise license utilization. Enable or disable reporting. Review sample payloads and logs.
+ Learn about the data HashiCorp collects automatically to meter Enterprise
+ license utilization and how to enable or disable automated reporting.
---
# Automated license utilization reporting
diff --git a/website/content/docs/enterprise/managed-keys.mdx b/website/content/docs/enterprise/managed-keys.mdx
index 688c65285d..f2f60d2194 100644
--- a/website/content/docs/enterprise/managed-keys.mdx
+++ b/website/content/docs/enterprise/managed-keys.mdx
@@ -1,11 +1,11 @@
---
layout: docs
-page_title: Managed Keys
+page_title: Use 3rd party key management
description: >-
- Managed Keys is a system in Vault that defers all private key operations to a third party system.
+ Configure Vault to defer private key operations to a third party system.
---
-# Managed keys
+# Use 3rd party key management for private keys
@include 'alerts/enterprise-and-hcp.mdx'
diff --git a/website/content/docs/enterprise/mfa/index.mdx b/website/content/docs/enterprise/mfa/index.mdx
index 27daca8111..b0a5cc8055 100644
--- a/website/content/docs/enterprise/mfa/index.mdx
+++ b/website/content/docs/enterprise/mfa/index.mdx
@@ -1,12 +1,11 @@
---
layout: docs
-page_title: MFA Support - Vault Enterprise
+page_title: MFA support in Vault
description: >-
- Vault Enterprise has support for Multi-factor Authentication (MFA), using
- different authentication types.
+ Learn about using multi-factor authentication (MFA) support with Vault.
---
-# Vault enterprise MFA support
+# Multi-factor authentication (MFA) support in Vault
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/mfa/mfa-duo.mdx b/website/content/docs/enterprise/mfa/mfa-duo.mdx
index bdafa5de00..9ba0baa556 100644
--- a/website/content/docs/enterprise/mfa/mfa-duo.mdx
+++ b/website/content/docs/enterprise/mfa/mfa-duo.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: Duo MFA - MFA Support - Vault Enterprise
-description: Vault Enterprise supports Duo MFA type.
+page_title: Configure Duo for MFA
+description: >-
+ Configure Vault to use Duo for multi-factor authentication.
---
-# Duo MFA
+# Configure Vault with Duo for MFA
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/mfa/mfa-okta.mdx b/website/content/docs/enterprise/mfa/mfa-okta.mdx
index 7fa58bfa69..7dde961392 100644
--- a/website/content/docs/enterprise/mfa/mfa-okta.mdx
+++ b/website/content/docs/enterprise/mfa/mfa-okta.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: Okta MFA - MFA Support - Vault Enterprise
-description: Vault Enterprise supports Okta MFA type.
+page_title: Configure Okta for MFA
+description: >-
+ Configure Vault to use Okta for multi-factor authentication.
---
-# Okta MFA
+# Configure Vault with Okta for MFA
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/mfa/mfa-pingid.mdx b/website/content/docs/enterprise/mfa/mfa-pingid.mdx
index 77581babaa..2fe50c5085 100644
--- a/website/content/docs/enterprise/mfa/mfa-pingid.mdx
+++ b/website/content/docs/enterprise/mfa/mfa-pingid.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: PingID MFA - MFA Support - Vault Enterprise
-description: Vault Enterprise supports PingID MFA type.
+page_title: Configure PingID for MFA
+description: >-
+ Configure Vault to use PingID for multi-factor authentication.
---
-# PingID MFA
+# Configure Vault with PingID for MFA
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/mfa/mfa-totp.mdx b/website/content/docs/enterprise/mfa/mfa-totp.mdx
index 3e2cc7129f..16d072b38a 100644
--- a/website/content/docs/enterprise/mfa/mfa-totp.mdx
+++ b/website/content/docs/enterprise/mfa/mfa-totp.mdx
@@ -1,10 +1,12 @@
---
layout: docs
-page_title: TOTP MFA - MFA Support - Vault Enterprise
-description: Vault Enterprise supports TOTP MFA type.
+page_title: Configure TOTP for MFA
+description: >-
+ Configure Vault to use a time-based, one-time password (TOTP) for multi-factor
+ authentication.
---
-# TOTP MFA
+# Configure Vault with time-based, one-time passwords (TOTP) for MFA
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/namespaces/configure-cross-namespace-access.mdx b/website/content/docs/enterprise/namespaces/configure-cross-namespace-access.mdx
index ff39607db5..adefa2f9cf 100644
--- a/website/content/docs/enterprise/namespaces/configure-cross-namespace-access.mdx
+++ b/website/content/docs/enterprise/namespaces/configure-cross-namespace-access.mdx
@@ -1,11 +1,11 @@
---
layout: docs
-page_title: Configure cross namespace access without hierarchical relationships
+page_title: Configure cross namespace access
description: >-
- Set up cross namespace access without hierarchical relationships for Vault Enterprise.
+ Set up cross namespace access in Vault without using hierarchical relationships.
---
-# Configure cross namespace access
+# Configure cross namespace access in Vault
Using the `sys/config/group_policy_application` endpoint, you can enable secrets sharing
across multiple independent namespaces.
diff --git a/website/content/docs/enterprise/namespaces/create-admin-namespace.mdx b/website/content/docs/enterprise/namespaces/create-admin-namespace.mdx
index 817edc18b0..bf2b4d46ee 100644
--- a/website/content/docs/enterprise/namespaces/create-admin-namespace.mdx
+++ b/website/content/docs/enterprise/namespaces/create-admin-namespace.mdx
@@ -2,11 +2,12 @@
layout: docs
page_title: Configure an administrative namespace
description: >-
- Step-by-step guide for setting up an administrative namespace with Vault
- Enterprise
+ Step-by-step guide for setting up an administrative namespace in Vault
---
-# Create an administrative namespace
+# Create an administrative namespace
+
+@include 'alerts/enterprise-only.mdx'
Grant access to a predefined subset of privileged system backend endpoints in
the Vault API with an administrative namespace.
diff --git a/website/content/docs/enterprise/namespaces/index.mdx b/website/content/docs/enterprise/namespaces/index.mdx
index 769d5dcf98..d5dfc909a3 100644
--- a/website/content/docs/enterprise/namespaces/index.mdx
+++ b/website/content/docs/enterprise/namespaces/index.mdx
@@ -1,12 +1,13 @@
---
layout: docs
-page_title: Namespaces - Vault Enterprise
+page_title: Namespace and SMT support in Vault
description: >-
- Vault Enterprise has support for Namespaces, a feature to enable Secure
- Multi-tenancy (SMT) and self-management.
+ Learn about namespaces and secure multi-tenancy (SMT) support in Vault.
---
-# Vault Enterprise namespaces
+# Namespace and secure multi-tenancy (SMT) support in Vault
+
+@include 'alerts/enterprise-and-hcp.mdx'
Many organizations implement Vault as a service to provide centralized
management of sensitive data and ensure that the different teams in an
diff --git a/website/content/docs/enterprise/namespaces/namespace-limits.mdx b/website/content/docs/enterprise/namespaces/namespace-limits.mdx
index 8f9b183013..2108b5f3cc 100644
--- a/website/content/docs/enterprise/namespaces/namespace-limits.mdx
+++ b/website/content/docs/enterprise/namespaces/namespace-limits.mdx
@@ -1,11 +1,13 @@
---
layout: docs
-page_title: Run Vault Enterprise with many namespaces
+page_title: Run Vault with many namespaces
description: >-
- Guidance for using thousands of namespaces with Vault Enterprise
+ Guidance for using thousands of namespaces with Vault
---
-# Run Vault Enterprise with many namespaces
+# Run Vault with many namespaces
+
+@include 'alerts/enterprise-and-hcp.mdx'
Use namespaces to create isolated environments within Vault Enterprise.
By default, Vault limits the number and depth of namespaces based on your
diff --git a/website/content/docs/enterprise/namespaces/namespace-structure.mdx b/website/content/docs/enterprise/namespaces/namespace-structure.mdx
index 71e4e0e9fd..dfc36c22fc 100644
--- a/website/content/docs/enterprise/namespaces/namespace-structure.mdx
+++ b/website/content/docs/enterprise/namespaces/namespace-structure.mdx
@@ -1,11 +1,12 @@
---
layout: docs
-page_title: Namespace and mount structure guide
+page_title: Best practices for namespaces and mount paths
description: >-
- Explains HashiCorp's recommended approach to structuring the Vault namespaces, and how namespaces impact on the endpoint paths.
+ Review best practices for structuring Vault namespaces and learn how
+ namespaces impact endpoint paths.
---
-# Namespace and mount structure guide
+# Best practices for namespaces and mount paths
Namespaces are isolated environments that functionally create "Vaults within a
Vault." They have separate login paths, and support creating and managing data
diff --git a/website/content/docs/enterprise/performance-standby.mdx b/website/content/docs/enterprise/performance-standby.mdx
index 91dc4eab1f..b48ad4b8cc 100644
--- a/website/content/docs/enterprise/performance-standby.mdx
+++ b/website/content/docs/enterprise/performance-standby.mdx
@@ -1,10 +1,12 @@
---
layout: docs
-page_title: Performance Standby Nodes - Vault Enterprise
-description: Performance Standby Nodes - Vault Enterprise
+page_title: Use performance standby nodes
+description: >-
+ Use performance standby nodes with Vault Enterprise clusters for high
+ availability.
---
-# Performance standby nodes
+# Use performance standby nodes
@include 'alerts/enterprise-and-hcp.mdx'
diff --git a/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx b/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx
index 81cac0db6d..99b0c39928 100644
--- a/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx
+++ b/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx
@@ -1,11 +1,12 @@
---
layout: docs
-page_title: AWS KMS External Key Store (XKS) - PKCS#11 Provider - Vault Enterprise
-description: |-
- AWS KMS External Key Store can use Vault as a key store via the Vault PKCS#11 Provider.
+page_title: Configure PKCS#11 with AWS KMS XKS
+description: >-
+ Use the Vault PKCS#11 provider with AWS KMS External Key Store (XKS) to store
+ and manage cryptographic keys.
---
-# Vault with AWS KMS external key store (XKS) via PKCS#11 and XKS proxy
+# Configure PKCS#11 with AWS KMS external key store (XKS)
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/pkcs11-provider/index.mdx b/website/content/docs/enterprise/pkcs11-provider/index.mdx
index a2357d8259..94ea81e708 100644
--- a/website/content/docs/enterprise/pkcs11-provider/index.mdx
+++ b/website/content/docs/enterprise/pkcs11-provider/index.mdx
@@ -1,18 +1,17 @@
---
layout: docs
-page_title: PKCS#11 Provider - Vault Enterprise
-description: |-
- The Vault PKCS#11 Provider allows Vault KMIP Secrets Engine to be used via PKCS#11 calls.
- The provider supports a subset of key generation, encryption, decryption and key storage operations.
- This requires the Enterprise ADP-KM license.
+page_title: PKCS#11 support in Vault
+description: >-
+ Use the PKCS#11 provider to support KMIP secrets with PKCS#11 calls.
---
-# PKCS#11 provider
+# PKCS#11 support in Vault
@include 'alerts/enterprise-only.mdx'
PKCS11 provider is part of the [KMIP Secret Engine](/vault/docs/secrets/kmip), which requires [Vault Enterprise](https://www.hashicorp.com/products/vault/pricing)
-with the Advanced Data Protection (ADP) module.
+with the Advanced Data Protection (ADP) module. The PKCS11 provider supports a subset of key generation, encryption, decryption and key storage operations.
+You must have an Enterprise ADP-KM license to use the PKCS11 provider.
[PKCS#11](http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/os/pkcs11-base-v2.40-os.html)
is an open standard C API that provides a means to access cryptographic capabilities on a device.
diff --git a/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx b/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx
index b258264550..14917c293f 100644
--- a/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx
+++ b/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx
@@ -1,11 +1,12 @@
---
layout: docs
-page_title: Oracle TDE - PKCS#11 Provider - Vault Enterprise
-description: |-
- The Vault PKCS#11 Provider can be used to enable Oracle TDE.
+page_title: Configure PKCS#11 with Oracle TDE
+description: >-
+ Use the Vault PKCS#11 provider with Oracle Transparent Data Encryption (TDE)
+ to store and manage cryptographic keys.
---
-# Oracle TDE
+# Configure PKCS#11 with Oracle TDE
@include 'alerts/enterprise-only.mdx'
diff --git a/website/content/docs/enterprise/redundancy-zones.mdx b/website/content/docs/enterprise/redundancy-zones.mdx
index c4cb9f903a..ccd0338baa 100644
--- a/website/content/docs/enterprise/redundancy-zones.mdx
+++ b/website/content/docs/enterprise/redundancy-zones.mdx
@@ -1,15 +1,16 @@
---
layout: docs
-page_title: Vault Enterprise Redundancy Zones
-description: |-
- Vault Enterprise clusters can have hot standby nodes for scalability and resiliency.
+page_title: Use redundancy zones
+description: >-
+ Use redundancy zones with hot standby nodes for improved scalability and
+ resiliency with Vault Enterprise clusters.
---
-# Redundancy zones
+# Use redundancy zones
@include 'alerts/enterprise-only.mdx'
-Vault Enterprise Redundancy Zones provide both read scaling and resiliency benefits by enabling
+Vault Enterprise redundancy zones provide both read scaling and resiliency benefits by enabling
the deployment of non-voting nodes alongside voting nodes on a per availability zone basis.
When using redundancy zones, if an operator chooses to deploy Vault across three availability zones,
diff --git a/website/content/docs/enterprise/replication/check-merkle-tree-corruption.mdx b/website/content/docs/enterprise/replication/check-merkle-tree-corruption.mdx
index ef15339f0b..0a3c0d8953 100644
--- a/website/content/docs/enterprise/replication/check-merkle-tree-corruption.mdx
+++ b/website/content/docs/enterprise/replication/check-merkle-tree-corruption.mdx
@@ -2,7 +2,8 @@
layout: docs
page_title: Check for Merkle tree corruption
description: >-
- Learn how to check your Vault Enterprise cluster data for corruption in the Merkle trees used for replication.
+ Learn how to check Vault cluster data for corruption in the Merkle trees used
+ for replication.
---
# Check for Merkle tree corruption
diff --git a/website/content/docs/enterprise/replication/index.mdx b/website/content/docs/enterprise/replication/index.mdx
index ac13fed408..aa0a3dbb77 100644
--- a/website/content/docs/enterprise/replication/index.mdx
+++ b/website/content/docs/enterprise/replication/index.mdx
@@ -1,13 +1,12 @@
---
layout: docs
-page_title: Replication - Vault Enterprise
+page_title: Replication support in Vault
description: >-
- Vault Enterprise has support for Replication, allowing critical data to be
- replicated across clusters to support horizontally scaling and disaster
- recovery workloads.
+ Learn how Vault replicates data across clusters to support horizontal scaling
+ and disaster recovery workloads.
---
-# Vault Enterprise replication
+# Replication support in Vault
@include 'alerts/enterprise-and-hcp.mdx'
diff --git a/website/content/docs/enterprise/sealwrap.mdx b/website/content/docs/enterprise/sealwrap.mdx
index 99993f51a1..0186f11fcd 100644
--- a/website/content/docs/enterprise/sealwrap.mdx
+++ b/website/content/docs/enterprise/sealwrap.mdx
@@ -1,17 +1,17 @@
---
layout: docs
-page_title: Vault Enterprise Seal Wrap
-description: |-
- Vault Enterprise features a mechanism to wrap values with an extra layer of
- encryption for supporting seals.
+page_title: Wrap seals with encryption
+description: >-
+ Wrap sealed data with an extra layer of encryption to honor increased
+ compliance and regulatory requirements including FIPS 140-2.
---
-# Seal wrap
+# Wrap seals with encryption
@include 'alerts/enterprise-and-hcp.mdx'
Vault Enterprise features a mechanism to wrap values with an extra layer of
-encryption for supporting [seals](/vault/docs/configuration/seal). This adds an
+encryption for supported [seals](/vault/docs/configuration/seal). This adds an
extra layer of protection and is useful in some compliance and regulatory
environments, including FIPS 140-2 environments.
diff --git a/website/content/docs/enterprise/sentinel/examples.mdx b/website/content/docs/enterprise/sentinel/examples.mdx
index 8a562b4b23..cbec77431c 100644
--- a/website/content/docs/enterprise/sentinel/examples.mdx
+++ b/website/content/docs/enterprise/sentinel/examples.mdx
@@ -1,7 +1,8 @@
---
layout: docs
-page_title: Sentinel Examples
-description: An overview of how Sentinel interacts with Vault Enterprise.
+page_title: Sentinel examples
+description: >-
+ Examples for managing Vault policies with Sentinel.
---
# Examples
diff --git a/website/content/docs/enterprise/sentinel/index.mdx b/website/content/docs/enterprise/sentinel/index.mdx
index 111e61a1c7..671fa8bb89 100644
--- a/website/content/docs/enterprise/sentinel/index.mdx
+++ b/website/content/docs/enterprise/sentinel/index.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: Vault Enterprise Sentinel Integration
-description: An overview of how Sentinel interacts with Vault Enterprise.
+page_title: Mange Vault policies with Sentinel
+description: >-
+ Mange Vault policies programmatically with Sentinel.
---
-# Vault Enterprise and Sentinel integration
+# Mange Vault policies with Sentinel
@include 'alerts/enterprise-and-hcp.mdx'
diff --git a/website/content/docs/enterprise/sentinel/properties.mdx b/website/content/docs/enterprise/sentinel/properties.mdx
index 6dd3b208e6..025a73a6b9 100644
--- a/website/content/docs/enterprise/sentinel/properties.mdx
+++ b/website/content/docs/enterprise/sentinel/properties.mdx
@@ -1,10 +1,11 @@
---
layout: docs
-page_title: Sentinel Properties
-description: An overview of how Sentinel interacts with Vault Enterprise.
+page_title: Sentinel properties for Vault
+description: >-
+ An overview of Sentinel properties relevant to managing Vault policies.
---
-# Properties
+# Sentinel properties for Vault
@include 'alerts/enterprise-and-hcp.mdx'
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index b90a8a9af9..5a4baf7157 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -2926,14 +2926,14 @@
"path": "enterprise"
},
{
- "title": "License",
+ "title": "Licensing",
"routes": [
{
"title": "Overview",
"path": "enterprise/license"
},
{
- "title": "Autoloading",
+ "title": "Autoload an enterprise license",
"path": "enterprise/license/autoloading"
},
{
@@ -2945,7 +2945,7 @@
"path": "enterprise/license/manual-reporting"
},
{
- "title": "Product usage reporting",
+ "title": "Anonymous product usage reporting",
"path": "enterprise/license/product-usage-reporting"
},
{
@@ -2966,7 +2966,7 @@
"title": "Replication",
"routes": [
{
- "title": "Overview",
+ "title": "Replication support in Vault",
"path": "enterprise/replication"
},
{
@@ -2979,82 +2979,82 @@
"title": "HSM Support",
"routes": [
{
- "title": "Overview",
+ "title": "HSM support overview",
"path": "enterprise/hsm"
},
{
- "title": "Behavioral Changes",
+ "title": "How HSM changes Vault",
"path": "enterprise/hsm/behavior"
},
{
- "title": "Security",
+ "title": "HSM security details",
"path": "enterprise/hsm/security"
}
]
},
{
- "title": "PKCS11 Provider",
+ "title": "PKCS11 provider",
"routes": [
{
- "title": "Overview",
+ "title": "PKCS#11 support in Vault",
"path": "enterprise/pkcs11-provider"
},
{
- "title": "AWS KMS XKS",
+ "title": "Use PKCS#11 with AWS KMS",
"path": "enterprise/pkcs11-provider/aws-xks"
},
{
- "title": "Oracle TDE",
+ "title": "Use PKCS#11 with Oracle TDE",
"path": "enterprise/pkcs11-provider/oracle-tde"
}
]
},
{
- "title": "Automated Integrated Storage Snapshots",
+ "title": "Automatic snapshots with integrated storage",
"path": "enterprise/automated-integrated-storage-snapshots"
},
{
- "title": "Automated Upgrades",
+ "title": "Automatically upgrade Vault clusters",
"path": "enterprise/automated-upgrades"
},
{
- "title": "Redundancy Zones",
+ "title": "Use redundancy zones",
"path": "enterprise/redundancy-zones"
},
{
- "title": "Lease Count Quotas",
+ "title": "Enforce lease count quotas",
"path": "enterprise/lease-count-quotas"
},
{
- "title": "Entropy Augmentation",
+ "title": "Augment entropy with external samples",
"path": "enterprise/entropy-augmentation"
},
{
"title": "FIPS",
"routes": [
{
- "title": "Overview",
+ "title": "FIPS compliance in Vault",
"path": "enterprise/fips"
},
{
- "title": "FIPS 140-2 Inside Vault",
+ "title": "Built-in FIPS 140-2 support",
"path": "enterprise/fips/fips1402"
},
{
- "title": "Seal Wrap for FIPS 140-2",
+ "title": "Seal wrap for FIPS compliance",
"path": "enterprise/fips/sealwrap"
}
]
},
{
- "title": "Seal Wrap",
+ "title": "Wrap seals with encryption",
"path": "enterprise/sealwrap"
},
{
- "title": "Namespaces",
+ "title": "Namespaces and SMT",
"routes": [
{
- "title": "Overview",
+ "title": "Namespace + SMT support in Vault",
"path": "enterprise/namespaces"
},
{
@@ -3080,17 +3080,17 @@
}
},
{
- "title": "Structure guide",
+ "title": "Best practices for namespaces",
"path": "enterprise/namespaces/namespace-structure"
}
]
},
{
- "title": "Performance Standbys",
+ "title": "Use performance standby nodes",
"path": "enterprise/performance-standby"
},
{
- "title": "Eventual Consistency",
+ "title": "Data consistency for replication",
"path": "enterprise/consistency"
},
{
@@ -3107,57 +3107,57 @@
]
},
{
- "title": "Control Groups",
+ "title": "Use control group authZ ",
"path": "enterprise/control-groups"
},
{
- "title": "Managed Keys",
+ "title": "3rd party key management",
"path": "enterprise/managed-keys"
},
{
- "title": "MFA",
+ "title": "Multi-factor authN",
"routes": [
{
- "title": "Overview",
+ "title": "MFA support in Vault",
"path": "enterprise/mfa"
},
{
- "title": "Duo MFA",
+ "title": "Configure Duo for MFA",
"path": "enterprise/mfa/mfa-duo"
},
{
- "title": "Okta MFA",
+ "title": "Configure Okta for MFA",
"path": "enterprise/mfa/mfa-okta"
},
{
- "title": "PingID MFA",
+ "title": "Configure PingID for MFA",
"path": "enterprise/mfa/mfa-pingid"
},
{
- "title": "TOTP MFA",
+ "title": "Configure TOTP for MFA",
"path": "enterprise/mfa/mfa-totp"
}
]
},
{
- "title": "Sentinel",
+ "title": "Manage policies as code",
"routes": [
{
- "title": "Overview",
+ "title": "Mange Vault policies with Sentinel",
"path": "enterprise/sentinel"
},
{
- "title": "Examples",
- "path": "enterprise/sentinel/examples"
+ "title": "Sentinel properties for Vault",
+ "path": "enterprise/sentinel/properties"
},
{
- "title": "Properties",
- "path": "enterprise/sentinel/properties"
+ "title": "Sentinel examples",
+ "path": "enterprise/sentinel/examples"
}
]
},
{
- "title": "HCP Vault",
+ "title": "HCP Vault docs",
"href": "https://cloud.hashicorp.com/docs/vault"
}
]