From 1ce9ab6c9af179079722e0fb5d6722b38d220cd8 Mon Sep 17 00:00:00 2001 From: brueffer Date: Mon, 24 Feb 2014 08:21:49 +0000 Subject: MFC: r262136 Remove the 3rd clause ("advertising clause") of the BSD license as permitted by the University of Berkeley on July 22, 1999. Reviewed by: imp --- libexec/tftpd/tftpd.8 | 6 +----- libexec/tftpd/tftpd.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'libexec/tftpd') diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index c06cc61..0071264 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -9,11 +9,7 @@ .\" 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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 87f80f0..571fa59 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -10,11 +10,7 @@ * 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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * -- cgit v1.1