diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2015-05-20 23:43:03 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-05-20 23:43:03 +0000 |
| commit | abf8fe063588a050d18ae56bcea531dfd7ddfad4 (patch) | |
| tree | a9435f70ca3275217b30584c9b0d733e9d4130ab | |
| parent | 2518eebc8b79441328b512dd90d554be1fb93f8d (diff) | |
| download | mandoc-abf8fe063588a050d18ae56bcea531dfd7ddfad4.tar.gz | |
Remove clauses 3 and 4 from Christos Zoulas' BSD license.
This is safe because Christos did that himself in NetBSD in 2008.
No code change.
| -rw-r--r-- | LICENSE | 5 | ||||
| -rw-r--r-- | compat_stringlist.c | 2 | ||||
| -rw-r--r-- | compat_stringlist.h | 5 |
3 files changed, 2 insertions, 10 deletions
@@ -37,9 +37,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. The following files included from outside sources are protected by -other people's Copyright and are distributed under various 2-clause, -3-clause, and 4-clause BSD licenses; see these individual files for -details. +other people's Copyright and are distributed under various 2-clause +and 3-clause BSD licenses; see these individual files for details. soelim.c, soelim.1: Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org> diff --git a/compat_stringlist.c b/compat_stringlist.c index 42923baf..b265b602 100644 --- a/compat_stringlist.c +++ b/compat_stringlist.c @@ -11,8 +11,6 @@ * 2. 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. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/compat_stringlist.h b/compat_stringlist.h index 541a83db..301373c2 100644 --- a/compat_stringlist.h +++ b/compat_stringlist.h @@ -13,11 +13,6 @@ * 2. 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |