diff --git a/website/content/docs/concepts/security/data-encryption.mdx b/website/content/docs/concepts/security/data-encryption.mdx
index b7ead769f2..26a7b5c3fd 100644
--- a/website/content/docs/concepts/security/data-encryption.mdx
+++ b/website/content/docs/concepts/security/data-encryption.mdx
@@ -20,7 +20,7 @@ Worker](/boundary/docs/configuration/worker/pki-worker) for storage of authentic
keys. It is optional for PKI workers; if not specified the authentication keys
will not be encrypted on disk. This is not used by KMS workers.
-## The `root` KMS key and per-scope KEK/DEKs OSS only
+## The `root` KMS key and per-scope KEK/DEKs Community Edition only
Following best practices of using different encryption keys for different
purposes, Boundary has a number of encryption keys generated within each scope.
@@ -110,14 +110,14 @@ The `bsr` KMS key is required for [session recording](/boundary/docs/configurati
If you do not add a `bsr` key to your controller configuration, you will receive an error when you attempt to enable session recording.
The key is used for encrypting data and checking the integrity of recordings.
-## The `previous-root` KMS key OSS only
+## The `previous-root` KMS key Community Edition only
The `previous-root` KMS key is used when migrating to a new `root` key. Adding
the `previous-root` KMS key to your configuration informs the Controller to use
it for decrypting the existing information in the database, allowing you to
rotate and rewrap the KEKs to complete the migration to the new root key.
-## The `worker-auth` KMS key OSS only
+## The `worker-auth` KMS key Community Edition only
The `worker-auth` KMS key is a key shared by the Controller and Worker in order
to authenticate a Worker to the Controller. Specifics of this mechanism can be
@@ -125,7 +125,7 @@ found on the [Connections/TLS page](/boundary/docs/concepts/security/connections
a worker is used with [PKI
authentication](/boundary/docs/configuration/worker/pki-worker) this is unnecessary.
-## The `recovery` KMS key OSS only
+## The `recovery` KMS key Community Edition only
The `recovery` KMS key is used for rescue/recovery operations that can be used
by a client to authenticate almost any operation within Boundary. Its mechanism
@@ -161,7 +161,7 @@ with the options to skip creating default resources, Terraform can be used to
create the specific resources needed instead, with the `recovery` KMS used to
authenticate setting up the initial auth method(s).
-## The `config` KMS key OSS only
+## The `config` KMS key Community Edition only
This key can be used to encrypt values within Boundary's configuration file. By
sharing this block between Boundary and an operator, the operator can put
diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx
index 417e19cf80..3116a77779 100644
--- a/website/content/docs/enterprise/index.mdx
+++ b/website/content/docs/enterprise/index.mdx
@@ -7,7 +7,7 @@ description: |-
# Boundary Enterprise
-Boundary Enterprise has features that are not available in the open source version of the product, as well as support.
+Boundary Enterprise has features that are not available in the Community Edition of the product, as well as support.
The Enterprise version is self-managed in your environment, making it the perfect choice for agencies that are not able to use SaaS products for compliance or regulatory reasons.
The [Install Boundary](/boundary/docs/install-boundary) section can help you build a self-managed production environment using Boundary Enterprise.
@@ -16,9 +16,9 @@ You must obtain a [license](/boundary/docs/enterprise/licensing) to use Boundary
You can enable or opt out of automated license reporting.
Refer to [Automated license utilization reporting](/boundary/docs/enterprise/automated-license-reporting) for more information.
-## Upgrade from Boundary OSS
+## Upgrade from Boundary Community Edition
-To upgrade from the open source version of Boundary to Boundary Enterprise, complete the following steps:
+To upgrade from the Community Edition of Boundary to Boundary Enterprise, complete the following steps:
1. [Contact sales](https://hashicorp.com/contact-sales) to procure a Boundary Enterprise license.
1. [Upgrade Boundary](/boundary/tutorials/self-managed-deployment/upgrade-version) using a Boundary Enterprise binary.
diff --git a/website/content/docs/getting-started/dev-mode/dev-mode.mdx b/website/content/docs/getting-started/dev-mode/dev-mode.mdx
index 8097363377..ba20075db6 100644
--- a/website/content/docs/getting-started/dev-mode/dev-mode.mdx
+++ b/website/content/docs/getting-started/dev-mode/dev-mode.mdx
@@ -1,7 +1,7 @@
---
layout: docs
page_title: What is dev mode?
-description: Getting started with Boundary OSS in dev mode
+description: Getting started with Boundary Community Edition in dev mode
---
# What is dev mode?
diff --git a/website/content/docs/getting-started/index.mdx b/website/content/docs/getting-started/index.mdx
index 9ca91aee35..1497cb28e8 100644
--- a/website/content/docs/getting-started/index.mdx
+++ b/website/content/docs/getting-started/index.mdx
@@ -15,7 +15,7 @@ There are three options to get started with Boundary:
easiest way to get started. It streamlines deployment and operations, and is
available as a freemium service. HCP Boundary allows users to run their own
worker proxies, preventing exposure of your network to HashiCorp or clients.
- HCP Boundary has features that are not available in the open source version of the product, as well as support.
+ HCP Boundary has features that are not available in the Community Edition of the product, as well as support.
It has full feature-parity with Boundary Enterprise.
Review the [Get
started with HCP Boundary](/boundary/docs/getting-started/deploy-and-login) section to
@@ -24,9 +24,9 @@ There are three options to get started with Boundary:
It has full feature-parity with HCP Boundary.
The Enterprise version is self-managed in your environment, making it the perfect choice for agencies that are not able to use SaaS products for compliance or regulatory reasons.
The [Install Boundary](/boundary/docs/install-boundary) section can help you build a self-managed production environment using Boundary Enterprise.
-- **Boundary OSS** is an open source distribution of Boundary that users can run
+- **Boundary Community Edition** is a free distribution of Boundary that users can run
in their own environments. The [Dev Mode quick start](/boundary/docs/oss/installing/dev-mode) section discusses running Boundary
- in Dev mode on your local machine, allowing you to get started with the OSS distribution quickly.
+ in Dev mode on your local machine, allowing you to get started with the Community Edition distribution quickly.
We recommend you use the Boundary model that best meets your intended use case.
If you’re not sure what’s best for you, we recommend reviewing the [Getting
diff --git a/website/content/docs/hcp/get-started/deploy-and-login.mdx b/website/content/docs/hcp/get-started/deploy-and-login.mdx
index ae3f0b148e..9d731b266c 100644
--- a/website/content/docs/hcp/get-started/deploy-and-login.mdx
+++ b/website/content/docs/hcp/get-started/deploy-and-login.mdx
@@ -29,7 +29,7 @@ To get started with HCP Boundary, users need:
If you prefer to get started on your local machine, refer to [Run and Login in
Dev Mode](/boundary/docs/oss/installing/run-and-login). For more information on Boundary
-OSS and self-managed installations, refer to [Boundary OSS](/boundary/docs/oss).
+Community Edition and self-managed installations, refer to [Boundary Community Edition](/boundary/docs/oss).
## Deploy an HCP Boundary cluster
diff --git a/website/content/docs/install-boundary/index.mdx b/website/content/docs/install-boundary/index.mdx
index 0d54f5a2de..47f335d249 100644
--- a/website/content/docs/install-boundary/index.mdx
+++ b/website/content/docs/install-boundary/index.mdx
@@ -8,7 +8,7 @@ description: |-
# Overview
This section details installing Boundary in a self-managed environment.
-You can use the topics in this section to install the open source version or the Enterprise version of Boundary.
+You can use the topics in this section to install the Community Edition or the Enterprise version of Boundary.
The section also includes reference architecture, system requirement recommendations, and best practices.
To deploy HCP Boundary instead, refer to the [HCP Boundary Get Started section](/hcp/docs/get-started/deploy-and-login).
\ No newline at end of file
diff --git a/website/content/docs/oss/index.mdx b/website/content/docs/oss/index.mdx
index 1efd56635b..a2ba90fdcf 100644
--- a/website/content/docs/oss/index.mdx
+++ b/website/content/docs/oss/index.mdx
@@ -1,26 +1,26 @@
---
layout: docs
-page_title: OSS Boundary
-description: An introduction to OSS Boundary
+page_title: Boundary Community Edition
+description: An introduction to Boundary Community Edition
---
-# Boundary OSS
+# Boundary Community Edition
Boundary provides secure remote access to critical systems with fine-grained
authorizations based on trusted identities. While HCP Boundary provides a
-managed solution, Boundary OSS is a self-managed distribution that organizations
+managed solution, Boundary Community Edition is a self-managed distribution that organizations
can deploy on-premise to manage access to infrastructure endpoints. The source
-code for Boundary OSS is freely available on GitHub. The following sections
+code for Boundary Community Edition is freely available on GitHub. The following sections
contain information on the use case for Boundary and how to install and
configure self-managed Boundary environments.
Traditional approaches like SSH bastion hosts or VPNs require distributing and
managing credentials, configuring network controls like firewalls, and exposing
-the private network. Boundary OSS provides secure access to hosts and critical
+the private network. Boundary Community Edition provides secure access to hosts and critical
systems without having to manage credentials or expose your network, and is
-entirely open source.
+free.
-Boundary OSS is designed to be straightforward to understand, highly scalable,
+Boundary Community Edition is designed to be straightforward to understand, highly scalable,
and resilient. It can run in clouds, on-premise, or within secure enclaves.
Boundary does not require an agent to be installed on the end host.
diff --git a/website/content/docs/overview/what-is-boundary.mdx b/website/content/docs/overview/what-is-boundary.mdx
index 5f7c3f8ce9..f7dbf3f777 100644
--- a/website/content/docs/overview/what-is-boundary.mdx
+++ b/website/content/docs/overview/what-is-boundary.mdx
@@ -44,7 +44,7 @@ The core Boundary workflow consists of four stages:
- **HCP Boundary**: a managed Boundary offering with commercial features. HashiCorp hosts Boundary's control plane and you have the option of running private workers within your environment.
- **Boundary Enterprise**: a self-managed Boundary offering with full feature parity to HCP Boundary.
-- **Boundary OSS**: an open source, self-managed version of Boundary.
+- **Boundary Community Edition**: a free, self-managed version of Boundary.
If you're not sure which edition is right for you, we recommend [**HCP Boundary**](https://developer.hashicorp.com/boundary/tutorials/hcp-getting-started) because it eliminates deployment operations.
diff --git a/website/content/docs/release-notes/v0_13_0.mdx b/website/content/docs/release-notes/v0_13_0.mdx
index bb99d32563..ec419eda77 100644
--- a/website/content/docs/release-notes/v0_13_0.mdx
+++ b/website/content/docs/release-notes/v0_13_0.mdx
@@ -31,7 +31,7 @@ Highlights include:
**Boundary Enterprise**: Organizations are now able to deploy Boundary Enterprise within their self-managed infrastructure to let their teams securely access hosts and services consistently across any environment.
The introduction of Boundary Enterprise allows organizations in highly regulated industries who are prohibited from adopting cloud based solutions to leverage Boundary's secure remote access functionalities.
-Boundary Enterprise has the same feature set as HCP Boundary and seamless migrations from OSS deployments are supported as well.
+Boundary Enterprise has the same feature set as HCP Boundary and seamless migrations from Community Edition deployments are supported as well.
For more information, refer to [Boundary Enterprise](/boundary/docs/enterprise).
diff --git a/website/content/docs/troubleshoot/faq.mdx b/website/content/docs/troubleshoot/faq.mdx
index b9b8e1b4ff..9d1c300a80 100644
--- a/website/content/docs/troubleshoot/faq.mdx
+++ b/website/content/docs/troubleshoot/faq.mdx
@@ -25,7 +25,7 @@ value proposition for identity-based access.There are three primary points of in
[tutorials](/boundary/tutorials/access-management/oss-vault-cred-brokering-quickstart) of this scenario.
2. Boundary can use Vault as an OIDC provider to enable sign-in with Vault's supported auth methods (even non-OIDC auth methods like Active Directory kerberos/LDAP).
This scenario is walked through in this [tutorial](/vault/tutorials/auth-methods/oidc-identity-provider).
-3. OSS Boundary can use Vault as the external KMS that serves as Boundary's root of trust. More information on this use case can be found
+3. Boundary Community Edition can use Vault as the external KMS that serves as Boundary's root of trust. More information on this use case can be found
[here](/boundary/docs/configuration/kms/transit).
## Q: What identity providers does Boundary support?
@@ -58,7 +58,7 @@ For more information on dynamic host catalogs, please see:
**Session Logging/Monitoring:** Supported. Boundary creates a session log of all sessions created between identities and targets that have been onboarded to
Boundary. You can learn how to monitor these sessions in this [tutorial](/boundary/tutorials/getting-started/getting-started-connect#manage-sessions).
-Boundary supports audit logs for [Boundary OSS](/boundary/tutorials/oss-configuration/event-logging) and [audit log streaming](/hcp/docs/boundary/audit-logging)
+Boundary supports audit logs for [Boundary Community Edition](/boundary/tutorials/oss-configuration/event-logging) and [audit log streaming](/hcp/docs/boundary/audit-logging)
for HCP Boundary. Audit logs for both distributions can be exported to SIEM or BI tools.
**Session Termination:** Supported. Session termination for Boundary administrators is a supported capability, as demonstrated in this
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index a6fc160acb..3021317923 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -577,7 +577,7 @@
"divider": true
},
{
- "title": "Boundary OSS",
+ "title": "Boundary Community Edition",
"hidden": true,
"routes": [
{