Clean up lingering post-24.2 uses of serverless/dedicated (#20328)

* Clean up lingering post-24.2 uses of serverless/dedicated

* Rich comments

Author: jhlodin

src/current/_includes/cockroachcloud/backup-types.md

@@ -1,4 +1,4 @@
 CockroachDB supports two types of backups:
 
 - **Managed backups**: Cockroach Labs takes automated backups of CockroachDB {{ site.data.products.cloud }} clusters that are stored in Cockroach Labs' cloud storage. {% if page.name != "managed-backups.md" %} Refer to [Managed Backups]({% link cockroachcloud/managed-backups.md %}) to learn more about the type and frequency of backups supported for both CockroachDB {{ site.data.products.cloud }} clusters. {% else %}  {% endif %}
-- {% if page.name == "take-and-restore-self-managed-backups.md" %} **Self-managed backups**: {% else %} **[Self-managed backups]({% link cockroachcloud/take-and-restore-self-managed-backups.md %})**: {% endif %} You can take manual backups and store them in your [cloud storage buckets]({% link {{site.current_cloud_version}}/use-cloud-storage.md %}) using the [`BACKUP`]({% link {{site.current_cloud_version}}/backup.md %}) statement. Self-managed backups are supported in CockroachDB {{ site.data.products.serverless }}, CockroachDB {{ site.data.products.dedicated }}, and CockroachDB {{ site.data.products.core }}.
+- {% if page.name == "take-and-restore-self-managed-backups.md" %} **Self-managed backups**: {% else %} **[Self-managed backups]({% link cockroachcloud/take-and-restore-self-managed-backups.md %})**: {% endif %} You can take manual backups and store them in your [cloud storage buckets]({% link {{site.current_cloud_version}}/use-cloud-storage.md %}) using the [`BACKUP`]({% link {{site.current_cloud_version}}/backup.md %}) statement. Self-managed backups are supported in all CockroachDB {{ site.data.cloud }} plans and CockroachDB {{ site.data.products.core }}.

src/current/_includes/cockroachcloud/ccloud/quickstart.md

@@ -1,4 +1,4 @@
-The easiest way of getting started with CockroachDB Cloud is to use `ccloud quickstart`. The `ccloud quickstart` command guides you through logging in to CockroachDB Cloud, creating a new CockroachDB {{ site.data.products.serverless }} cluster, and connecting to the new cluster. Run `ccloud quickstart` and follow the instructions:
+The easiest way of getting started with CockroachDB Cloud is to use `ccloud quickstart`. The `ccloud quickstart` command guides you through logging in to CockroachDB Cloud, creating a new CockroachDB {{ site.data.products.basic }} cluster, and connecting to the new cluster. Run `ccloud quickstart` and follow the instructions:
 
 {% include_cached copy-clipboard.html %}
 ~~~ shell

src/current/_includes/latest-release-details.md

@@ -24,7 +24,7 @@ released: {{ released }}<br />
 skippable: {{ skippable }}<br />
 {% endif %}
 
-CockroachDB {{ latest.major_version }} is the latest supported production release.{% if skippable == true %} It is an [Innovation release]({% link releases/release-support-policy.md %}#support-types) that is optional for CockroachDB {{ site.data.products.dedicated }} and CockroachDB {{ site.data.products.core }} but required for CockroachDB {{ site.data.products.serverless }}.{% else %} It is a required [Regular release]({% link releases/release-support-policy.md %}#support-types).{% endif %} To learn more, refer to [CockroachDB {{ latest.major_version }} Release Notes](https://cockroachlabs.com/docs/releases/{{ latest.major_version }}.html).
+CockroachDB {{ latest.major_version }} is the latest supported production release.{% if skippable == true %} It is an [Innovation release]({% link releases/release-support-policy.md %}#support-types) that is optional for CockroachDB {{ site.data.products.advanced }} and CockroachDB {{ site.data.products.core }} but required for CockroachDB {{ site.data.products.basic }} and CockroachDB {{ site.data.products.standard }}.{% else %} It is a required [Regular release]({% link releases/release-support-policy.md %}#support-types).{% endif %} To learn more, refer to [CockroachDB {{ latest.major_version }} Release Notes](https://cockroachlabs.com/docs/releases/{{ latest.major_version }}.html).
 
 {% if page.version.version != blank and page.version.version != latest.major_version %}
 **This page refers to CockroachDB {{ page.version.version }}, not {{ latest.major_version }}.**

src/current/_includes/v24.1/userfile-examples/freetier-userfile-note.md

@@ -1,5 +1,5 @@
 {{site.data.alerts.callout_info}}
-It is possible to [backup]({% link {{ page.version.version }}/backup.md %}), [restore]({% link {{ page.version.version }}/restore.md %}), [import]({% link {{ page.version.version }}/import-into.md %}), and run [basic changefeeds](changefeed-for.html) in [CockroachDB {{ site.data.products.serverless }}](../cockroachcloud/quickstart.html) that have upgraded to v21.1 or later.
+It is possible to [backup]({% link {{ page.version.version }}/backup.md %}), [restore]({% link {{ page.version.version }}/restore.md %}), [import]({% link {{ page.version.version }}/import-into.md %}), and run [basic changefeeds](changefeed-for.html) in [CockroachDB {{ site.data.products.serverless }}](../cockroachcloud/quickstart.html).
 
 [`userfile`]({% link {{ page.version.version }}/use-userfile-storage.md %}) storage is available in CockroachDB {{ site.data.products.serverless }} clusters for backups, restores, and imports.
 {{site.data.alerts.end}}

src/current/_includes/v24.2/userfile-examples/freetier-userfile-note.md

@@ -1,5 +1,5 @@
 {{site.data.alerts.callout_info}}
-It is possible to [backup]({% link {{ page.version.version }}/backup.md %}), [restore]({% link {{ page.version.version }}/restore.md %}), [import]({% link {{ page.version.version }}/import-into.md %}), and run [basic changefeeds](changefeed-for.html) in [CockroachDB {{ site.data.products.serverless }}](../cockroachcloud/quickstart.html) that have upgraded to v21.1 or later.
+It is possible to [backup]({% link {{ page.version.version }}/backup.md %}), [restore]({% link {{ page.version.version }}/restore.md %}), [import]({% link {{ page.version.version }}/import-into.md %}), and run [basic changefeeds](changefeed-for.html) in [CockroachDB {{ site.data.products.serverless }}](../cockroachcloud/quickstart.html).
 
 [`userfile`]({% link {{ page.version.version }}/use-userfile-storage.md %}) storage is available in CockroachDB {{ site.data.products.serverless }} clusters for backups, restores, and imports.
 {{site.data.alerts.end}}

src/current/_includes/v24.3/app/start-cockroachdb.md

@@ -1,7 +1,7 @@
-Choose whether to run a temporary local cluster or a free CockroachDB cluster on CockroachDB {{ site.data.products.serverless }}. The instructions below will adjust accordingly.
+Choose whether to run a temporary local cluster or a free CockroachDB cluster on CockroachDB {{ site.data.products.basic }}. The instructions below will adjust accordingly.
 
 <div class="filters clearfix">
-  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.serverless }}</button>
+  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.basic }}</button>
   <button class="filter-button page-level" data-scope="local">Use a Local Cluster</button>
 </div>
 

src/current/_includes/v24.3/dedicated-pci-compliance.md

@@ -1,7 +1,7 @@
 {{site.data.alerts.callout_info}}
-CockroachDB {{ site.data.products.dedicated }} clusters comply with the Payment Card Industry Data Security Standard (PCI DSS). Compliance is certified by a PCI Qualified Security Assessor (QSA).
+CockroachDB {{ site.data.products.advanced }} clusters comply with the Payment Card Industry Data Security Standard (PCI DSS). Compliance is certified by a PCI Qualified Security Assessor (QSA).
 
-To achieve compliance with PCI DSS on a CockroachDB {{ site.data.products.dedicated }} cluster, you must enable all required features in your CockroachDB {{ site.data.products.cloud }} organization and your cluster, and you must take additional steps to ensure that your organization's applications and procedures comply with PCI DSS. For details, refer to [PCI DSS Compliance in CockroachDB {{ site.data.products.dedicated }} advanced](https://cockroachlabs.com/docs/cockroachcloud/pci-dss.html).
+To achieve compliance with PCI DSS on a CockroachDB {{ site.data.products.advanced }} cluster, you must enable all required features in your CockroachDB {{ site.data.products.cloud }} organization and your cluster, and you must take additional steps to ensure that your organization's applications and procedures comply with PCI DSS. For details, refer to [PCI DSS Compliance in CockroachDB {{ site.data.products.advanced }} advanced](https://cockroachlabs.com/docs/cockroachcloud/pci-dss.html).
 
-To learn more about achieving PCI DSS compliance with CockroachDB {{ site.data.products.dedicated }}, contact your Cockroach Labs account team.
+To learn more about achieving PCI DSS compliance with CockroachDB {{ site.data.products.advanced }}, contact your Cockroach Labs account team.
 {{site.data.alerts.end}}

src/current/_includes/v24.3/setup/sample-setup-certs.md

@@ -1,6 +1,6 @@
 
 <div class="filters clearfix">
-  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.serverless }}</button>
+  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.basic }}</button>
   <button class="filter-button page-level" data-scope="local">Use a Local Cluster</button>
 </div>
 
@@ -9,7 +9,7 @@
 
 <h3>Choose your installation method</h3>
 
-You can create a CockroachDB {{ site.data.products.serverless }} cluster using either the CockroachDB Cloud Console, a web-based graphical user interface (GUI) tool, or <code>ccloud</code>, a command-line interface (CLI) tool.
+You can create a CockroachDB {{ site.data.products.basic }} cluster using either the CockroachDB Cloud Console, a web-based graphical user interface (GUI) tool, or <code>ccloud</code>, a command-line interface (CLI) tool.
 
 <div class="filters clearfix">
     <button class="filter-button page-level" data-scope="console">Use the Cloud Console (GUI)<strong></strong></button>
@@ -45,7 +45,7 @@ The connection string is pre-populated with your username, password, cluster nam
 
 <div class="filter-content" markdown="1" data-scope="ccloud">
 
-Follow these steps to create a CockroachDB {{ site.data.products.serverless }} cluster using the <code>ccloud</code> CLI tool.
+Follow these steps to create a CockroachDB {{ site.data.products.basic }} cluster using the <code>ccloud</code> CLI tool.
 
 {{site.data.alerts.callout_info}}
 The <code>ccloud</code> CLI tool is in Preview.

src/current/_includes/v24.3/setup/sample-setup-jdbc.md

@@ -1,14 +1,14 @@
 
 <div class="filters clearfix">
-  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.serverless }}</button>
+  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.basic }}</button>
   <button class="filter-button page-level" data-scope="local">Use a Local Cluster</button>
 </div>
 
 <div class="filter-content" markdown="1" data-scope="cockroachcloud">
 
 <h3>Choose your installation method</h3>
 
-You can create a CockroachDB {{ site.data.products.serverless }} cluster using either the CockroachDB Cloud Console, a web-based graphical user interface (GUI) tool, or <code>ccloud</code>, a command-line interface (CLI) tool.
+You can create a CockroachDB {{ site.data.products.basic }} cluster using either the CockroachDB Cloud Console, a web-based graphical user interface (GUI) tool, or <code>ccloud</code>, a command-line interface (CLI) tool.
 
 <div class="filters clearfix">
     <button class="filter-button page-level" data-scope="console">Use the Cloud Console (GUI)<strong></strong></button>
@@ -41,7 +41,7 @@ The **Connect to cluster** dialog shows information about how to connect to your
 
 <div class="filter-content" markdown="1" data-scope="ccloud">
 
-Follow these steps to create a CockroachDB {{ site.data.products.serverless }} cluster using the <code>ccloud</code> CLI tool.
+Follow these steps to create a CockroachDB {{ site.data.products.basic }} cluster using the <code>ccloud</code> CLI tool.
 
 {{site.data.alerts.callout_info}}
 The <code>ccloud</code> CLI tool is in Preview.

src/current/_includes/v24.3/setup/sample-setup-parameters-certs.md

@@ -1,6 +1,6 @@
 
 <div class="filters clearfix">
-  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.serverless }}</button>
+  <button class="filter-button page-level" data-scope="cockroachcloud">Use CockroachDB {{ site.data.products.basic }}</button>
   <button class="filter-button page-level" data-scope="local">Use a Local Cluster</button>
 </div>
 
@@ -9,7 +9,7 @@
 
 <h3>Choose your installation method</h3>
 
-You can install a CockroachDB {{ site.data.products.serverless }} cluster using either the CockroachDB Cloud Console, a web-based graphical user interface (GUI) tool, or <code>ccloud</code>, a command-line interface (CLI) tool.
+You can install a CockroachDB {{ site.data.products.basic }} cluster using either the CockroachDB Cloud Console, a web-based graphical user interface (GUI) tool, or <code>ccloud</code>, a command-line interface (CLI) tool.
 
 <div class="filters clearfix">
     <button class="filter-button page-level" data-scope="console">Use the Cloud Console (GUI)<strong></strong></button>
@@ -42,7 +42,7 @@ The **Connect to cluster** dialog shows information about how to connect to your
 
 <div class="filter-content" markdown="1" data-scope="ccloud">
 
-Follow these steps to create a CockroachDB {{ site.data.products.serverless }} cluster using the <code>ccloud</code> CLI tool.
+Follow these steps to create a CockroachDB {{ site.data.products.basic }} cluster using the <code>ccloud</code> CLI tool.
 
 {{site.data.alerts.callout_info}}
 The <code>ccloud</code> CLI tool is in Preview.