Merge remote-tracking branch 'origin/main' into DOC-14622

Author: florence-crl

src/current/_data/releases.yml

@@ -9589,3 +9589,31 @@
     docker_arm_limited_access: false
   source: true
   previous_release: v25.4.0-beta.1
+
+
+- release_name: v25.4.0-beta.3
+  major_version: v25.4
+  release_date: '2025-10-16'
+  release_type: Testing
+  go_version: go1.23.12
+  sha: d70350c0c33cc6e0f0a58e0ec9b5e52b9ba40661
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach-unstable
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v25.4.0-beta.2

src/current/_includes/releases/v25.4/v25.4.0-beta.3.md

@@ -0,0 +1,12 @@
+## v25.4.0-beta.3
+
+Release Date: October 16, 2025
+
+{% include releases/new-release-downloads-docker-image.md release=include.release %}
+
+<h3 id="v25-4-0-beta-3-bug-fixes">Bug fixes</h3>
+
+- Fixed a bug that caused internal errors for `INSERT .. ON CONFLICT .. DO UPDATE` statements when the target table had both a computed column and a `BEFORE` trigger. This bug was present since triggers were introduced in v24.3.0. [#155077][#155077]
+
+
+[#155077]: https://github.com/cockroachdb/cockroach/pull/155077

src/current/v24.3/follower-reads.md

@@ -63,12 +63,6 @@ To see the current value of the follower read timestamp, execute the following q
 SELECT now() - follower_read_timestamp();
 ~~~
 
-#### Exact staleness follower reads demo
-
-The following video describes and demonstrates [exact staleness](#exact-staleness-reads) follower reads.
-
-{% include_cached youtube.html video_id="V--skgN_JMo" %}
-
 #### Exact staleness follower reads in read-only transactions
 
 You can set the [`AS OF SYSTEM TIME`]({% link {{ page.version.version }}/as-of-system-time.md %}) clause's value for all operations in a read-only [transaction]({% link {{ page.version.version }}/transactions.md %}):
@@ -258,6 +252,12 @@ For further details, see [An Epic Read on Follower Reads](https://www.cockroachl
 
 {% include {{ page.version.version }}/known-limitations/follower-reads-limitations.md %}
 
+### Video demo
+
+For a demo of how to use follower reads to improve performance, watch the following video:
+
+{% include_cached youtube.html video_id="NzhhvgzHJj4" %}
+
 ## See also
 
 - [Follower Reads Topology]({% link {{ page.version.version }}/topology-follower-reads.md %})

src/current/v25.2/follower-reads.md

@@ -63,12 +63,6 @@ To see the current value of the follower read timestamp, execute the following q
 SELECT now() - follower_read_timestamp();
 ~~~
 
-#### Exact staleness follower reads demo
-
-The following video describes and demonstrates [exact staleness](#exact-staleness-reads) follower reads.
-
-{% include_cached youtube.html video_id="V--skgN_JMo" %}
-
 #### Exact staleness follower reads in read-only transactions
 
 You can set the [`AS OF SYSTEM TIME`]({% link {{ page.version.version }}/as-of-system-time.md %}) clause's value for all operations in a read-only [transaction]({% link {{ page.version.version }}/transactions.md %}):
@@ -258,6 +252,12 @@ For further details, see [An Epic Read on Follower Reads](https://www.cockroachl
 
 {% include {{ page.version.version }}/known-limitations/follower-reads-limitations.md %}
 
+### Video demo
+
+For a demo of how to use follower reads to improve performance, watch the following video:
+
+{% include_cached youtube.html video_id="NzhhvgzHJj4" %}
+
 ## See also
 
 - [Follower Reads Topology]({% link {{ page.version.version }}/topology-follower-reads.md %})

src/current/v25.3/follower-reads.md

@@ -63,12 +63,6 @@ To see the current value of the follower read timestamp, execute the following q
 SELECT now() - follower_read_timestamp();
 ~~~
 
-#### Exact staleness follower reads demo
-
-The following video describes and demonstrates [exact staleness](#exact-staleness-reads) follower reads.
-
-{% include_cached youtube.html video_id="V--skgN_JMo" %}
-
 #### Exact staleness follower reads in read-only transactions
 
 You can set the [`AS OF SYSTEM TIME`]({% link {{ page.version.version }}/as-of-system-time.md %}) clause's value for all operations in a read-only [transaction]({% link {{ page.version.version }}/transactions.md %}):
@@ -258,6 +252,12 @@ For further details, see [An Epic Read on Follower Reads](https://www.cockroachl
 
 {% include {{ page.version.version }}/known-limitations/follower-reads-limitations.md %}
 
+### Video demo
+
+For a demo of how to use follower reads to improve performance, watch the following video:
+
+{% include_cached youtube.html video_id="NzhhvgzHJj4" %}
+
 ## See also
 
 - [Follower Reads Topology]({% link {{ page.version.version }}/topology-follower-reads.md %})

src/current/v25.4/follower-reads.md

@@ -63,12 +63,6 @@ To see the current value of the follower read timestamp, execute the following q
 SELECT now() - follower_read_timestamp();
 ~~~
 
-#### Exact staleness follower reads demo
-
-The following video describes and demonstrates [exact staleness](#exact-staleness-reads) follower reads.
-
-{% include_cached youtube.html video_id="V--skgN_JMo" %}
-
 #### Exact staleness follower reads in read-only transactions
 
 You can set the [`AS OF SYSTEM TIME`]({% link {{ page.version.version }}/as-of-system-time.md %}) clause's value for all operations in a read-only [transaction]({% link {{ page.version.version }}/transactions.md %}):
@@ -258,6 +252,12 @@ For further details, see [An Epic Read on Follower Reads](https://www.cockroachl
 
 {% include {{ page.version.version }}/known-limitations/follower-reads-limitations.md %}
 
+### Video demo
+
+For a demo of how to use follower reads to improve performance, watch the following video:
+
+{% include_cached youtube.html video_id="NzhhvgzHJj4" %}
+
 ## See also
 
 - [Follower Reads Topology]({% link {{ page.version.version }}/topology-follower-reads.md %})