diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-06-02 20:06:18 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-06-02 20:06:18 +0000 |
commit | 38e0625330b89005c91c2a54a07e6c017e2e95a9 (patch) | |
tree | 1e01beed6f7cfda9d9f59a5b36931be296cc0bee /sbin/ping | |
parent | 3718f103a2f90b47b044fba54ebdbe1d7d983afb (diff) |
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'sbin/ping')
-rw-r--r-- | sbin/ping/ping.8 | 8 | ||||
-rw-r--r-- | sbin/ping/ping.c | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8 index 5bc7d82d5da..b205526c1e4 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ping.8,v 1.26 2003/02/11 07:26:20 jmc Exp $ +.\" $OpenBSD: ping.8,v 1.27 2003/06/02 20:06:16 millert Exp $ .\" $NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $ .\" .\" Copyright (c) 1985, 1991, 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/sbin/ping/ping.c b/sbin/ping/ping.c index b0ef3e7ff95..496b152dd1f 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.59 2003/04/14 19:57:38 cloder Exp $ */ +/* $OpenBSD: ping.c,v 1.60 2003/06/02 20:06:16 millert Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -16,11 +16,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. * @@ -47,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: ping.c,v 1.59 2003/04/14 19:57:38 cloder Exp $"; +static char rcsid[] = "$OpenBSD: ping.c,v 1.60 2003/06/02 20:06:16 millert Exp $"; #endif #endif /* not lint */ |