diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-06-02 23:36:56 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-06-02 23:36:56 +0000 |
| commit | 149854f5f21442a68ead0095592956a96962dcf2 (patch) | |
| tree | f43fff130e674efd8a82cf223d1143f11fd83184 /usr.sbin/lpr/lpq | |
| parent | 5269326c4f96790590406db72b6ac8127e33f825 (diff) | |
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'usr.sbin/lpr/lpq')
| -rw-r--r-- | usr.sbin/lpr/lpq/lpq.1 | 8 | ||||
| -rw-r--r-- | usr.sbin/lpr/lpq/lpq.c | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1 index 5ad81b9df7d..87e7cfd45ae 100644 --- a/usr.sbin/lpr/lpq/lpq.1 +++ b/usr.sbin/lpr/lpq/lpq.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: lpq.1,v 1.7 2002/05/20 23:13:50 millert Exp $ +.\" $OpenBSD: lpq.1,v 1.8 2003/06/02 23:36:53 millert Exp $ .\" $NetBSD: lpq.1,v 1.11 2002/01/19 03:23:11 wiz Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 @@ -12,11 +12,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/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c index 1ca80fdd1cb..735d1df7a4a 100644 --- a/usr.sbin/lpr/lpq/lpq.c +++ b/usr.sbin/lpr/lpq/lpq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpq.c,v 1.13 2002/06/08 01:53:43 millert Exp $ */ +/* $OpenBSD: lpq.c,v 1.14 2003/06/02 23:36:53 millert Exp $ */ /* $NetBSD: lpq.c,v 1.9 1999/12/07 14:54:47 mrg Exp $ */ /* @@ -14,11 +14,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. * @@ -45,7 +41,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95"; #else -static const char rcsid[] = "$OpenBSD: lpq.c,v 1.13 2002/06/08 01:53:43 millert Exp $"; +static const char rcsid[] = "$OpenBSD: lpq.c,v 1.14 2003/06/02 23:36:53 millert Exp $"; #endif #endif /* not lint */ |