Merge branch 'main' into DOC-11250

src/current/_includes/common/tls-cipher-suites.md

@@ -1,24 +1,13 @@
 {% if include.list == 'enabled' %}
-- `TLS_DHE_RSA_WITH_AES_128_GCM_SHA256`
-- `TLS_DHE_RSA_WITH_AES_256_GCM_SHA384`
-- `TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256`
-- `TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384`
+- `TLS_AES_128_GCM_SHA256`,
+- `TLS_AES_256_GCM_SHA384`,
+- `TLS_CHACHA20_POLY1305_SHA256`
 - `TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256`
 - `TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384`
-- `TLS_DHE_RSA_WITH_AES_128_CCM`
-- `TLS_DHE_RSA_WITH_AES_256_CCM`
+- `TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256`
+- `TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384`
 - `TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256`
 - `TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256`
-- `TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256`
-- `TLS_DHE_PSK_WITH_AES_128_GCM_SHA256`
-- `TLS_DHE_PSK_WITH_AES_256_GCM_SHA384`
-- `TLS_DHE_PSK_WITH_AES_128_CCM`
-- `TLS_DHE_PSK_WITH_AES_256_CCM`
-- `TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256`
-- `TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384`
-- `TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256`
-- `TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256`
-- `TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256`
 {% endif %}
 {% if include.list == 'disabled' %}
 - `TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA`

src/current/_includes/v24.3/cdc/core-csv.md

@@ -1,3 +1,3 @@
 {{site.data.alerts.callout_info}}
-To determine how wide the columns need to be, the default `table` display format in `cockroach sql` buffers the results it receives from the server before printing them to the console. When consuming core changefeed data using `cockroach sql`, it's important to use a display format like `csv` that does not buffer its results. To set the display format, use the [`--format=csv` flag]({% link {{ page.version.version }}/cockroach-sql.md %}#sql-flag-format) when starting the [built-in SQL client]({% link {{ page.version.version }}/cockroach-sql.md %}), or set the [`\set display_format=csv` option]({% link {{ page.version.version }}/cockroach-sql.md %}#client-side-options) once the SQL client is open.
+To determine how wide the columns need to be, the default `table` display format in `cockroach sql` buffers the results it receives from the server before printing them to the console. When consuming basic changefeed data using `cockroach sql`, it's important to use a display format like `csv` that does not buffer its results. To set the display format, use the [`--format=csv` flag]({% link {{ page.version.version }}/cockroach-sql.md %}#sql-flag-format) when starting the [built-in SQL client]({% link {{ page.version.version }}/cockroach-sql.md %}), or set the [`\set display_format=csv` option]({% link {{ page.version.version }}/cockroach-sql.md %}#client-side-options) once the SQL client is open.
 {{site.data.alerts.end}}

src/current/_includes/v24.3/cdc/core-url.md

@@ -1,3 +1,3 @@
 {{site.data.alerts.callout_info}}
-Because core changefeeds return results differently than other SQL statements, they require a dedicated database connection with specific settings around result buffering. In normal operation, CockroachDB improves performance by buffering results server-side before returning them to a client; however, result buffering is automatically turned off for core changefeeds. Core changefeeds also have different cancellation behavior than other queries: they can only be canceled by closing the underlying connection or issuing a  [`CANCEL QUERY`]({% link {{ page.version.version }}/cancel-query.md %}) statement on a separate connection. Combined, these attributes of changefeeds mean that applications should explicitly create dedicated connections to consume changefeed data, instead of using a connection pool as most client drivers do by default.
+Because basic changefeeds return results differently than other SQL statements, they require a dedicated database connection with specific settings around result buffering. In normal operation, CockroachDB improves performance by buffering results server-side before returning them to a client; however, result buffering is automatically turned off for basic changefeeds. basic changefeeds also have different cancellation behavior than other queries: they can only be canceled by closing the underlying connection or issuing a  [`CANCEL QUERY`]({% link {{ page.version.version }}/cancel-query.md %}) statement on a separate connection. Combined, these attributes of changefeeds mean that applications should explicitly create dedicated connections to consume changefeed data, instead of using a connection pool as most client drivers do by default.
 {{site.data.alerts.end}}

src/current/_includes/v24.3/cdc/create-core-changefeed-avro.md

@@ -1,4 +1,4 @@
-In this example, you'll set up a core changefeed for a single-node cluster that emits Avro records. CockroachDB's Avro binary encoding convention uses the [Confluent Schema Registry](https://docs.confluent.io/current/schema-registry/docs/serializer-formatter.html) to store Avro schemas.
+In this example, you'll set up a basic changefeed for a single-node cluster that emits Avro records. CockroachDB's Avro binary encoding convention uses the [Confluent Schema Registry](https://docs.confluent.io/current/schema-registry/docs/serializer-formatter.html) to store Avro schemas.
 
 1. Use the [`cockroach start-single-node`]({% link {{ page.version.version }}/cockroach-start-single-node.md %}) command to start a single-node cluster:
 
@@ -53,7 +53,7 @@ In this example, you'll set up a core changefeed for a single-node cluster that
     > INSERT INTO bar VALUES (0);
     ~~~
 
-1. Start the core changefeed:
+1. Start the basic changefeed:
 
     {% include_cached copy-clipboard.html %}
     ~~~ sql
@@ -72,13 +72,13 @@ In this example, you'll set up a core changefeed for a single-node cluster that
     $ cockroach sql --insecure -e "INSERT INTO bar VALUES (1)"
     ~~~
 
-1. Back in the terminal where the core changefeed is streaming, the output will appear:
+1. Back in the terminal where the basic changefeed is streaming, the output will appear:
 
     ~~~
     bar,\000\000\000\000\001\002\002,\000\000\000\000\002\002\002\002
     ~~~
 
-    Note that records may take a couple of seconds to display in the core changefeed.
+    Note that records may take a couple of seconds to display in the basic changefeed.
 
 1. To stop streaming the changefeed, enter **CTRL+C** into the terminal where the changefeed is running.
 

src/current/_includes/v24.3/cdc/create-core-changefeed.md

@@ -1,4 +1,4 @@
-In this example, you'll set up a core changefeed for a single-node cluster.
+In this example, you'll set up a basic changefeed for a single-node cluster.
 
 1. In a terminal window, start `cockroach`:
 
@@ -44,7 +44,7 @@ In this example, you'll set up a core changefeed for a single-node cluster.
     > INSERT INTO foo VALUES (0);
     ~~~
 
-1. Start the core changefeed:
+1. Start the basic changefeed:
 
     {% include_cached copy-clipboard.html %}
     ~~~ sql
@@ -62,13 +62,13 @@ In this example, you'll set up a core changefeed for a single-node cluster.
     $ cockroach sql --insecure -e "INSERT INTO foo VALUES (1)"
     ~~~
 
-1. Back in the terminal where the core changefeed is streaming, the following output has appeared:
+1. Back in the terminal where the basic changefeed is streaming, the following output has appeared:
 
     ~~~
     foo,[1],"{""after"": {""a"": 1}}"
     ~~~
 
-    Note that records may take a couple of seconds to display in the core changefeed.
+    Note that records may take a couple of seconds to display in the basic changefeed.
 
 1. To stop streaming the changefeed, enter **CTRL+C** into the terminal where the changefeed is running.
 

src/current/_includes/v24.3/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 [core 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) that have upgraded to v21.1 or later.
 
 [`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}}