Merge pull request #2693 from redis/LRC-271

Changes in the context of the Redis license change

Author: dmaier-redislabs

README.md

@@ -1,5 +1,7 @@
 # Redis documentation
 
+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://www.redis.com/legal/trademark-policy)."
+
 ## Clients
 
 All clients are listed under language specific sub-folders of [clients](./clients)

community/_index.md

@@ -3,7 +3,7 @@ title: Community
 linkTitle: Community
 ---
 
-Since 2009, the Redis open source project has inspired an enthusiastic and active community of users and contributors. We continue to be committed to fostering an open, welcoming, diverse, inclusive, and healthy community.
+Since 2009, the Redis project has inspired an enthusiastic and active community of users and contributors. We continue to be committed to fostering an open, welcoming, diverse, inclusive, and healthy community.
 
 ## Code of Conduct
 
@@ -29,29 +29,15 @@ For occasional updates on the new Redis releases, you can either [subscribe to t
 
 To keep up with the latest from Redis Inc., including news on Redis Cloud and Redis Stack, consider [following the Redis Twitter feed](https://twitter.com/redisinc).
 
-## Project governance
-
-Redis has adopted a [light governance model](/docs/about/governance) led by individuals who have made significant contributions to Redis and demonstrated a long-term commitment to the project.
-
-Learn more about the project's governance and the Redis Core Team on the [Redis governance page](/docs/about/governance).
-
-## Conferences and meetups
-
-Redis regularly sponsors conferences and meetups. Recent conferences include:
-
-* [Redis Days 2022](https://redis.com/redisdays/)
-
-* [RedisConf 2021](https://redis.com/redisconf/)
-
-* [RedisConf 2020](https://www.youtube.com/c/Redisinc/playlists?view=50&sort=dd&shelf_id=4)
-
 ## Contributing to Redis
 
-There are many ways to contribute to Redis, starting with documentation all the way to changes to the open source Redis server. Here are a few ways you can get involved.
+> Future releases of Redis will be dual-licensed under a source-available license. You can choose between the [Redis Source Available License 2.0 (RSALv2)](/docs/about/license) or the Server Side Public License v1 (SSPLv1).
+
+There are many ways to contribute to Redis, starting with documentation all the way to changes to the Redis server. Here are a few ways you can get involved.
 
 ### Contributing to docs
 
-The [Redis docs](https://github.com/redis/redis-doc) are open source, and we'd love to incorporate your contributions. For small changes and typos, we recommend creating a pull request against [redis-doc repo](https://github.com/redis/redis-doc/pulls).
+We welcome contributions to the [Redis docs](https://github.com/redis/redis-doc). For small changes and typos, we recommend creating a pull request against [redis-doc repo](https://github.com/redis/redis-doc/pulls).
 
 ### Reporting bugs
 
@@ -61,8 +47,4 @@ For larger doc changes, we ask that you first create an issue describing your pr
 
 ### Client libraries
 
-The Redis client libraries are nearly always open source and accepting of contributions. Consult the contribution guidelines for the library you're interested in.
-
-### Hacktoberfest
-
-Redis is participating in [Hacktoberfest 2022](/community/hacktoberfest/).
+The Redis client libraries are nearly always open source and accepting of contributions. Consult the contribution guidelines for the library you're interested in.

docs/about/_index.md

@@ -2,14 +2,17 @@
 title: Introduction to Redis
 linkTitle: "About"
 weight: 10
-description: Learn about the Redis open source project
+description: Learn about Redis
 aliases:
   - /topics/introduction
   - /buzz
 ---
 
-Redis is an open source (BSD licensed), in-memory __data structure store__ used as a database, cache, message broker, and streaming engine. Redis provides [data structures](/docs/data-types/) such as
-[strings](/docs/data-types/strings/), [hashes](/docs/data-types/hashes/), [lists](/docs/data-types/lists/), [sets](/docs/data-types/sets/), [sorted sets](/docs/data-types/sorted-sets/) with range queries, [bitmaps](/docs/data-types/bitmaps/), [hyperloglogs](/docs/data-types/hyperloglogs/), [geospatial indexes](/docs/data-types/geospatial/), and [streams](/docs/data-types/streams/). Redis has built-in [replication](/topics/replication), [Lua scripting](/commands/eval), [LRU eviction](/docs/reference/eviction/), [transactions](/topics/transactions), and different levels of [on-disk persistence](/topics/persistence), and provides high availability via [Redis Sentinel](/topics/sentinel) and automatic partitioning with [Redis Cluster](/topics/cluster-tutorial).
+Redis is an open source (BSD licensed), in-memory __data structure store__ used as a database, cache, message broker, and streaming engine. 
+
+> Future releases of Redis will be dual-licensed under a source-available license. You can choose between the [Redis Source Available License 2.0 (RSALv2)](/docs/about/license) or the Server Side Public License v1 (SSPLv1). 
+
+Redis provides [data structures](/docs/data-types/) such as [strings](/docs/data-types/strings/), [hashes](/docs/data-types/hashes/), [lists](/docs/data-types/lists/), [sets](/docs/data-types/sets/), [sorted sets](/docs/data-types/sorted-sets/) with range queries, [bitmaps](/docs/data-types/bitmaps/), [hyperloglogs](/docs/data-types/hyperloglogs/), [geospatial indexes](/docs/data-types/geospatial/), and [streams](/docs/data-types/streams/). Redis has built-in [replication](/topics/replication), [Lua scripting](/commands/eval), [LRU eviction](/docs/reference/eviction/), [transactions](/topics/transactions), and different levels of [on-disk persistence](/topics/persistence), and provides high availability via [Redis Sentinel](/topics/sentinel) and automatic partitioning with [Redis Cluster](/topics/cluster-tutorial).
 
 You can run __atomic operations__
 on these types, like [appending to a string](/commands/append);
@@ -40,4 +43,4 @@ Redis is written in **ANSI C** and works on most POSIX systems like Linux,
 \*BSD, and Mac OS X, without external dependencies. Linux and OS X are the two operating systems where Redis is developed and tested the most, and we **recommend using Linux for deployment**. Redis may work in Solaris-derived systems like SmartOS, but support is *best effort*.
 There is no official support for Windows builds.
 
-<hr>
+<hr>