From f8ae3b0e200b5c77358a87f7ce31a8f2c1035a41 Mon Sep 17 00:00:00 2001 From: Nermina Miller Date: Tue, 15 Nov 2022 13:02:26 -0500 Subject: [PATCH 1/5] License edits --- docs/stack/_index.md | 6 +++--- docs/stack/license/_index.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/stack/_index.md b/docs/stack/_index.md index 6f176f06..26b9979a 100644 --- a/docs/stack/_index.md +++ b/docs/stack/_index.md @@ -86,13 +86,13 @@ RedisInsight allows you to: Redis Stack is made up of several components, licensed as follows: -* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom, is licensed under the [Redis Source Available License](https://redis.com/legal/rsal-agreement/) (RSAL). +* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom, is dually licensed under the Redis Source Available License ([RSALv2]((/docs/stack/license/)) and [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL). A breakdown of licensing by Stack component versions is shown in the table below. For more information about Redis licensing, see [Licenses](https://redis.com/legal/licenses/). -* RedisInsight is licensed under the Server Side Public License (SSPL). +* RedisInsight is licensed under the SSPL. ### Versions and licenses -Starting November 15, 2022, our default binary distributions of Redis Stack and our Redis modules have been licensed under [RSALv2](/docs/stack/license/), and when using the source code, users can apply either RSALv2 or SSPLv1. More details are in the table below: +Starting November 15, 2022, our default binary distributions of Redis Stack and our Redis modules have been dually licensed under RSALv2 and SSPL. When using the source code, you can apply either RSALv2 or SSPLv1. diff --git a/docs/stack/license/_index.md b/docs/stack/license/_index.md index 9fdd8e43..682be560 100644 --- a/docs/stack/license/_index.md +++ b/docs/stack/license/_index.md @@ -11,7 +11,7 @@ weight: 100 * RedisInsight is licensed under the Server Side Public License (SSPL). -* Redis Stack Server combines open source Redis with RediSearch, RedisJSON RedisGraph, RedisTimeSeries and RedisBloom is licensed under the Redis Source Available License, as described below. For information about licensing by versions, see [Versions and licenses](/docs/stack/#versions-and-licenses). +* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON RedisGraph, RedisTimeSeries and RedisBloom, is dually licensed under the Redis Source Available License (RSALv2), as described below, and the [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL). For information about licensing by versions, see [Versions and licenses](/docs/stack/#versions-and-licenses). ## REDIS SOURCE AVAILABLE LICENSE (RSAL) 2.0 From 922ededc3e214beefbffe79f056e93643ddbdf73 Mon Sep 17 00:00:00 2001 From: Nermina Miller Date: Tue, 15 Nov 2022 13:09:35 -0500 Subject: [PATCH 2/5] Updates wordlist --- dictionary.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dictionary.txt b/dictionary.txt index d948b378..d4c00994 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -42,6 +42,7 @@ dataset DevOps Dotenv Downey +dually EntityStream GCP geo-distributed From 4dcd9823c0364cbe79339e4eb34cbe32d4a2631c Mon Sep 17 00:00:00 2001 From: Nermina Miller <102551568+nermiller@users.noreply.github.com> Date: Tue, 15 Nov 2022 15:08:50 -0500 Subject: [PATCH 3/5] Update docs/stack/_index.md Co-authored-by: Kyle Banker --- docs/stack/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/stack/_index.md b/docs/stack/_index.md index 26b9979a..ef698dee 100644 --- a/docs/stack/_index.md +++ b/docs/stack/_index.md @@ -86,7 +86,7 @@ RedisInsight allows you to: Redis Stack is made up of several components, licensed as follows: -* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom, is dually licensed under the Redis Source Available License ([RSALv2]((/docs/stack/license/)) and [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL). A breakdown of licensing by Stack component versions is shown in the table below. For more information about Redis licensing, see [Licenses](https://redis.com/legal/licenses/). +* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom, is dual-licensed under the Redis Source Available License ([RSALv2]((/docs/stack/license/)) and the [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL). A breakdown of licensing by Stack component versions is shown in the table below. For more information about Redis licensing, see [Licenses](https://redis.com/legal/licenses/). * RedisInsight is licensed under the SSPL. From d98c22db8c8bab9afc7d92db8668debf999dc14f Mon Sep 17 00:00:00 2001 From: Nermina Miller <102551568+nermiller@users.noreply.github.com> Date: Tue, 15 Nov 2022 15:08:58 -0500 Subject: [PATCH 4/5] Update docs/stack/_index.md Co-authored-by: Kyle Banker --- docs/stack/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/stack/_index.md b/docs/stack/_index.md index ef698dee..c3fd12db 100644 --- a/docs/stack/_index.md +++ b/docs/stack/_index.md @@ -92,7 +92,7 @@ Redis Stack is made up of several components, licensed as follows: ### Versions and licenses -Starting November 15, 2022, our default binary distributions of Redis Stack and our Redis modules have been dually licensed under RSALv2 and SSPL. When using the source code, you can apply either RSALv2 or SSPLv1. +Starting November 15, 2022, our default binary distributions of Redis Stack and our Redis modules have been dual-licensed under RSALv2 and SSPL. When using the source code, you can apply either RSALv2 or SSPLv1.
From a7550e6f510e44c00a9e5fa04e75b81a760313ae Mon Sep 17 00:00:00 2001 From: Nermina Miller <102551568+nermiller@users.noreply.github.com> Date: Tue, 15 Nov 2022 15:09:08 -0500 Subject: [PATCH 5/5] Update docs/stack/license/_index.md Co-authored-by: Kyle Banker --- docs/stack/license/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/stack/license/_index.md b/docs/stack/license/_index.md index 682be560..58f4c64c 100644 --- a/docs/stack/license/_index.md +++ b/docs/stack/license/_index.md @@ -11,7 +11,7 @@ weight: 100 * RedisInsight is licensed under the Server Side Public License (SSPL). -* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON RedisGraph, RedisTimeSeries and RedisBloom, is dually licensed under the Redis Source Available License (RSALv2), as described below, and the [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL). For information about licensing by versions, see [Versions and licenses](/docs/stack/#versions-and-licenses). +* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom, is dual-licensed under the Redis Source Available License (RSALv2), as described below, and the [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL). For information about licensing per version, see [Versions and licenses](/docs/stack/#versions-and-licenses). ## REDIS SOURCE AVAILABLE LICENSE (RSAL) 2.0