Skip to content

Commit 95b7425

Browse files
Issue 302 - finish topics that say "under review" - update license file (#333)
Replaced current licensing text with hyperlink to https://github.com/valkey-io/valkey?tab=License-1-ov-file#readme, as per Madelyn. Still need to edit the config file that contains the **publish_hold** section which includes license.md so the text is not hidden. This PR does not address any of the other files that say "under review" --------- Signed-off-by: milliehartnt123 <[email protected]>
1 parent f4665fb commit 95b7425

File tree

1 file changed

+1
-92
lines changed

1 file changed

+1
-92
lines changed

topics/license.md

Lines changed: 1 addition & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -5,95 +5,4 @@ description: >
55
---
66

77

8-
* Valkey is **open source software** released under the terms of the **three clause BSD license**. Most of the Valkey source code was written by Salvatore Sanfilippo and Pieter Noordhuis. A list of other contributors can be found in the git history.
9-
10-
* Valkey is based on the formerly open source Redis, as it was before the
11-
license of Redis was changed to one that is not open source.
12-
Read more about this in the [History of Valkey](history.md).
13-
Redis is a trademark of Redis Ltd. Whenever we use the name Redis in the
14-
Valkey documentation, we're trying our best to use it in accordance with the
15-
[Redis Trademark Guidelines](https://redis.com/legal/trademark-guidelines/).
16-
17-
## Licences:
18-
19-
### Three clause BSD license
20-
21-
Every file in the Valkey distribution, with the exception of third party files
22-
specified in the list below, is provided under the following license:
23-
24-
```
25-
Redistribution and use in source and binary forms, with or without
26-
modification, are permitted provided that the following conditions are met:
27-
28-
* Redistributions of source code must retain the above copyright notice,
29-
this list of conditions and the following disclaimer.
30-
31-
* Redistributions in binary form must reproduce the above copyright
32-
notice, this list of conditions and the following disclaimer in the
33-
documentation and/or other materials provided with the distribution.
34-
35-
* Neither the name of the copyright holder nor the names of its contributors
36-
may be used to endorse or promote products derived from this software
37-
without specific prior written permission.
38-
39-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
40-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
42-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
43-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
44-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
45-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
46-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
47-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
48-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
49-
POSSIBILITY OF SUCH DAMAGE.
50-
```
51-
52-
Files in the Valkey distribution that were originally created for Redis when
53-
Redis was still under the three-clause BSD license contain the following license
54-
(which differs from the above text only in one occurrence of "Redis" in the 3rd
55-
clause):
56-
57-
```
58-
Redistribution and use in source and binary forms, with or without
59-
modification, are permitted provided that the following conditions are met:
60-
61-
* Redistributions of source code must retain the above copyright notice,
62-
this list of conditions and the following disclaimer.
63-
64-
* Redistributions in binary form must reproduce the above copyright
65-
notice, this list of conditions and the following disclaimer in the
66-
documentation and/or other materials provided with the distribution.
67-
68-
* Neither the name of Redis nor the names of its contributors may be used
69-
to endorse or promote products derived from this software without
70-
specific prior written permission.
71-
72-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
73-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
74-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
75-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
76-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
77-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
78-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
79-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
80-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
81-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
82-
POSSIBILITY OF SUCH DAMAGE.
83-
```
84-
85-
### Third-party files and licenses
86-
87-
Valkey uses source code from third parties. All this code contains a BSD or BSD-compatible license. The following is a list of third-party files and information about their copyright.
88-
89-
* Valkey uses the [LHF compression library](http://oldhome.schmorp.de/marc/liblzf.html). LibLZF is copyright Marc Alexander Lehmann and is released under the terms of the **two-clause BSD license**.
90-
91-
* Valkey uses the `sha1.c` file that is copyright by Steve Reid and released under the **public domain**. This file is extremely popular and used among open source and proprietary code.
92-
93-
* When compiled on Linux, Valkey uses the [Jemalloc allocator](https://github.com/jemalloc/jemalloc), which is copyrighted by Jason Evans, Mozilla Foundation, and Facebook, Inc and released under the **two-clause BSD license**.
94-
95-
* Inside Jemalloc, the file `pprof` is copyrighted by Google Inc. and released under the **three-clause BSD license**.
96-
97-
* Inside Jemalloc the files `inttypes.h`, `stdbool.h`, `stdint.h`, `strings.h` under the `msvc_compat` directory are copyright Alexander Chemeris and released under the **three-clause BSD license**.
98-
99-
* The libraries **libvalkey** and **linenoise** also included inside the Valkey distribution are released under the terms respectively of the **three-clause BSD license** and **two-clause BSD license**.
8+
Please refer to [license](https://github.com/valkey-io/valkey?tab=License-1-ov-file#readme) for Valkey licensing information.

0 commit comments

Comments
 (0)