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 | 8745f4e33d4450fb9bd6fe1f48e7ac4b045785a5 (patch) | |
| tree | fe1715619ac9e30318a229c24be2abc41f9f8a9a | |
| parent | e6a1cb605f731f0f6868bd9e5f991a0766db0ccc (diff) | |
| download | mandoc-8745f4e33d4450fb9bd6fe1f48e7ac4b045785a5.tar.gz mandoc-8745f4e33d4450fb9bd6fe1f48e7ac4b045785a5.tar.zst mandoc-8745f4e33d4450fb9bd6fe1f48e7ac4b045785a5.zip | |
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 | 7 | ||||
| -rw-r--r-- | compat_stringlist.c | 4 | ||||
| -rw-r--r-- | compat_stringlist.h | 7 |
3 files changed, 5 insertions, 13 deletions
@@ -1,4 +1,4 @@ -$Id: LICENSE,v 1.8 2015/05/20 22:22:59 schwarze Exp $ +$Id: LICENSE,v 1.9 2015/05/20 23:43:03 schwarze Exp $ With the exceptions noted below, all code and documentation contained in the mdocml toolkit is protected by the Copyright @@ -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 05b62d38..570fcdd1 100644 --- a/compat_stringlist.c +++ b/compat_stringlist.c @@ -1,4 +1,4 @@ -/* $Id: compat_stringlist.c,v 1.3 2015/05/20 23:00:43 schwarze Exp $ */ +/* $Id: compat_stringlist.c,v 1.4 2015/05/20 23:43:03 schwarze Exp $ */ /* * Copyright (c) 1994 Christos Zoulas <christos@netbsd.org> * All rights reserved. @@ -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 5751fb22..424f1a23 100644 --- a/compat_stringlist.h +++ b/compat_stringlist.h @@ -1,4 +1,4 @@ -/* $Id: compat_stringlist.h,v 1.2 2015/05/20 22:22:59 schwarze Exp $ */ +/* $Id: compat_stringlist.h,v 1.3 2015/05/20 23:43:03 schwarze Exp $ */ /* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */ /* @@ -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 |