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/nfsd | |
| 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/nfsd')
| -rw-r--r-- | sbin/nfsd/nfsd.8 | 8 | ||||
| -rw-r--r-- | sbin/nfsd/nfsd.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8 index f7a4df45436..fbff04b67dc 100644 --- a/sbin/nfsd/nfsd.8 +++ b/sbin/nfsd/nfsd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nfsd.8,v 1.11 2000/03/05 00:28:50 aaron Exp $ +.\" $OpenBSD: nfsd.8,v 1.12 2003/06/02 20:06:16 millert Exp $ .\" $NetBSD: nfsd.8,v 1.7 1996/02/18 11:58:24 fvdl Exp $ .\" .\" Copyright (c) 1989, 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/nfsd/nfsd.c b/sbin/nfsd/nfsd.c index 581a1e84ac1..63ec6d3f9ab 100644 --- a/sbin/nfsd/nfsd.c +++ b/sbin/nfsd/nfsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsd.c,v 1.20 2002/09/10 05:15:02 deraadt Exp $ */ +/* $OpenBSD: nfsd.c,v 1.21 2003/06/02 20:06:16 millert Exp $ */ /* $NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft 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. * |