Update with taroface feedback (1)

src/current/_includes/v24.1/known-limitations/datadog-self-hosted-limitations.md

@@ -1 +1 @@
-The CockroachDB {{ site.data.products.core }} integration with Datadog only supports displaying cluster-wide averages of reported metrics. Filtering by a specific node is unsupported.
+The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog only supports displaying cluster-wide averages of reported metrics. Filtering by a specific node is unsupported.

src/current/_includes/v24.2/known-limitations/datadog-self-hosted-limitations.md

@@ -1 +1 @@
-The CockroachDB {{ site.data.products.core }} integration with Datadog only supports displaying cluster-wide averages of reported metrics. Filtering by a specific node is unsupported.
+The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog only supports displaying cluster-wide averages of reported metrics. Filtering by a specific node is unsupported.

src/current/_includes/v24.3/known-limitations/datadog-self-hosted-limitations.md

@@ -1 +1 @@
-The CockroachDB {{ site.data.products.core }} integration with Datadog only supports displaying cluster-wide averages of reported metrics. Filtering by a specific node is unsupported.
+The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog only supports displaying cluster-wide averages of reported metrics. Filtering by a specific node is unsupported.

src/current/v23.1/datadog.md

@@ -1,17 +1,17 @@
 ---
-title: Monitor CockroachDB Self-Hosted with Datadog
+title: Monitor CockroachDB self-hosted clusters with Datadog
 summary: The CockroachDB integration with Datadog enables data visualization and alerting on CockroachDB metrics.
 toc: true
 docs_area: manage
 ---
 
-[Datadog](https://www.datadoghq.com/) is a monitoring and security platform for cloud applications. The CockroachDB {{ site.data.products.core }} integration with Datadog enables data collection and alerting on selected [CockroachDB metrics](https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#data-collected) using the Datadog platform.
+[Datadog](https://www.datadoghq.com/) is a monitoring and security platform for cloud applications. The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog enables data collection and alerting on selected [CockroachDB metrics](https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#data-collected) using the Datadog platform.
 
 {{site.data.alerts.callout_success}}
-This tutorial explores the CockroachDB {{ site.data.products.core }} integration with Datadog. For the CockroachDB {{ site.data.products.cloud }} integration with Datadog, refer to [Monitor CockroachDB {{ site.data.products.cloud }} with Datadog]({% link cockroachcloud/tools-page.md %}#monitor-cockroachdb-cloud-with-datadog) instead of this page.
+This tutorial explores the integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog. For the CockroachDB {{ site.data.products.cloud }} integration with Datadog, refer to [Monitor CockroachDB {{ site.data.products.cloud }} with Datadog]({% link cockroachcloud/tools-page.md %}#monitor-cockroachdb-cloud-with-datadog) instead of this page.
 {{site.data.alerts.end}}
 
-The CockroachDB {{ site.data.products.core }} integration with Datadog is powered by the [Datadog Agent](https://app.datadoghq.com/account/settings#agent), and supported by Datadog directly:
+The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog is powered by the [Datadog Agent](https://app.datadoghq.com/account/settings#agent), and supported by Datadog directly:
 
 - For more information about the integration, see the [Datadog blog post](https://www.datadoghq.com/blog/monitor-cockroachdb-performance-metrics-with-datadog/).
 - For more information about using Datadog, see the [Datadog documentation](https://docs.datadoghq.com/).
@@ -24,7 +24,7 @@ In this tutorial, you will enable the CockroachDB integration in Datadog, config
 Before you can follow the steps presented in this tutorial, you must have:
 
 - Downloaded and installed the [Datadog Agent](https://app.datadoghq.com/account/settings#agent).
-- Started a [secure CockroachDB Self-Hosted cluster]({% link {{ page.version.version }}/secure-a-cluster.md %}).
+- Started a [secure CockroachDB {{ site.data.products.core }} cluster]({% link {{ page.version.version }}/secure-a-cluster.md %}).
 
 ## Step 1. Enable CockroachDB integration
 

src/current/v23.2/datadog.md

@@ -1,17 +1,17 @@
 ---
-title: Monitor CockroachDB Self-Hosted with Datadog
+title: Monitor CockroachDB self-hosted clusters with Datadog
 summary: The CockroachDB integration with Datadog enables data visualization and alerting on CockroachDB metrics.
 toc: true
 docs_area: manage
 ---
 
-[Datadog](https://www.datadoghq.com/) is a monitoring and security platform for cloud applications. The CockroachDB {{ site.data.products.core }} integration with Datadog enables data collection and alerting on selected [CockroachDB metrics](https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#data-collected) using the Datadog platform.
+[Datadog](https://www.datadoghq.com/) is a monitoring and security platform for cloud applications. The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog enables data collection and alerting on selected [CockroachDB metrics](https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#data-collected) using the Datadog platform.
 
 {{site.data.alerts.callout_success}}
-This tutorial explores the CockroachDB {{ site.data.products.core }} integration with Datadog. For the CockroachDB {{ site.data.products.cloud }} integration with Datadog, refer to [Monitor CockroachDB {{ site.data.products.cloud }} with Datadog]({% link cockroachcloud/tools-page.md %}#monitor-cockroachdb-cloud-with-datadog) instead of this page.
+This tutorial explores the integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog. For the CockroachDB {{ site.data.products.cloud }} integration with Datadog, refer to [Monitor CockroachDB {{ site.data.products.cloud }} with Datadog]({% link cockroachcloud/tools-page.md %}#monitor-cockroachdb-cloud-with-datadog) instead of this page.
 {{site.data.alerts.end}}
 
-The CockroachDB {{ site.data.products.core }} integration with Datadog is powered by the [Datadog Agent](https://app.datadoghq.com/account/settings#agent), and supported by Datadog directly:
+The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog is powered by the [Datadog Agent](https://app.datadoghq.com/account/settings#agent), and supported by Datadog directly:
 
 - For more information about the integration, see the [Datadog blog post](https://www.datadoghq.com/blog/monitor-cockroachdb-performance-metrics-with-datadog/).
 - For more information about using Datadog, see the [Datadog documentation](https://docs.datadoghq.com/).
@@ -24,7 +24,7 @@ In this tutorial, you will enable the CockroachDB integration in Datadog, config
 Before you can follow the steps presented in this tutorial, you must have:
 
 - Downloaded and installed the [Datadog Agent](https://app.datadoghq.com/account/settings#agent).
-- Started a [secure CockroachDB Self-Hosted cluster]({% link {{ page.version.version }}/secure-a-cluster.md %}).
+- Started a [secure CockroachDB {{ site.data.products.core }} cluster]({% link {{ page.version.version }}/secure-a-cluster.md %}).
 
 ## Step 1. Enable CockroachDB integration
 

src/current/v24.1/architecture/glossary.md

@@ -27,7 +27,7 @@ A logical identification of how nodes and data are clustered around [geographica
 
 A part of a data center that is considered to form a unit with regards to failures and fault tolerance. There can be multiple nodes in a single availability zone, however Cockroach Labs recommends that you to place different replicas of your data in different availability zones.
 
-#### [CockroachDB Self-Hosted]({% link {{ page.version.version }}/start-a-local-cluster.md %})
+#### [CockroachDB {{ site.data.products.core }}]({% link {{ page.version.version }}/start-a-local-cluster.md %})
 
 A full featured, self-managed CockroachDB deployment.
 

src/current/v24.1/authentication.md

@@ -1,5 +1,5 @@
 ---
-title: Authenticate to CockroachDB Self-Hosted Clusters
+title: Authenticate to CockroachDB self-hosted Clusters
 summary: Learn about the authentication features for secure CockroachDB clusters.
 toc: true
 docs_area: manage

src/current/v24.1/auto-tls.md

@@ -139,7 +139,7 @@ cockroach init --certs-dir=certs --host=localhost:26257
 
 - [`cockroach cert`]({% link {{ page.version.version }}/cockroach-cert.md %})
 - [`cockroach auth-session`]({% link {{ page.version.version }}/cockroach-auth-session.md %})
-- [Authenticate to CockroachDB Self-Hosted Clusters]({% link {{ page.version.version }}/authentication.md %})
+- [Authenticate to CockroachDB {{ site.data.products.core }} Clusters]({% link {{ page.version.version }}/authentication.md %})
 - [GSSAPI Authentication]({% link {{ page.version.version }}/gssapi_authentication.md %})
 - [SQL Authentication]({% link {{ page.version.version }}/security-reference/authentication.md %})
 - [Cloud Storage Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %})

src/current/v24.1/certificate-based-authentication-using-the-x509-subject-field.md

@@ -118,7 +118,7 @@ Regardless of this setting's value, CockroachDB will verify the following during
 
 - [`ALTER ROLE ... SUBJECT`]({% link {{ page.version.version }}/alter-role.md %}#set-the-subject-role-option-for-certificate-based-authentication)
 - [`CREATE ROLE ... SUBJECT`]({% link {{ page.version.version }}/create-role.md %}#set-the-subject-role-option-for-certificate-based-authentication)
-- [Authenticate to CockroachDB Self-Hosted Clusters]({% link {{ page.version.version }}/authentication.md %})
+- [Authenticate to CockroachDB {{ site.data.products.core }} Clusters]({% link {{ page.version.version }}/authentication.md %})
 - [GSSAPI Authentication]({% link {{ page.version.version }}/gssapi_authentication.md %})
 - [SQL Authentication]({% link {{ page.version.version }}/security-reference/authentication.md %})
 - [Cloud Storage Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %})

src/current/v24.1/choose-a-deployment-option.md

@@ -81,7 +81,7 @@ Cockroach Labs offers several options for clusters: CockroachDB {{ site.data.pro
         <li>Applications that require real-time integration with other systems.</li>
       </ul></td>
       <td>
-      <a id="self-hosted"></a><b><a href="start-a-local-cluster.html">CockroachDB Self-Hosted</a></b>: A full featured, self-managed CockroachDB deployment.
+      <a id="self-hosted"></a><b><a href="start-a-local-cluster.html">CockroachDB {{ site.data.products.core }}</a></b>: A full featured, self-managed CockroachDB deployment.
       </td>
       <td><ul>
         <li><b>Scale</b>: Node-based; self-service add and remove nodes.</li>

src/current/v24.1/datadog.md

@@ -1,17 +1,17 @@
 ---
-title: Monitor CockroachDB Self-Hosted with Datadog
+title: Monitor CockroachDB self-hosted clusters with Datadog
 summary: The CockroachDB integration with Datadog enables data visualization and alerting on CockroachDB metrics.
 toc: true
 docs_area: manage
 ---
 
-[Datadog](https://www.datadoghq.com/) is a monitoring and security platform for cloud applications. The CockroachDB {{ site.data.products.core }} integration with Datadog enables data collection and alerting on selected [CockroachDB metrics](https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#data-collected) using the Datadog platform.
+[Datadog](https://www.datadoghq.com/) is a monitoring and security platform for cloud applications. The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog enables data collection and alerting on selected [CockroachDB metrics](https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#data-collected) using the Datadog platform.
 
 {{site.data.alerts.callout_success}}
 This tutorial explores the CockroachDB {{ site.data.products.core }} integration with Datadog. For the CockroachDB {{ site.data.products.cloud }} integration with Datadog, refer to [Monitor CockroachDB Dedicated with Datadog]({% link cockroachcloud/tools-page.md %}#monitor-cockroachdb-cloud-with-datadog) instead of this page.
 {{site.data.alerts.end}}
 
-The CockroachDB {{ site.data.products.core }} integration with Datadog is powered by the [Datadog Agent](https://app.datadoghq.com/account/settings#agent), and supported by Datadog directly:
+The integration of your CockroachDB {{ site.data.products.core }} cluster with Datadog is powered by the [Datadog Agent](https://app.datadoghq.com/account/settings#agent), and supported by Datadog directly:
 
 - For more information about the integration, see the [Datadog blog post](https://www.datadoghq.com/blog/monitor-cockroachdb-performance-metrics-with-datadog/).
 - For more information about using Datadog, see the [Datadog documentation](https://docs.datadoghq.com/).
@@ -24,7 +24,7 @@ In this tutorial, you will enable the CockroachDB integration in Datadog, config
 Before you can follow the steps presented in this tutorial, you must have:
 
 - Downloaded and installed the [Datadog Agent](https://app.datadoghq.com/account/settings#agent).
-- Started a [secure CockroachDB Self-Hosted cluster]({% link {{ page.version.version }}/secure-a-cluster.md %}).
+- Started a [secure CockroachDB {{ site.data.products.core }} cluster]({% link {{ page.version.version }}/secure-a-cluster.md %}).
 
 ## Step 1. Enable CockroachDB integration
 

src/current/v24.1/encryption.md

@@ -1,5 +1,5 @@
 ---
-title: Manage Encryption for CockroachDB Self-Hosted
+title: Manage Encryption for CockroachDB self-hosted clusters
 summary: Learn about the encryption features for secure CockroachDB clusters.
 toc: true
 docs_area: manage

src/current/v24.1/essential-alerts-self-hosted.md

@@ -1,7 +1,7 @@
 ---
-title: Essential Alerts for CockroachDB Self-Hosted Deployments
-summary: Learn about the recommended essential alerts for monitoring your CockroachDB Self-Hosted cluster.
+title: Essential Alerts for CockroachDB self-hosted Deployments
+summary: Learn about the recommended essential alerts for monitoring your CockroachDB {{ site.data.products.core }} cluster.
 toc: true
 ---
 
-{% include {{ page.version.version }}/essential-alerts.md deployment='self-hosted' %}
+{% include {{ page.version.version }}/essential-alerts.md deployment='self-hosted' %}

src/current/v24.1/essential-metrics-self-hosted.md

@@ -1,6 +1,6 @@
 ---
-title: Essential Metrics for CockroachDB Self-Hosted Deployments
-summary: Learn about the recommended essential metrics for monitoring your CockroachDB Self-Hosted cluster.
+title: Essential Metrics for CockroachDB self-hosted Deployments
+summary: Learn about the recommended essential metrics for monitoring your CockroachDB {{ site.data.products.core }} cluster.
 toc: true
 docs_area: manage
 ---

src/current/v24.1/security-reference/encryption.md

@@ -108,7 +108,7 @@ To allow arbitrary rotation schedules and ensure security of the keys, Cockroach
 
 - **Store key**: A cluster's _store key_ is a _key encryption key (KEK) that CockroachDB uses to encrypt the cluster's data keys (see below).
 
-  For CockroachDB Self-Hosted clusters, you provide the store key and give its location to CockroachDB when starting the cluster. The store key file must contain 32 bytes (the key ID) followed by the key (16, 24, or 32 bytes). The size of the key dictates the version of AES to use (AES-128, AES-192, or AES-256). For an example showing how to create a store key, see [Generating Key Files]({% link {{ page.version.version }}/encryption.md %}#generating-store-key-files).
+  For CockroachDB {{ site.data.products.core }} clusters, you provide the store key and give its location to CockroachDB when starting the cluster. The store key file must contain 32 bytes (the key ID) followed by the key (16, 24, or 32 bytes). The size of the key dictates the version of AES to use (AES-128, AES-192, or AES-256). For an example showing how to create a store key, see [Generating Key Files]({% link {{ page.version.version }}/encryption.md %}#generating-store-key-files).
 
   The store key is created automatically when the cluster is created.
 

src/current/v24.1/security-reference/transport-layer-security.md

@@ -207,7 +207,7 @@ Connections between CockroachDB nodes are always mutually TLS-authenticated. Eac
 
 Customers using CockroachDB {{ site.data.products.cloud }} need not worry about managing TLS keys for CockroachDB nodes, as cluster management is delegated to the Cockroach Labs team.
 
-### CockroachDB Self-Hosted
+### CockroachDB {{ site.data.products.core }}
 
 {{site.data.alerts.callout_info}}
 Customers who deploy and manage their own CockroachDB clusters must provision and manage certificates on each node, implementing their own PKI security. This entails ensuring that credentials are carefully controlled, monitoring for signs of compromise, and mitigating the impact of potential credential leaks. Authorization for issuing credentials is particularly critical, and this includes issuing private key/public certificate pairs for CockroachDB nodes or clients. Unmitigated compromise of either of these can have devastating business impact.

src/current/v24.1/sso-sql.md

@@ -1,6 +1,6 @@
 ---
 title: Cluster Single Sign-on (SSO) using JSON web tokens (JWTs)
-summary: Overview of Cluster Single Sign-on (SSO) for CockroachDB Self-Hosted, review of authenticating users, configuring required cluster settings.
+summary: Overview of Cluster Single Sign-on (SSO) for CockroachDB self-hosted clusters, review of authenticating users, configuring required cluster settings.
 toc: true
 docs_area: manage
 ---

src/current/v24.1/third-party-monitoring-tools.md

@@ -14,7 +14,7 @@ CockroachDB is officially integrated with the following third-party monitoring p
 
 ### Metrics
 
-| Platform | CockroachDB Standard | CockroachDB Advanced | CockroachDB Self-Hosted |
+| Platform | CockroachDB Standard | CockroachDB Advanced | CockroachDB {{ site.data.products.core }} |
 |----------|:--------------------:|:--------------------:|:-----------------------:|
 | [Amazon CloudWatch](#amazon-cloudwatch-metrics) | ✔ | ✔ |  |
 | [DataDog](#datadog) | ✔ | ✔ | ✔ |
@@ -24,7 +24,7 @@ CockroachDB is officially integrated with the following third-party monitoring p
 
 ### Logs
 
-| Platform | CockroachDB Standard | CockroachDB Advanced | CockroachDB Self-Hosted |
+| Platform | CockroachDB Standard | CockroachDB Advanced | CockroachDB {{ site.data.products.core }} |
 |----------|:--------------------:|:--------------------:|:-----------------------:|
 | [Amazon CloudWatch](#amazon-cloudwatch-logs) | ✔ | ✔ |  |
 | [GCP Logging](#gcp-logging) | ✔ | ✔ |  |

src/current/v24.2/architecture/glossary.md

@@ -27,7 +27,7 @@ A logical identification of how nodes and data are clustered around [geographica
 
 A part of a data center that is considered to form a unit with regards to failures and fault tolerance. There can be multiple nodes in a single availability zone, however Cockroach Labs recommends that you to place different replicas of your data in different availability zones.
 
-#### [CockroachDB Self-Hosted]({% link {{ page.version.version }}/start-a-local-cluster.md %})
+#### [CockroachDB {{ site.data.products.core }}]({% link {{ page.version.version }}/start-a-local-cluster.md %})
 
 A full featured, self-managed CockroachDB deployment.
 

src/current/v24.2/authentication.md

@@ -1,5 +1,5 @@
 ---
-title: Authenticate to CockroachDB Self-Hosted Clusters
+title: Authenticate to CockroachDB self-hosted Clusters
 summary: Learn about the authentication features for secure CockroachDB clusters.
 toc: true
 docs_area: manage

src/current/v24.2/auto-tls.md

@@ -139,7 +139,7 @@ cockroach init --certs-dir=certs --host=localhost:26257
 
 - [`cockroach cert`]({% link {{ page.version.version }}/cockroach-cert.md %})
 - [`cockroach auth-session`]({% link {{ page.version.version }}/cockroach-auth-session.md %})
-- [Authenticate to CockroachDB Self-Hosted Clusters]({% link {{ page.version.version }}/authentication.md %})
+- [Authenticate to CockroachDB {{ site.data.products.core }} Clusters]({% link {{ page.version.version }}/authentication.md %})
 - [GSSAPI Authentication]({% link {{ page.version.version }}/gssapi_authentication.md %})
 - [SQL Authentication]({% link {{ page.version.version }}/security-reference/authentication.md %})
 - [Cloud Storage Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %})