Merge branch 'main' into preview-rc-rdi

Author: cmilesb

README.md

@@ -1,9 +1,5 @@
 # Redis Docs
 
-OPEN SOURCE LICENSE VS. TRADEMARKS. The three-clause BSD license gives you the right to redistribute and use the software in source and binary forms, with or without modification, under certain conditions. However, open source licenses like the three-clause BSD license do not address trademarks. For further details please read the [Redis Trademark Policy](https://redis.io/legal/trademark-policy/)."
-
-## A note for Issue and PR submitters
-
 PRs are merged first to the `main` branch of this repo.
 Periodically, the docs team will merge `main` into `latest`, which will make the changes visible on the docs site.
 Please be patient, as there may be a lag of several days before `main` is merged into `latest`. If you want to see your changes before they're merged to `latest`, you can see them on https://redis.io/docs/staging/dev/. 

content/commands/info/index.md

@@ -602,7 +602,7 @@ It won't be included when `INFO` or `INFO ALL` are called, and it is returned on
 
 | Redis<br />Enterprise | Redis<br />Cloud | <span style="min-width: 9em; display: table-cell">Notes</span> |
 |:----------------------|:-----------------|:------|
-| <span title="Supported">&#x2705; Standard</span><br /><span title="Supported"><nobr>&#x2705; Active-Active</nobr></span> | <span title="Supported">&#x2705; Standard</span><br /><span title="Supported"><nobr>&#x2705; Active-Active</nobr></span> | In Redis Enterprise, `INFO` returns a different set of fields than Redis Community Edition.<br />Not supported for [scripts]({{<relref "/develop/interact/programmability">}}). |
+| <span title="Supported">&#x2705; Standard</span><br /><span title="Supported"><nobr>&#x2705; Active-Active</nobr></span> | <span title="Supported">&#x2705; Standard</span><br /><span title="Supported"><nobr>&#x2705; Active-Active</nobr></span> | In Redis Enterprise, `INFO` returns a different set of fields than Redis Open Source.<br />Not supported for [scripts]({{<relref "/develop/interact/programmability">}}). |
 
 Note: key memory usage is different on Redis Software or Redis Cloud active-active databases than on non-active-active databases. This is because memory usage includes some amount of CRDB overhead.
 

content/commands/module-load/index.md

@@ -49,5 +49,5 @@ unmodified to the module.
 configuration directive in `redis.conf`.
 
 {{< note >}}
-As of Redis CE v8.0.0, loading a module using the Redis CLI with configuration parameters is deprecated.
+As of Redis 8 in Redis Open Source, loading a module using the Redis CLI with configuration parameters is deprecated.
 {{< /note >}}

content/develop/clients/_index.md

@@ -57,8 +57,8 @@ Redis does not document directly:
 ## Requirements
 
 You will need access to a Redis server to use these libraries.
-You can experiment with a local installation of Redis Community Edition
-(see [Install Redis Community Edition]({{< relref "/operate/oss_and_stack/install/install-stack/" >}})) or with a free trial of [Redis Cloud]({{< relref "/operate/rc" >}}).
+You can experiment with a local installation of Redis Open Source
+(see [Install Redis Open Source]({{< relref "/operate/oss_and_stack/install/install-stack/" >}})) or with a free trial of [Redis Cloud]({{< relref "/operate/rc" >}}).
 To interact with a Redis server without writing code, use the
 [Redis CLI]({{< relref "/develop/tools/cli" >}}) and
 [Redis Insight]({{< relref "/develop/tools/insight" >}}) tools.

content/develop/clients/dotnet/_index.md

@@ -20,7 +20,7 @@ weight: 3
 The sections below explain how to install `NRedisStack` and connect your application
 to a Redis database.
 
-`NRedisStack` requires a running [Redis Community Edition]({{< relref "/operate/oss_and_stack/install/install-stack/" >}}) server. See [Getting started]({{< relref "/operate/oss_and_stack/install/" >}}) for Redis installation instructions.
+`NRedisStack` requires a running Redis server. See [here]({{< relref "/operate/oss_and_stack/install/" >}}) for Redis Open Source installation instructions.
 
 You can also access Redis with an object-mapping client interface. See
 [Redis OM for .NET]({{< relref "/integrate/redisom-for-net" >}})
@@ -70,9 +70,9 @@ Console.WriteLine(String.Join("; ", hashFields));
 // Prints: 
 // name: John; surname: Smith; company: Redis; age: 29
 ```
-## Redis Community Edition modules
+## Redis Open Source modules
 
-To access Redis Community Edition capabilities, use the appropriate interface like this:
+To access Redis Open Source capabilities, use the appropriate interface like this:
 
 ```
 IBloomCommands bf = db.BF();

content/develop/clients/dotnet/queryjson.md

@@ -9,39 +9,55 @@ categories:
 - oss
 - kubernetes
 - clients
-description: Learn how to use the Redis query engine with JSON
-linkTitle: Index and query JSON
-title: Example - Index and query JSON documents
+description: Learn how to use the Redis query engine with JSON and hash documents.
+linkTitle: Index and query documents
+title: Index and query documents
 weight: 2
 ---
 
 This example shows how to create a
 [search index]({{< relref "/develop/interact/search-and-query/indexing" >}})
-for [JSON]({{< relref "/develop/data-types/json" >}}) data and
-run queries against the index.
+for [JSON]({{< relref "/develop/data-types/json" >}}) documents and
+run queries against the index. It then goes on to show the slight differences
+in the equivalent code for [hash]({{< relref "/develop/data-types/hashes" >}})
+documents.
 
-Make sure that you have Redis Community Edition and `NRedisStack` installed. 
+## Initialize
 
-Start by importing dependencies:
+Make sure that you have [Redis Open Source]({{< relref "/operate/oss_and_stack" >}})
+or another Redis server available. Also install the
+[`NRedisStack`]({{< relref "/develop/clients/dotnet" >}}) client library if you
+haven't already done so. 
+
+Add the following dependencies:
 
 {{< clients-example cs_home_json import >}}
 {{< /clients-example >}}
 
-Connect to the database:
-
-{{< clients-example cs_home_json connect >}}
-{{< /clients-example >}}
+## Create data
 
 Create some test data to add to the database:
 
 {{< clients-example cs_home_json create_data >}}
 {{< /clients-example >}}
 
+## Add the index
+
+Connect to your Redis database. The code below shows the most
+basic connection but see
+[Connect to the server]({{< relref "/develop/clients/dotnet/connect" >}})
+to learn more about the available connection options.
+
+{{< clients-example cs_home_json connect >}}
+{{< /clients-example >}}
+
 Create an index. In this example, only JSON documents with the key prefix `user:` are indexed. For more information, see [Query syntax]({{< relref "/develop/interact/search-and-query/query/" >}}).
 
 {{< clients-example cs_home_json make_index >}}
 {{< /clients-example >}}
 
+## Add the data
+
 Add the three sets of user data to the database as
 [JSON]({{< relref "/develop/data-types/json" >}}) objects.
 If you use keys with the `user:` prefix then Redis will index the
@@ -50,6 +66,8 @@ objects automatically as you add them:
 {{< clients-example cs_home_json add_data >}}
 {{< /clients-example >}}
 
+## Query the data
+
 You can now use the index to search the JSON objects. The
 [query]({{< relref "/develop/interact/search-and-query/query" >}})
 below searches for objects that have the text "Paul" in any field
@@ -70,5 +88,39 @@ to count all users in each city.
 {{< clients-example cs_home_json query3 >}}
 {{< /clients-example >}}
 
+## Differences with hash documents
+
+Indexing for hash documents is very similar to JSON indexing but you
+need to specify some slightly different options.
+
+When you create the schema for a hash index, you don't need to
+add aliases for the fields, since you use the basic names to access
+the fields anyway. Also, you must set the `On` option to `IndexDataType.HASH`
+in the `FTCreateParams` object when you create the index. The code below shows
+these changes with a new index called `hash-idx:users`, which is otherwise the
+same as the `idx:users` index used for JSON documents in the previous examples.
+
+{{< clients-example cs_home_json make_hash_index >}}
+{{< /clients-example >}}
+
+You use [`HashSet()`]({{< relref "/commands/hset" >}}) to add the hash
+documents instead of [`JSON.Set()`]({{< relref "/commands/json.set" >}}).
+Also, you must add the fields as key-value pairs instead of combining them
+into a single object.
+
+{{< clients-example cs_home_json add_hash_data >}}
+{{< /clients-example >}}
+
+The query commands work the same here for hash as they do for JSON (but
+the name of the hash index is different). The format of the result is
+almost the same except that the fields are returned directly in the
+`Document` object of the result (for JSON, the fields are all enclosed
+in a string under the key `json`):
+
+{{< clients-example cs_home_json query1_hash >}}
+{{< /clients-example >}}
+
+## More information
+
 See the [Redis query engine]({{< relref "/develop/interact/search-and-query" >}}) docs
 for a full description of all query features with examples.

content/develop/clients/go/_index.md

@@ -19,9 +19,7 @@ weight: 7
 [`go-redis`](https://github.com/redis/go-redis) is the [Go](https://go.dev/) client for Redis.
 The sections below explain how to install `go-redis` and connect your application to a Redis database.
 
-`go-redis` requires a running [Redis Community Edition]({{< relref "/operate/oss_and_stack/install/install-stack/" >}}) server.
-See [Getting started]({{< relref "/operate/oss_and_stack/install/" >}}) for Redis installation
-instructions.
+`go-redis` requires a running Redis server. See [here]({{< relref "/operate/oss_and_stack/install/" >}}) for Redis Open Source installation instructions.
 
 ## Install
 

content/develop/clients/go/queryjson.md

@@ -24,7 +24,7 @@ documents.
 
 ## Initialize
 
-Make sure that you have [Redis Community Edition]({{< relref "/operate/oss_and_stack/" >}})
+Make sure that you have [Redis Open Source]({{< relref "/operate/oss_and_stack/" >}})
 or another Redis server available. Also install the
 [`go-redis`]({{< relref "/develop/clients/go" >}}) client library if you
 haven't already done so.

content/develop/clients/jedis/_index.md

@@ -22,7 +22,7 @@ a more advanced Java client that also supports asynchronous and reactive connect
 The sections below explain how to install `Jedis` and connect your application
 to a Redis database.
 
-`Jedis` requires a running [Redis Community Edition]({{< relref "/operate/oss_and_stack/install/install-stack/" >}}) server. See [Getting started]({{< relref "/operate/oss_and_stack/install/" >}}) for Redis installation instructions.
+`Jedis` requires a running Redis server. See [here]({{< relref "/operate/oss_and_stack/install/" >}}) for Redis Open Source installation instructions.
 
 ## Install
 

content/develop/clients/jedis/queryjson.md

@@ -24,7 +24,7 @@ documents.
 
 ## Initialize
 
-Make sure that you have [Redis Community Edition]({{< relref "/operate/oss_and_stack/" >}})
+Make sure that you have [Redis Open Source]({{< relref "/operate/oss_and_stack/" >}})
 or another Redis server available. Also install the
 [Jedis]({{< relref "/develop/clients/jedis" >}}) client library if you
 haven't already done so.