Merge branch 'main' into release-rs-gilboa

Author: rrelledge

config.toml

@@ -71,6 +71,16 @@ rdi_current_version = "1.15.0"
 "Rust-sync"={quickstartSlug="rust"}
 "Rust-async"={quickstartSlug="rust"}
 
+# Mount directories for duplicate content
+[module]
+[[module.mounts]]
+  source = "content"
+  target = "content"
+[[module.mounts]]
+  source = "content/operate/rs/databases/active-active/develop"
+  target = "content/operate/rc/databases/active-active/develop"
+  excludeFiles = ["_index.md"]
+
 # Markup
 [markup]
   [markup.goldmark]

content/commands/ft.aggregate.md

@@ -180,12 +180,12 @@ stack_path: docs/interact/search-and-query
 summary: Run a search query on an index and perform aggregate transformations on the
   results
 syntax: "FT.AGGREGATE index query \n  [VERBATIM] \n  [LOAD count field [field ...]]\
-  \ \n  [TIMEOUT timeout] \n  [ GROUPBY nargs property [property ...] [ REDUCE function\
-  \ nargs arg [arg ...] [AS name] [ REDUCE function nargs arg [arg ...] [AS name]\
-  \ ...]] ...]] \n  [ SORTBY nargs [ property ASC | DESC [ property ASC | DESC ...]]\
-  \ [MAX num] [WITHCOUNT] \n  [ APPLY expression AS name [ APPLY expression AS name\
-  \ ...]] \n  [ LIMIT offset num] \n  [FILTER filter] \n  [ WITHCURSOR [COUNT read_size]\
-  \ [MAXIDLE idle_time]] \n  [ PARAMS nargs name value [ name value ...]] \n  [SCORER scorer]\n
+  \ \n  [TIMEOUT timeout] \n  [GROUPBY nargs property [property ...] [REDUCE function\
+  \ nargs arg [arg ...] [AS name] [REDUCE function nargs arg [arg ...] [AS name]\
+  \ ...]] ...]] \n  [SORTBY nargs [property ASC | DESC [property ASC | DESC ...]]\
+  \ [MAX num] [WITHCOUNT] \n  [APPLY expression AS name [APPLY expression AS name\
+  \ ...]] \n  [LIMIT offset num] \n  [FILTER filter] \n  [WITHCURSOR [COUNT read_size]\
+  \ [MAXIDLE idle_time]] \n  [PARAMS nargs name value [name value ...]] \n  [SCORER scorer]\n
   \ [ADDSCORES] \n  [DIALECT\
   \ dialect]\n"
 syntax_fmt: "FT.AGGREGATE index query [VERBATIM] [LOAD\_count field [field ...]]\n\
@@ -402,7 +402,7 @@ FT.AGGREGATE idx "@url:\"about.html\""
     GROUPBY 2 @day @country
       REDUCE count 0 AS num_visits
     SORTBY 4 @day
-{{< / highlight >}}
+{{< /highlight >}}
 </details>
 
 <details open>
@@ -416,7 +416,7 @@ FT.AGGREGATE books-idx *
       REDUCE COUNT 0 AS num_published
     GROUPBY 0
       REDUCE MAX 1 @num_published AS max_books_published_per_year
-{{< / highlight >}}
+{{< /highlight >}}
 </details>
 
 <details open>
@@ -430,7 +430,7 @@ Search for libraries within 10 kilometers of the longitude -73.982254 and latitu
  FT.AGGREGATE libraries-idx "@location:[-73.982254 40.753181 10 km]"
     LOAD 1 @location
     APPLY "geodistance(@location, -73.982254, 40.753181)"
-{{< / highlight >}}
+{{< /highlight >}}
 
 Here, notice the required use of `LOAD` to pre-load the `@location` attribute because it is a GEO attribute.    
 
@@ -480,7 +480,7 @@ Next, count GitHub events by user (actor), to produce the most active users.
     3) "num"
     4) "2794"
 (0.59s)
-{{< / highlight >}}
+{{< /highlight >}}
 
 </details>
 
@@ -502,17 +502,18 @@ FT.AGGREGATE orders "*"
 APPLY case(@status == "pending", 1, 0) AS is_pending
 APPLY case(@is_pending == 1 && @priority == "high", 1,2) AS status_high
 APPLY case(@is_pending == 0 && @priority == "high", 3,4) AS status_completed
-{{< / highlight >}}
+{{< /highlight >}}
 
 </details>
+
 ## Return information
 
 {{< multitabs id="ft-aggregate-return-info" 
     tab1="RESP2" 
     tab2="RESP3" >}}
 
 One of the following:
-* [Array]({{< relref "/develop/reference/protocol-spec#arrays" >}}) with the first element being the total number of results, followed by result rows as [arrays]({{< relref "/develop/reference/protocol-spec#arrays" >}}) of field-value pairs.
+* [Array reply]({{< relref "/develop/reference/protocol-spec#arrays" >}}) where each row is an array reply representing a single aggregate result. The [integer reply]({{< relref "develop/reference/protocol-spec#resp-integers" >}}) at position `1` does not represent a valid value.
 * [Simple error reply]({{< relref "/develop/reference/protocol-spec#simple-errors" >}}) in these cases: incorrect number of arguments, non-existent index, invalid query syntax.
 
 -tab-sep-

content/commands/hexpire.md

@@ -117,20 +117,28 @@ In this case, the time to live is _updated_ to the new value.
 
 Starting with Redis 8, the Redis Query Engine has enhanced behavior when handling expiring hash fields. For detailed information about how [`FT.SEARCH`]({{< relref "/commands/ft.search" >}}) and [`FT.AGGREGATE`]({{< relref "/commands/ft.aggregate" >}}) commands interact with expiring hash fields, see [Key and field expiration behavior]({{< relref "/develop/ai/search-and-query/advanced-concepts/expiration" >}}).
 
-## Example
+## Examples
 
-```
-redis> HEXPIRE no-key 20 NX FIELDS 2 field1 field2
+{{< clients-example set="cmds_hash" step="hexpire" >}}
+HEXPIRE no-key 20 NX FIELDS 2 field1 field2
 (nil)
-redis> HSET mykey field1 "hello" field2 "world"
+HSET mykey field1 "hello" field2 "world"
 (integer) 2
-redis> HEXPIRE mykey 10 FIELDS 3 field1 field2 field3
+HEXPIRE mykey 10 FIELDS 3 field1 field2 field3
 1) (integer) 1
 2) (integer) 1
 3) (integer) -2
-redis> HGETALL mykey
-(empty array)
-```
+HGETALL mykey
+{{< /clients-example >}}
+
+Give these commands a try in the interactive console:
+
+{{% redis-cli %}}
+HEXPIRE no-key 20 NX FIELDS 2 field1 field2
+HSET mykey field1 "hello" field2 "world"
+HEXPIRE mykey 10 FIELDS 3 field1 field2 field3
+HGETALL mykey
+{{% /redis-cli %}}
 
 ## Return information
 

content/embeds/rc-aa-cidr.md

@@ -0,0 +1,9 @@
+Every CIDR should be unique to properly route network traffic between each Active-Active database instance and your consumer VPCs. The CIDR block regions should _not_ overlap between the Redis server and your app consumer VPCs. In addition, CIDR blocks should not overlap between cluster instances. 
+
+When all **Deployment CIDR** regions display a green checkmark, you're ready to continue.  
+
+{{<image filename="images/rc/icon-cidr-address-ok.png" width="30px" alt="Green checkmarks indicate valid CIDR address values." >}}
+
+Red exclamation marks indicate error conditions; the tooltip provides additional details.
+
+{{<image filename="images/rc/icon-cidr-address-error.png" width="30px" alt="Red exclamation points indicate CIDR address problems." >}} 

content/embeds/rc-pro-billing-units.md

@@ -1,5 +1,3 @@
-## Billing Unit types
-
 The Redis Billing Unit types associated with your Pro subscription depend on your database memory size and throughput requirements.  
 
 | Billing unit type | Capacity (Memory/Throughput) |

content/embeds/rc-rs-aa-synchronization.md

@@ -0,0 +1,13 @@
+In the example below, database writes are concurrent at the points in
+time t1 and t2 and happen before a sync can communicate the changes.
+However, writes at times t4 and t6 are not concurrent as a sync happened
+in between.
+
+|  **Time** | **CRDB Instance1** | **CRDB Instance2** |
+|  ------: | :------: | :------: |
+|  t1 | SET key1 "a" |  |
+|  t2 |  | SET key1 "b" |
+|  t3 | — Sync — | — Sync — |
+|  t4 | SET key1 "c" |  |
+|  t5 | — Sync — | — Sync — |
+|  t6 |  | SET key1 "d" |

content/integrate/prometheus-with-redis-cloud/_index.md

@@ -193,7 +193,7 @@ Redis publishes preconfigured dashboards for Redis Cloud and Grafana:
 
 * The [subscription status dashboard](https://grafana.com/grafana/dashboards/18406-subscription-status-dashboard/) provides an overview of your Redis Cloud subscriptions.
 * The [database status dashboard](https://grafana.com/grafana/dashboards/18407-database-status-dashboard/) displays specific database metrics, including latency, memory usage, ops/second, and key count.
-* The [Active-Active dashboard](https://github.com/redis-field-engineering/redis-enterprise-observability/blob/main/grafana/dashboards/grafana_v9-11/cloud/basic/redis-cloud-active-active-dashboard_v9-11.json) displays metrics specific to [Active-Active databases]({{< relref "/operate/rc/databases/configuration/active-active-redis" >}}).
+* The [Active-Active dashboard](https://github.com/redis-field-engineering/redis-enterprise-observability/blob/main/grafana/dashboards/grafana_v9-11/cloud/basic/redis-cloud-active-active-dashboard_v9-11.json) displays metrics specific to [Active-Active databases]({{< relref "/operate/rc/databases/active-active" >}}).
 
 These dashboards are open source. For additional dashboard options, or to file an issue, see the [Redis Enterprise observability Github repository](https://github.com/redis-field-engineering/redis-enterprise-observability/tree/main/grafana).
 

content/operate/_index.md

@@ -22,7 +22,7 @@ hideListLinks: true
 |:-----------|:--------------|:-----------|:--------------|:--------------|
 | Clustering | [Clustering]({{< relref "/operate/rc/databases/configuration/clustering" >}}) | [Clustering]({{<relref "/operate/rs/databases/durability-ha/clustering">}}) | [Scale with Redis Cluster]({{< relref "/operate/oss_and_stack/management/scaling" >}}) | [Redis Enterprise clusters (REC)]({{<relref "/operate/kubernetes/re-clusters">}}) |
 | Replication | [Replication]({{< relref "/operate/rc/databases/configuration/high-availability" >}}) | [Replication]({{<relref "/operate/rs/databases/durability-ha/replication">}}) | [Replication]({{< relref "/operate/oss_and_stack/management/replication" >}}) | [Create replica databases]({{<relref "/operate/kubernetes/re-databases/replica-redb/">}})|
-| Active-Active geo-distribution | [Active-Active Redis]({{< relref "/operate/rc/databases/configuration/active-active-redis" >}}) | [Active-Active Redis]({{<relref "/operate/rs/databases/active-active">}}) |  | [Active-Active databases]({{<relref "/operate/kubernetes/active-active/">}}) |
+| Active-Active geo-distribution | [Active-Active Redis]({{< relref "/operate/rc/databases/active-active" >}}) | [Active-Active Redis]({{<relref "/operate/rs/databases/active-active">}}) |  | [Active-Active databases]({{<relref "/operate/kubernetes/active-active/">}}) |
 | Rolling upgrades | [Upgrade database version]({{< relref "/operate/rc/databases/upgrade-version" >}}) | [Upgrade Redis Software]({{<relref "/operate/rs/installing-upgrading/upgrading">}}) |  | [Upgrade Redis for K8s]({{<relref "/operate/kubernetes/upgrade/">}}) |
 | Redis Flex/Auto tiering | [Create a Redis Flex database]({{< relref "/operate/rc/databases/create-database/create-flex-database" >}}) | [Redis Flex]({{<relref "/operate/rs/databases/flash">}}) |  | [Auto Tiering]({{<relref "/operate/kubernetes/re-clusters/auto-tiering/">}}) |
 | Persistence | [Data persistence]({{< relref "/operate/rc/databases/configuration/data-persistence" >}}) | [Persistence]({{<relref "/operate/rs/databases/configure/database-persistence">}}) | [Persistence]({{< relref "/operate/oss_and_stack/management/replication" >}}) | [Persistence volumes]({{<relref "/operate/kubernetes/recommendations/persistent-volumes/">}})|

content/operate/oss_and_stack/stack-with-enterprise/json/active-active.md

@@ -19,7 +19,7 @@ The design is based on [A Conflict-Free Replicated JSON Datatype](https://arxiv.
 
 To use JSON in an Active-Active database, you must enable JSON during database creation.
 
-Active-Active Redis Cloud databases add JSON by default. See [Create an Active-Active database]({{< relref "/operate/rc/databases/create-database/create-active-active-database#select-capabilities" >}}) in the Redis Cloud documentation for details.
+Active-Active Redis Cloud databases add JSON by default. See [Create an Active-Active database]({{< relref "/operate/rc/databases/active-active/create-active-active-database#select-capabilities" >}}) in the Redis Cloud documentation for details.
 
 In Redis Enterprise Software, Active-Active databases created with or upgraded to Redis version 8 or later automatically enable JSON. For earlier Redis versions, you can enable JSON during database creation:
 

content/operate/oss_and_stack/stack-with-enterprise/release-notes/redisearch/redisearch-2.10-release-notes.md

@@ -13,11 +13,24 @@ weight: 90
 ---
 ## Requirements
 
-RediSearch v2.10.23 requires:
+RediSearch v2.10.24 requires:
 
 - Minimum Redis compatibility version (database): 7.4
 - Minimum Redis Enterprise Software version (cluster): 7.8
 
+## v2.10.24 (October 2025)
+
+This is a maintenance release for RediSearch 2.10.
+
+Update urgency: `LOW`: No need to upgrade unless there are new features you want to use.
+
+Bug Fixes
+- [#6960](https://github.com/redisearch/redisearch/pull/6960) - FT.INFO returns the wrong number of documents in OSS Cluster with replicas.
+- [#6938](https://github.com/redisearch/redisearch/pull/6938) - Fix for the HIGHLIGHT feature, where if some fields have empty strings, wrong tokens might be highlighted.
+- [#7047](https://github.com/redisearch/redisearch/pull/7047) - Avoid crashing in the FT.AGGREGATE command in clusters where different shards have different ON_TIMEOUT policies configured (fail vs return).
+
+Full Changelog: https://github.com/RediSearch/RediSearch/compare/v2.10.23...v2.10.24.
+
 ## v2.10.23 (September 2025)
 
 This is a maintenance release for RediSearch 2.10.
@@ -28,7 +41,7 @@ Bug fixes:
 - [#6672](https://github.com/RediSearch/RediSearch/pull/6672) Fix potential file descriptor leak when OOM.
 - [#6763](https://github.com/RediSearch/RediSearch/pull/6763) Fix potential deadlock during RDB loading in cases where the `INFO` command is sent to the server.
 
-**Full Changelog**: https://github.com/RediSearch/RediSearch/compare/v2.10.22...v2.10.23
+Full Changelog: https://github.com/RediSearch/RediSearch/compare/v2.10.22...v2.10.23
 
 ## v2.10.22 (August 2025)