summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNick Terrell <terrelln@fb.com>2016-11-11 01:27:56 (GMT)
committerNick Terrell <terrelln@fb.com>2016-11-11 01:27:56 (GMT)
commit5b37837e6e872bb57c8c7d07d6d4ff94176b8c59 (patch)
tree39016706f705efb7639d27d9e80f07d7b8a13403 /contrib
parent1f246a98992fa7035823bedf6a0b7612fc290592 (diff)
downloadlz4-5b37837e6e872bb57c8c7d07d6d4ff94176b8c59.zip
lz4-5b37837e6e872bb57c8c7d07d6d4ff94176b8c59.tar.gz
lz4-5b37837e6e872bb57c8c7d07d6d4ff94176b8c59.tar.bz2
Fix license and remove references to zstd
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gen_manual/Makefile34
-rw-r--r--contrib/gen_manual/README.md6
-rw-r--r--contrib/gen_manual/gen_manual.cpp41
3 files changed, 64 insertions, 17 deletions
diff --git a/contrib/gen_manual/Makefile b/contrib/gen_manual/Makefile
index 49616ee..adbcca2 100644
--- a/contrib/gen_manual/Makefile
+++ b/contrib/gen_manual/Makefile
@@ -1,11 +1,33 @@
-# ##########################################################################
-# Copyright (c) 2016-present, Przemyslaw Skibinski
+# ################################################################
+# Copyright (C) Przemyslaw Skibinski 2016-present
# All rights reserved.
#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-# ##########################################################################
+# BSD license
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice, this
+# list of conditions and the following disclaimer in the documentation and/or
+# other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# You can contact the author at :
+# - LZ4 source repository : https://github.com/Cyan4973/lz4
+# - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c
+# ################################################################
CFLAGS ?= -O3
diff --git a/contrib/gen_manual/README.md b/contrib/gen_manual/README.md
index 3d146d4..853e623 100644
--- a/contrib/gen_manual/README.md
+++ b/contrib/gen_manual/README.md
@@ -1,5 +1,5 @@
-gen_manual - a program for automatic generation of zstd manual
-============================================================
+gen_manual - a program for automatic generation of lz4 manual
+=============================================================
#### Introduction
@@ -27,5 +27,5 @@ gen_manual [lz4_version] [input_file] [output_html]
To compile program and generate lz4 manual we have used:
```
make
-./gen_manual.exe 1.7.3 ../../lib/lz4.h zstd_manual.html
+./gen_manual.exe 1.7.3 ../../lib/lz4.h lz4_manual.html
```
diff --git a/contrib/gen_manual/gen_manual.cpp b/contrib/gen_manual/gen_manual.cpp
index caf03fc..2df081d 100644
--- a/contrib/gen_manual/gen_manual.cpp
+++ b/contrib/gen_manual/gen_manual.cpp
@@ -1,11 +1,36 @@
/*
- * Copyright (c) 2016-present, Przemyslaw Skibinski
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
+Copyright (c) 2016-present, Przemyslaw Skibinski
+All rights reserved.
+
+BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+You can contact the author at :
+- LZ4 homepage : http://www.lz4.org
+- LZ4 source repository : https://github.com/lz4/lz4
+*/
#include <iostream>
#include <fstream>
@@ -213,4 +238,4 @@ int main(int argc, char *argv[]) {
ostream << "</html>" << endl << "</body>" << endl;
return 0;
-} \ No newline at end of file
+}