resolving merge conflicts, accepting all incoming changes

wjohnsto · wjohnsto · commit 9676c1102f2a · 2022-06-17T10:10:28.000-07:00
diff --git a/docs/create/aws/redis-on-aws/index-redis-on-aws.mdx b/docs/create/aws/redis-on-aws/index-redis-on-aws.mdx
@@ -62,8 +62,7 @@ Click "Create Database". Enter database name and your preferred module.
 Click "Activate" and wait for few seconds till it gets activated. Once fully activated, you will see the database endpoints as shown below:
 
 ![My Image](images/launch_database.png)
-
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/create/azure/portal/index-azure-portal.mdx b/docs/create/azure/portal/index-azure-portal.mdx
@@ -58,7 +58,8 @@ Please note that you can have multiple clients connected to a Redis database at
     allowfullscreen></iframe>
 </div>
 
-### Next Step
+
+### Next Steps
 
 - [Getting Started with .Net and Redis](/develop/dotnet/)
 - [Best Practices for Azure Cache for Redis](https://docs.microsoft.com/en-in/azure/azure-cache-for-redis/cache-best-practices)
diff --git a/docs/create/cloud/aws/index-aws.mdx b/docs/create/cloud/aws/index-aws.mdx
@@ -29,7 +29,7 @@ For the cloud provider, select Amazon AWS and choose Free plan.
 
 ![AWS Cloud](aws6.png)
 
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/create/cloud/azure/index-azure.mdx b/docs/create/cloud/azure/index-azure.mdx
@@ -32,7 +32,7 @@ sudo redis-cli -h redislabs.redis.cache.windows.net -p 6379
 redislabs.redis.cache.windows.net:6379>
 ```
 
-### Next Step
+### Next Steps
 
 - [Best Practices for Azure Cache for Redis](https://docs.microsoft.com/en-in/azure/azure-cache-for-redis/cache-best-practices)
 - [Quickstart: Use Azure Cache for Redis in .NET Framework](https://docs.microsoft.com/en-us/azure/azure-cache-for-redis/cache-dotnet-how-to-use-azure-redis-cache)
diff --git a/docs/create/cloud/gcp/index-gcp.mdx b/docs/create/cloud/gcp/index-gcp.mdx
@@ -41,7 +41,7 @@ Launch [Redis Enterprise Cloud page](https://console.cloud.google.com/apis/libra
 
 ![Google Cloud](gcp10.png)
 
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/shoppingcart/)
diff --git a/docs/create/cloud/index-cloud.mdx.orig b/docs/create/cloud/index-cloud.mdx.orig
@@ -44,7 +44,7 @@ Click "Activate" and wait for few seconds till it gets activated. Once fully act
 ![My Image](images/activate.png)
 
 
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/create/cloud/rediscloud/index-recloud.mdx b/docs/create/cloud/rediscloud/index-recloud.mdx
@@ -55,7 +55,8 @@ Click "Activate" and wait for few seconds till it gets activated. Once fully act
 
 ![My Image](images/launch_database.png)
 
-### Next Step
+
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/create/docker/redis-on-docker/index-redis-on-docker.mdx b/docs/create/docker/redis-on-docker/index-redis-on-docker.mdx
@@ -156,7 +156,7 @@ For example, here’s how to use the `REDIS_ARGS` environment variable to pass t
 
 </Tabs>
 
-### Next Step
+### Next Steps
 
 - [Connect to Redis database using RedisInsight](/explore/redisinsightv2/)
 - [Connect to Redis database using Redis datasource for Grafana](/explore/redisdatasource/)
diff --git a/docs/create/gcp/index-gcp.mdx b/docs/create/gcp/index-gcp.mdx
@@ -42,7 +42,7 @@ Launch [Redis Enterprise Cloud page](https://console.cloud.google.com/apis/libra
 
 ![Google Cloud](gcp10.png)
 
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/shoppingcart/)
diff --git a/docs/create/heroku/herokujava/index-herokujava.mdx b/docs/create/heroku/herokujava/index-herokujava.mdx
@@ -110,7 +110,9 @@ Open https://hidden-woodland-03996.herokuapp.com/ to see your application
 
 ![heroku](heroku_ratelimiter.png)
 
-### Next Step
+
+
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/create/heroku/herokunodejs/index-herokunodejs.mdx b/docs/create/heroku/herokunodejs/index-herokunodejs.mdx
@@ -99,7 +99,7 @@ Open https://rocky-lowlands-06306.herokuapp.com/ to see your application
 
 ![heroku](heroku_ratelimiter.png)
 
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/create/heroku/herokupython/index-herokupython.mdx b/docs/create/heroku/herokupython/index-herokupython.mdx
@@ -125,7 +125,9 @@ Open https://fast-reef-76278.herokuapp.com/ to see your application
 
 ![heroku](heroku_ratelimiter.png)
 
-### Next Step
+
+
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/create/heroku/portal/index-heroku.mdx.python b/docs/create/heroku/portal/index-heroku.mdx.python
@@ -261,7 +261,7 @@ content-goes-here
 
 
 
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/get-involved/redis-live/index-redis-live.mdx b/docs/get-involved/redis-live/index-redis-live.mdx
@@ -12,22 +12,22 @@ Redis Live hosts a variety of live-streamed content on [Twitch](https://www.twit
 
 Check out these upcoming streams:
 
-|        Date        |    Time     | Streamers                                        | Show                                                    |
-| :----------------: | :---------: | :----------------------------------------------- | :------------------------------------------------------ |
-|   Friday, June 3   | 6:00 PM UTC | [Guy Royse][guy]                                 | Tracking Aircraft with Redis + Software-Defined Radio   |
-|  Friday, June 10   | 3:00 PM UTC | [Justin Castilla][justin], [Suze Shardlow][suze] | Working with Redis Data Structures                      |
-|  Friday, June 10   | 6:00 PM UTC | [Guy Royse][guy]                                 | Working on Redis OM for Node.js                         |
-| Wednesday, June 15 | 4:00 PM UTC | [Simon Prickett][simon]                          | Up and Running with the RU102PY Redis University Course |
-| Wednesday, June 15 | 5:00 PM UTC | [Simon Prickett][simon]                          | Up and Running with the RU102JS Redis University Course |
-| Thursday, June 16  | 3:00 PM UTC | [Simon Prickett][simon], [Suze Shardlow][suze]   | Counting Things At Scale with Redis                     |
-|  Friday, June 17   | 6:00 PM UTC | [Guy Royse][guy]                                 | Graph, Graph, and Graph: Attorneys at Law               |
-| Wednesday, June 29 | 6:00 PM UTC | [Steve Lorello][steve]                           | Real-Time Stock Analytics with Redis Stack and .NET     |
-|  Friday, June 30   | 6:00 PM UTC | [Guy Royse][guy]                                 | Graph, Graph, and Graph: Attorneys at Law               |
-| Wednesday, July 6  | 6:00 PM UTC | [Steve Lorello][steve]                           | Real-Time Stock Analytics with Redis Stack and .NET     |
-|   Friday, July 8   | 6:00 PM UTC | [Brian Sam-Bodden][brian], [Guy Royse][guy]      | Extending Redis with Rust                               |
-| Wednesday, July 13 | 6:00 PM UTC | [Steve Lorello][steve]                           | Real-Time Stock Analytics with Redis Stack and .NET     |
-|  Friday, July 15   | 6:00 PM UTC | [Brian Sam-Bodden][brian], [Guy Royse][guy]      | Extending Redis with Rust                               |
-|  Friday, July 22   | 6:00 PM UTC | [Brian Sam-Bodden][brian], [Guy Royse][guy]      | Extending Redis with Rust                               |
+| Date               | Time         | Streamers                                        | Show                                                   |
+|:------------------:|:------------:|:-------------------------------------------------|:-------------------------------------------------------|
+| Friday, June 3     | 6:00 PM UTC  | [Guy Royse][guy]                                 | Tracking Aircraft with Redis + Software-Defined Radio  |
+| Friday, June 10    | 3:00 PM UTC  | [Justin Castilla][justin], [Suze Shardlow][suze] | Working with Redis Data Structures                     |
+| Friday, June 10    | 6:00 PM UTC  | [Guy Royse][guy]                                 | Working on Redis OM for Node.js                        |
+| Wednesday, June 15 | 4:00 PM UTC  | [Simon Prickett][simon]                          | Up and Running with the RU102PY Redis University Course|
+| Wednesday, June 15 | 5:00 PM UTC  | [Simon Prickett][simon]                          | Up and Running with the RU102JS Redis University Course|
+| Thursday, June 16  | 3:00 PM UTC  | [Simon Prickett][simon], [Suze Shardlow][suze]   | Counting Things At Scale with Redis                    |
+| Wednesday, June 29 | 6:00 PM UTC  | [Steve Lorello][steve]                           | Real-Time Stock Analytics with Redis Stack and .NET    |
+| Thursday, June 30  | 6:00 PM UTC  | [Savannah Norem][savannah], [Guy Royse][guy]     | Comparing Sets, Bloom Filters, and Cuckoo Filters      |
+| Wednesday, July 6  | 6:00 PM UTC  | [Steve Lorello][steve]                           | Real-Time Stock Analytics with Redis Stack and .NET    |
+| Friday, July 8     | 6:00 PM UTC  | [Brian Sam-Bodden][brian], [Guy Royse][guy]      | Extending Redis with Rust                              |
+| Wednesday, July 13 | 6:00 PM UTC  | [Steve Lorello][steve]                           | Real-Time Stock Analytics with Redis Stack and .NET    |
+| Friday, July 15    | 6:00 PM UTC  | [Brian Sam-Bodden][brian], [Guy Royse][guy]      | Extending Redis with Rust                              |
+| Friday, July 22    | 6:00 PM UTC  | [Brian Sam-Bodden][brian], [Guy Royse][guy]      | Extending Redis with Rust                              |
+
 
 ### Recurring Streams
 
@@ -43,6 +43,7 @@ Sometimes we're on the road speaking at in-person events or enjoying a well dese
 [brian]: https://twitter.com/bsbodden
 [guy]: https://twitter.com/guyroyse
 [justin]: https://twitter.com/JustCastilla
+[savannah]: https://twitter.com/sav_norem
 [simon]: https://twitter.com/simon_prickett
 [steve]: https://twitter.com/slorello
 [suze]: https://twitter.com/SuzeShardlow
diff --git a/docs/howtos/herokujava/index-herokujava.mdx b/docs/howtos/herokujava/index-herokujava.mdx
@@ -92,7 +92,9 @@ Open https://hidden-woodland-03996.herokuapp.com/ to see your application
 
 ![heroku](heroku_ratelimiter.png)
 
-### Next Step
+
+
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/howtos/herokunodejs/index-herokunodejs.mdx b/docs/howtos/herokunodejs/index-herokunodejs.mdx
@@ -90,7 +90,7 @@ Open https://rocky-lowlands-06306.herokuapp.com/ to see your application
 
 ![heroku](heroku_ratelimiter.png)
 
-### Next Step
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/howtos/herokupython/index-herokupython.mdx b/docs/howtos/herokupython/index-herokupython.mdx
@@ -101,7 +101,9 @@ Open https://fast-reef-76278.herokuapp.com/ to see your application
 
 ![heroku](heroku_ratelimiter.png)
 
-### Next Step
+
+
+### Next Steps
 
 - [Connecting to the database using RedisInsight](/explore/redisinsight/)
 - [How to list & search Movies database using Redisearch](/howtos/moviesdatabase/getting-started/)
diff --git a/docs/howtos/redisbloom/index-redisbloom.mdx b/docs/howtos/redisbloom/index-redisbloom.mdx
@@ -138,7 +138,8 @@ Use BF.MEXISTS to determine if one or more items may exist in the filter or not:
 
 In the above example, the first command shows the result as “1” for both the visitors’ IP addresses, indicating that these items do exist. The second command displays "0" for one of the visitor’s IP addresses, indicating that the item certainly does not exist.
 
-### Next Step
+
+### Next Steps
 
 - Learn more about RedisBloom in the [Quick Start](https://oss.redis.com/redisbloom/Quick_Start/) tutorial.
 - [How to build a Fraud Detection System using RedisGears and RedisBloom](https://developer.redis.com/howtos/frauddetection/)
diff --git a/docs/howtos/redisearch/index-redisearch.mdx b/docs/howtos/redisearch/index-redisearch.mdx
@@ -154,7 +154,8 @@ You can also search “action” movies that contain “star” in the index (in
 
 The FT.SEARCH command is the base command to search your database, it has many options and is associated with a powerful and rich query syntax that you can find in the documentation. (Note: You can also use the index to do data aggregation using the FT.AGGREGATE command.)
 
-### Next Step
+
+### Next Steps
 
 - Learn more about RediSearch in the [Getting Started with RediSearch 2.0](https://github.com/RediSearch/redisearch-getting-started/) tutorial on GitHub.
 - [How to list and search Movie database using Redisearch](/howtos/moviesdatabase/getting-started)
diff --git a/docs/howtos/redisgraph/getting-started/index-gettingstarted.mdx b/docs/howtos/redisgraph/getting-started/index-gettingstarted.mdx
@@ -229,7 +229,8 @@ Click on the Execute button, and double click on the actors to follow the relati
     allowfullscreen></iframe>
 </div>
 
-### Next Step
+
+### Next Steps
 
 - [Building Movies database app using RedisGraph and NodeJS](/howtos/redisgraphmovies/)
 - Learn more about RedisGraph in the [Quickstart](https://oss.redis.com/redisgraph/3) tutorial.
diff --git a/docs/howtos/redistimeseries/getting-started/index-redistimeseries.mdx b/docs/howtos/redistimeseries/getting-started/index-redistimeseries.mdx
@@ -200,7 +200,7 @@ You can use various aggregation types such as avg, sum, min, max, range, count,
    2) "2.2"
 ```
 
-### Next Step
+### Next Steps
 
 - Learn more about RedisTimeSeries in the [Quickstart](https://oss.redis.com/redistimeseries/) tutorial.
 - [Build Your Financial Application on RedisTimeSeries](https://redis.com/blog/build-your-financial-application-on-redistimeseries/)
diff --git a/docs/modules/redisbloom/index-redisbloom.mdx b/docs/modules/redisbloom/index-redisbloom.mdx
@@ -100,6 +100,7 @@ Use BF.MEXISTS to determine if one or more items may exist in the filter or not:
 
 In the above example, the first command shows the result as “1” for both the visitors’ IP addresses, indicating that these items do exist. The second command displays "0" for one of the visitor’s IP addresses, indicating that the item certainly does not exist.
 
-### Next Step
+
+### Next Steps
 
 - Learn more about RedisBloom in the [Quick Start](https://oss.redis.com/redisbloom/Quick_Start/) tutorial.
diff --git a/docs/modules/redisearch/index-redisearch.mdx b/docs/modules/redisearch/index-redisearch.mdx
@@ -119,7 +119,8 @@ You can also search “action” movies that contain “star” in the index (in
 
 The FT.SEARCH command is the base command to search your database, it has many options and is associated with a powerful and rich query syntax that you can find in the documentation. (Note: You can also use the index to do data aggregation using the FT.AGGREGATE command.)
 
-### Next Step
+
+### Next Steps
 
 - Learn more about RediSearch in the [Getting Started with RediSearch 2.0](https://github.com/RediSearch/redisearch-getting-started/) tutorial on GitHub.
 - [How to list and search Movie database using Redisearch](/howtos/moviesdatabase/getting-started)
diff --git a/docs/modules/redisgraph/index-redisgraph.mdx b/docs/modules/redisgraph/index-redisgraph.mdx
@@ -166,6 +166,7 @@ Click on the Execute button, and double click on the actors to follow the relati
 
 ![RedisGraph](redisgraph4.png)
 
-### Next Step
+
+### Next Steps
 
 - Learn more about RedisGraph in the [Quickstart](https://oss.redis.com/redisgraph/) tutorial.
diff --git a/docs/modules/redisjson/index-redisjson.mdx b/docs/modules/redisjson/index-redisjson.mdx
@@ -142,7 +142,7 @@ A JSON object can also have another object. Here is a simple example of a JSON o
 "{\"firstName\":\"Alpha\",\"lastName\":\"K\",\"age\":23,\"address\":{\"streetAddress\":\"110 Fulbourn Road Cambridge\",\"city\":\"San Francisco\",\"state\":\"California\",\"postalCode\":\"94016\"}}"
 ```
 
-### Next Step
+### Next Steps
 
 - Learn more about [RedisJSON](https://oss.redis.com/redisjson/) in the Quickstart tutorial.
 - [How to build shopping cart app using NodeJS and RedisJSON](/howtos/shoppingcart)
diff --git a/docs/modules/redistimeseries/index-redistimeseries.mdx b/docs/modules/redistimeseries/index-redistimeseries.mdx
@@ -139,6 +139,6 @@ You can use various aggregation types such as avg, sum, min, max, range, count,
    2) "2.2"
 ```
 
-### Next Step
+### Next Steps
 
 - Learn more about RedisTimeSeries in the [Quickstart](https://oss.redis.com/redistimeseries/) tutorial.
