diff options
| author |   millert <millert@openbsd.org> | 2003-06-02 23:27:43 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-06-02 23:27:43 +0000 |
| commit | 29295d1c5caf158d3a732746704292e9a80a32d2 (patch) | |
| tree | 4c19b0f6fa02116f06b21b9038f90bad4a60c53e /bin/rm | |
| parent | Remove the advertising clause in the UCB license which Berkeley (diff) | |
| download | wireguard-openbsd-29295d1c5caf158d3a732746704292e9a80a32d2.tar.xz wireguard-openbsd-29295d1c5caf158d3a732746704292e9a80a32d2.zip | |
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'bin/rm')
| -rw-r--r-- | bin/rm/rm.1 | 8 | ||||
| -rw-r--r-- | bin/rm/rm.c | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 2fa6f6b121c..1033fa7320a 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rm.1,v 1.22 2003/05/30 08:37:08 jmc Exp $ +.\" $OpenBSD: rm.1,v 1.23 2003/06/02 23:32:09 millert Exp $ .\" $NetBSD: rm.1,v 1.8 1995/07/25 19:37:30 jtc Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 @@ -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. .\" diff --git a/bin/rm/rm.c b/bin/rm/rm.c index c2afef9a3d1..3b8e11d582d 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rm.c,v 1.14 2003/01/11 11:03:53 hugh Exp $ */ +/* $OpenBSD: rm.c,v 1.15 2003/06/02 23:32:09 millert Exp $ */ /* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */ /*- @@ -13,11 +13,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. * @@ -44,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rm.c 8.8 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: rm.c,v 1.14 2003/01/11 11:03:53 hugh Exp $"; +static char rcsid[] = "$OpenBSD: rm.c,v 1.15 2003/06/02 23:32:09 millert Exp $"; #endif #endif /* not lint */ |