source@mandoc.bsd.lv
 help / color / mirror / Atom feed
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Remove clauses 3 and 4 from Christos Zoulas' BSD license.
Date: Wed, 20 May 2015 18:43:34 -0500 (EST)	[thread overview]
Message-ID: <14195453911440675825.enqueue@fantadrom.bsd.lv> (raw)

Log Message:
-----------
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.

Modified Files:
--------------
    mdocml:
        LICENSE
        compat_stringlist.c
        compat_stringlist.h

Revision Data
-------------
Index: LICENSE
===================================================================
RCS file: /home/cvs/mdocml/mdocml/LICENSE,v
retrieving revision 1.8
retrieving revision 1.9
diff -LLICENSE -LLICENSE -u -p -r1.8 -r1.9
--- LICENSE
+++ LICENSE
@@ -37,9 +37,8 @@ OR IN CONNECTION WITH THE USE OR PERFORM
 
 
 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>
Index: compat_stringlist.h
===================================================================
RCS file: /home/cvs/mdocml/mdocml/compat_stringlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lcompat_stringlist.h -Lcompat_stringlist.h -u -p -r1.2 -r1.3
--- compat_stringlist.h
+++ 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
Index: compat_stringlist.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/compat_stringlist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lcompat_stringlist.c -Lcompat_stringlist.c -u -p -r1.3 -r1.4
--- compat_stringlist.c
+++ 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
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

                 reply	other threads:[~2015-05-20 23:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=14195453911440675825.enqueue@fantadrom.bsd.lv \
    --to=schwarze@mdocml.bsd.lv \
    --cc=source@mdocml.bsd.lv \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).