From 149854f5f21442a68ead0095592956a96962dcf2 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 2 Jun 2003 23:36:56 +0000 Subject: Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo. --- usr.sbin/amd/config/os-pyrOSx.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'usr.sbin/amd/config/os-pyrOSx.h') diff --git a/usr.sbin/amd/config/os-pyrOSx.h b/usr.sbin/amd/config/os-pyrOSx.h index 9c601392ccc..aa2ed6d77be 100644 --- a/usr.sbin/amd/config/os-pyrOSx.h +++ b/usr.sbin/amd/config/os-pyrOSx.h @@ -15,11 +15,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. * @@ -36,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)os-pyrOSx.h 8.1 (Berkeley) 6/6/93 - * $Id: os-pyrOSx.h,v 1.1 1995/10/18 08:47:15 deraadt Exp $ + * $Id: os-pyrOSx.h,v 1.2 2003/06/02 23:36:52 millert Exp $ * * Pyramid OSx definitions for Amd (automounter) * from Stefan Petri -- cgit v1.2.3