Backport changes from #19002

src/current/_includes/releases/v23.1/v23.1.0-alpha.7.md

@@ -15,7 +15,7 @@ Release Date: March 20, 2023
 
 <h3 id="v23-1-0-alpha-7-{{-site.data.products.enterprise-}}-edition-changes">{{ site.data.products.enterprise }} edition changes</h3>
 
-- Sinkless [changefeeds]({% link v23.1/create-changefeed.md %}) that use the [`AS SELECT`]({% link v23.1/selection-queries.md %}) syntax now require an [enterprise license]({% link v23.1/enterprise-licensing.md %}). [#98241][#98241]
+- Sinkless [changefeeds]({% link v23.1/create-changefeed.md %}) that use the [`AS SELECT`]({% link v23.1/selection-queries.md %}) syntax now require an enterprise license. [#98241][#98241]
 - [External connections]({% link v23.1/create-external-connection.md %}) can now be used as the URI value for a Confluent schema registry. For example, `CREATE EXTERNAL CONNECTION reg AS "https://example.cloud?opt=val"; CREATE CHANGEFEED FOR foo WITH format='avro',confluent_schema_registry='external://reg'` [#97140][#97140]
 - [Backup schedules]({% link v23.1/create-schedule-for-backup.md %}) created or altered to have the option `on_previous_running` will have the full backup schedule created with the user specified option, but will override the incremental backup schedule to always default to `on_previous_running = wait`. This ensures correctness of the backup chains created by the incremental schedule by preventing duplicate incremental jobs from racing against each other. [#98249][#98249]
 - [Changefeeds]({% link v23.1/changefeed-sinks.md %}#kafka) to a Kafka sink now support the `OAUTHBEARER` `sasl_mechanism`. [#98053][#98053]

src/current/_includes/releases/v23.1/v23.1.0.md

@@ -228,10 +228,6 @@ Asyncpg is commonly used with ORM libraries such as SQLAlchemy to provide a simp
 
 <h5>Change data capture (Changefeeds)</h5>
 
-{{site.data.alerts.callout_info}}
-The following are [enterprise-only]({% link v23.1/enterprise-licensing.md %}) features. [Request a 30-day trial license](https://www.cockroachlabs.com/get-cockroachdb/enterprise/) to try them out.
-{{site.data.alerts.end}}
-
 <table>
   <thead>
    <tr>

src/current/_includes/releases/v23.2/v23.2.12.md

@@ -37,7 +37,7 @@ Release Date: September 25, 2024
 - The [DB Console]({% link v23.2/ui-overview-dashboard.md %}) time-series graphs now have hover behavior that focuses on individual lines and shows values under the mouse pointer. [cockroachdb/cockroach#128864][#128864]
 - Users with the [`VIEWACTIVITY` privilege]({% link v23.2/security-reference/authorization.md %}#viewactivity) can download [statement bundles]({% link v23.2/explain-analyze.md %}) from [DB Console]({% link v23.2/ui-overview.md %}). [#129502][#129502]
 - The [DB Console]({% link v23.2/ui-overview.md %}) now displays an alert message when the [license is expired]({% link v23.2/licensing-faqs.md %}#monitor-for-license-expiry) or if there are fewer than 15 days left before the license expires. [#130509][#130509]
-- The [DB Console]({% link v23.2/ui-overview.md %}) will now show a notification alerting customers without an [Enterprise license]({% link v23.2/enterprise-licensing.md %}) to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) with a link to more information. [#130509][#130509]
+- The [DB Console]({% link v23.2/ui-overview.md %}) will now show a notification alerting customers without an Enterprise license to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) with a link to more information. [#130509][#130509]
 
 <h3 id="v23-2-12-bug-fixes">Bug fixes</h3>
 

src/current/_includes/releases/v23.2/v23.2.13.md

@@ -45,7 +45,7 @@ Release Date: October 17, 2024
 
 <h3 id="v23-2-13-db-console-changes">DB Console changes</h3>
 
-- The [DB Console]({% link v24.2/ui-overview.md %}) now shows a notification if the cluster has no [Enterprise license]({% link v24.2/enterprise-licensing.md %}) set. Refer to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) for more information. [#130425][#130425]
+- The [DB Console]({% link v24.2/ui-overview.md %}) now shows a notification if the cluster has no Enterprise license set. Refer to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) for more information. [#130425][#130425]
 
 <h3 id="v23-2-13-bug-fixes">Bug fixes</h3>
 

src/current/_includes/releases/v24.1/v24.1.6.md

@@ -27,7 +27,7 @@ Release Date: October 17, 2024
 
 <h3 id="v24-1-6-db-console-changes">DB Console changes</h3>
 
-- The [DB Console]({% link v24.1/ui-overview.md %}) will now show a notification alerting customers without an [Enterprise license]({% link v24.1/enterprise-licensing.md %}) to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) with a link to more information. [#130426][#130426]
+- The [DB Console]({% link v24.1/ui-overview.md %}) will now show a notification alerting customers without an Enterprise license to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) with a link to more information. [#130426][#130426]
 
 <h3 id="v24-1-6-bug-fixes">Bug fixes</h3>
 

src/current/_includes/releases/v24.2/feature-highlights-sql.html

@@ -18,7 +18,7 @@
     <p class="feature-description">
       Users can now store <a href="https://www.cockroachlabs.com/docs/v24.2/vector.html">
       <code>VECTOR</code>
-     </a> embeddings within CockroachDB with <code>pgvector</code>-compatible semantics to build AI-driven applications. Numerous <a href="https://www.cockroachlabs.com/docs/v24.2/functions-and-operators.html#pgvector-functions">built-in functions</a> have been added for running similarity search across vectors. Note that vector indexing is not supported in this release. This feature is in <a href="https://cockroachlabs.com/docs/stable/feature-availability.html">Preview</a> and requires an <a href="https://www.cockroachlabs.com/docs/stable/enterprise-licensing">Enterprise license</a>.
+     </a> embeddings within CockroachDB with <code>pgvector</code>-compatible semantics to build AI-driven applications. Numerous <a href="https://www.cockroachlabs.com/docs/v24.2/functions-and-operators.html#pgvector-functions">built-in functions</a> have been added for running similarity search across vectors. Note that vector indexing is not supported in this release. This feature is in <a href="https://cockroachlabs.com/docs/stable/feature-availability.html">Preview</a>.
     </p>
    </td>
    <td>24.2</td>
@@ -30,7 +30,7 @@
    <td>
     <p class="feature-summary">Generic query plans</p>
     <p class="feature-description">
-      Users can now enable <a href="https://www.cockroachlabs.com/docs/v24.2/cost-based-optimizer.html#query-plan-type">generic query plans</a>. Generic query plans optimize query execution for prepared statements by reusing precompiled query plans, and significantly reduce the CPU overhead associated with parsing and planning repeated queries, at the expense of plan quality. This feature is in <a href="https://cockroachlabs.com/docs/stable/feature-availability.html">Preview</a> and requires an <a href="https://www.cockroachlabs.com/docs/stable/enterprise-licensing">Enterprise license</a>.
+      Users can now enable <a href="https://www.cockroachlabs.com/docs/v24.2/cost-based-optimizer.html#query-plan-type">generic query plans</a>. Generic query plans optimize query execution for prepared statements by reusing precompiled query plans, and significantly reduce the CPU overhead associated with parsing and planning repeated queries, at the expense of plan quality. This feature is in <a href="https://cockroachlabs.com/docs/stable/feature-availability.html">Preview</a>.
     </p>
    </td>
    <td>24.2</td>

src/current/_includes/releases/v24.2/v24.2.3.md

@@ -26,7 +26,7 @@ Release Date: September 25, 2024
 
 - Users with the `VIEWACTIVITY` [system privilege]({% link v24.2/security-reference/authorization.md %}#supported-privileges) can now download [statement bundles]({% link v24.2/ui-statements-page.md %}#diagnostics) from the DB Console. [#129504][#129504]
 - Users with the `VIEWACTIVITY` [system privilege]({% link v24.2/security-reference/authorization.md %}#supported-privileges) can now request, view, and cancel [statement bundles]({% link v24.2/ui-statements-page.md %}#diagnostics) from the DB Console. [#129809][#129809]
-- The DB Console now displays a notification to alert customers without an [Enterprise license]({% link v24.2/enterprise-licensing.md %}) to upcoming license changes. [#130511][#130511]
+- The DB Console now displays a notification to alert customers without an Enterprise license to upcoming license changes. [#130511][#130511]
 
 <h3 id="v24-2-3-bug-fixes">Bug fixes</h3>
 

src/current/_includes/releases/v24.2/v24.2.4.md

@@ -29,7 +29,7 @@ Release Date: October 17, 2024
 <h3 id="v24-2-4-db-console-changes">DB Console changes</h3>
 
 - Streamlined [metric chart]({% link v24.2/ui-overview.md %}#metrics) legends by removing the name of the chart from labels, where it was an identical prefix for all labels on the chart. [#129359][#129359]
-- The [DB Console]({% link v24.2/ui-overview.md %}) now shows a notification if the cluster has no [Enterprise license]({% link v24.2/enterprise-licensing.md %}) set. Refer to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) for more information. [#130417][#130417]
+- The [DB Console]({% link v24.2/ui-overview.md %}) now shows a notification if the cluster has no Enterprise license set. Refer to [upcoming license changes](https://www.cockroachlabs.com/enterprise-license-update/) for more information. [#130417][#130417]
 
 <h3 id="v24-2-4-bug-fixes">Bug fixes</h3>
 

src/current/v23.1/change-data-capture-overview.md

@@ -74,7 +74,7 @@ CockroachDB has two implementations of changefeeds:
     <td class="comparison-chart__feature">
       <b>Filter change data</b>
     </td>
-    <td>Not supported without an <a href="enterprise-licensing.html">{{ site.data.products.enterprise }} license</a> or using <a href="changefeed-for.html"><code>EXPERIMENTAL CHANGEFEED FOR</code></a>.</td>
+    <td>Not supported using <a href="changefeed-for.html"><code>EXPERIMENTAL CHANGEFEED FOR</code></a>.</td>
     <td>Use <a href="{% link {{ page.version.version }}/cdc-queries.md %}">CDC queries</a> with <a href="create-changefeed.html"><code>CREATE CHANGEFEED</code></a> to define the emitted change data.</td>
   </tr>
 

src/current/v23.1/changefeed-examples.md

@@ -538,15 +538,11 @@ In this example, you'll set up a changefeed for a single-node cluster that is co
 
 ## Create a changefeed connected to a webhook sink
 
-{{site.data.alerts.callout_info}}
-[`CREATE CHANGEFEED`]({% link {{ page.version.version }}/create-changefeed.md %}) is an [{{ site.data.products.enterprise }}-only]({% link {{ page.version.version }}/enterprise-licensing.md %}) feature. For the Core version, see [the `CHANGEFEED FOR` example](#create-a-basic-changefeed).
-{{site.data.alerts.end}}
-
 {% include {{ page.version.version }}/cdc/webhook-performance-setting.md %}
 
 In this example, you'll set up a changefeed for a single-node cluster that is connected to a local HTTP server via a webhook. For this example, you'll use an [example HTTP server](https://github.com/cockroachlabs/cdc-webhook-sink-test-server/tree/master/go-https-server) to test out the webhook sink.
 
-1. If you do not already have one, [request a trial {{ site.data.products.enterprise }} license]({% link {{ page.version.version }}/enterprise-licensing.md %}).
+1. If you do not already have one, [request a trial {{ site.data.products.enterprise }} license]({% link {{ page.version.version }}/licensing-faqs.md %}).
 
 1. Use the [`cockroach start-single-node`]({% link {{ page.version.version }}/cockroach-start-single-node.md %}) command to start a single-node cluster:
 
@@ -631,7 +627,7 @@ In this example, you will create a changefeed that filters the change data using
 
 For different use case examples and syntax detail, refer to the [Change Data Capture Queries]({% link {{ page.version.version }}/cdc-queries.md %}) page.
 
-1. If you do not already have one, [request a trial {{ site.data.products.enterprise }} license]({% link {{ page.version.version }}/enterprise-licensing.md %}).
+1. If you do not already have one, [request a trial {{ site.data.products.enterprise }} license]({% link {{ page.version.version }}/licensing-faqs.md %}).
 
 1. Use the [`cockroach start-single-node`]({% link {{ page.version.version }}/cockroach-start-single-node.md %}) command to start a single-node cluster: