Merge branch 'release-rs-fuya-fuya' into DOC-4418

Author: rrelledge

content/develop/connect/clients/dotnet.md

@@ -188,111 +188,63 @@ for more information.
 
 ## Example: Indexing and querying JSON documents
 
-This example shows how to convert Redis search results to JSON format using `NRedisStack`.
+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.
 
 Make sure that you have Redis Stack and `NRedisStack` installed. 
 
-Import dependencies and connect to the Redis server:
+Start by importing dependencies:
 
-```csharp
-using NRedisStack;
-using NRedisStack.RedisStackCommands;
-using NRedisStack.Search;
-using NRedisStack.Search.Aggregation;
-using NRedisStack.Search.Literals.Enums;
-using StackExchange.Redis;
+{{< clients-example cs_home_json import >}}
+{{< /clients-example >}}
 
-// ...
+Connect to the database:
 
-ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
-```
+{{< clients-example cs_home_json connect >}}
+{{< /clients-example >}}
 
-Get a reference to the database and for search and JSON commands.
+Create some test data to add to the database:
 
-```csharp
-var db = redis.GetDatabase();
-var ft = db.FT();
-var json = db.JSON();
-```
+{{< clients-example cs_home_json create_data >}}
+{{< /clients-example >}}
 
-Let's create some test data to add to your database.
+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/" >}}).
 
-```csharp
-var user1 = new {
-    name = "Paul John",
-    email = "[email protected]",
-    age = 42,
-    city = "London"
-};
+{{< clients-example cs_home_json make_index >}}
+{{< /clients-example >}}
 
-var user2 = new {
-    name = "Eden Zamir",
-    email = "[email protected]",
-    age = 29,
-    city = "Tel Aviv"
-};
+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
+objects automatically as you add them:
 
-var user3 = new {
-    name = "Paul Zamir",
-    email = "[email protected]",
-    age = 35,
-    city = "Tel Aviv"
-};
-```
+{{< clients-example cs_home_json add_data >}}
+{{< /clients-example >}}
 
-Create an index. In this example, all JSON documents with the key prefix `user:` are indexed. For more information, see [Query syntax]({{< relref "/develop/interact/search-and-query/query/" >}}).
+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
+and have an `age` value in the range 30 to 40:
 
-```csharp
-var schema = new Schema()
-    .AddTextField(new FieldName("$.name", "name"))
-    .AddTagField(new FieldName("$.city", "city"))
-    .AddNumericField(new FieldName("$.age", "age"));
-
-ft.Create(
-    "idx:users",
-    new FTCreateParams().On(IndexDataType.JSON).Prefix("user:"),
-    schema);
-```
+{{< clients-example cs_home_json query1 >}}
+{{< /clients-example >}}
 
-Use [`JSON.SET`]({{< baseurl >}}/commands/json.set/) to set each user value at the specified path.
+Specify query options to return only the `city` field:
 
-```csharp
-json.Set("user:1", "$", user1);
-json.Set("user:2", "$", user2);
-json.Set("user:3", "$", user3);
-```
-
-Let's find user `Paul` and filter the results by age.
-
-```csharp
-var res = ft.Search("idx:users", new Query("Paul @age:[30 40]")).Documents.Select(x => x["json"]);
-Console.WriteLine(string.Join("\n", res)); 
-// Prints: {"name":"Paul Zamir","email":"[email protected]","age":35,"city":"Tel Aviv"}
-```
-
-Return only the `city` field.
+{{< clients-example cs_home_json query2 >}}
+{{< /clients-example >}}
 
-```csharp
-var res_cities = ft.Search("idx:users", new Query("Paul").ReturnFields(new FieldName("$.city", "city"))).Documents.Select(x => x["city"]);
-Console.WriteLine(string.Join(", ", res_cities)); 
-// Prints: London, Tel Aviv
-```
+Use an
+[aggregation query]({{< relref "/develop/interact/search-and-query/query/aggregation" >}})
+to count all users in each city.
 
-Count all users in the same city.
-
-```csharp
-var request = new AggregationRequest("*").GroupBy("@city", Reducers.Count().As("count"));
-var result = ft.Aggregate("idx:users", request);
+{{< clients-example cs_home_json query3 >}}
+{{< /clients-example >}}
 
-for (var i=0; i<result.TotalResults; i++)
-{
-    var row = result.GetRow(i);
-    Console.WriteLine($"{row["city"]} - {row["count"]}");
-}
-// Prints:
-// London - 1
-// Tel Aviv - 2
-```
+See the [Redis query engine]({{< relref "/develop/interact/search-and-query" >}}) docs
+for a full description of all query features with examples.
 
 ## Learn more
 

content/embeds/rs-quick-db-setup-7-8.md

@@ -0,0 +1,18 @@
+1. On the **Databases** screen, select **Quick database**.
+
+    {{<image filename="images/rs/screenshots/databases/db-screen.png" alt="Select Quick database on the Databases screen." >}}
+
+1. Enter 12000 for the **Port**.
+
+    If port 12000 is not available, enter any available port number between 10000 to 19999 or leave it blank to let the cluster assign a port number for you. You will use this port number to connect to the database.
+
+    {{<image filename="images/rs/screenshots/databases/quick-db-7-8-2.png" alt="Create a quick database." >}}
+
+1. Select **Create** to create your database.
+
+When you see **Database active** appear on the database configuration screen, the database is activated and ready for you to use.
+
+{{<image filename="images/rs/icons/db-active-icon.png" width="150px" alt="Database active icon." >}}
+
+
+You now have a Redis database!

content/operate/kubernetes/release-notes/7-4-6-releases/7-4-6-2-october24.md

@@ -16,7 +16,7 @@ This is a maintenance release to support [Redis Enterprise Software version 7.4.
 
 ## Downloads
 
-- **Redis Enterprise**: `redislabs/redis:7.4.102`
+- **Redis Enterprise**: `redislabs/redis:7.4.6-102`
 - **Operator**: `redislabs/operator:7.4.6-2`
 - **Services Rigger**: `redislabs/k8s-controller:7.4.6-2`
 

content/operate/oss_and_stack/stack-with-enterprise/install/add-module-to-database.md

@@ -30,7 +30,7 @@ In the Redis Enterprise Cluster Manager UI, follow these steps to add modules to
 
 1. In the **Capabilities** section, select one or more capabilities:
 
-    {{<image filename="images/rs/screenshots/databases/quick-db-capabilities.png" alt="Select which capabilities to add to your database.">}}
+    {{<image filename="images/rs/screenshots/databases/quick-db-capabilities-7-8-2.png" alt="Select which capabilities to add to your database.">}}
 
     {{<note>}}
 You cannot use RediSearch 1.x and RediSearch 2.x in the same database.