diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-04 21:48:06 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-04 21:48:06 +0000 |
| commit | 0056cc6415081a1e553b623db561f55a7eb33057 (patch) | |
| tree | 6b1c9abf2f891373f62f0bbaac67a15f12b13463 /usr.bin | |
| parent | cef15417a896788f999be6c82690b7fa79748434 (diff) | |
mop up some more 3/4 license issues
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/spell/spell.1 | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/LICENCE | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/usr.bin/spell/spell.1 b/usr.bin/spell/spell.1 index 01a6c5fcb84..74fec9cbbe9 100644 --- a/usr.bin/spell/spell.1 +++ b/usr.bin/spell/spell.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: spell.1,v 1.4 2003/03/11 08:11:08 jmc Exp $ +.\" $OpenBSD: spell.1,v 1.5 2003/06/04 21:48:02 deraadt Exp $ .\" .\" Copyright (C) 1985, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,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.bin/ssh/LICENCE b/usr.bin/ssh/LICENCE index 011baf22cbd..60e885775a5 100644 --- a/usr.bin/ssh/LICENCE +++ b/usr.bin/ssh/LICENCE @@ -134,11 +134,9 @@ OpenSSH contains no GPL code. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 5) - One component of the ssh source code is under a 4-clause BSD license, + One component of the ssh source code is under a 3-clause BSD license, held by the University of California, since we pulled these parts from - original Berkeley code. The Regents of the University of California - have declared that term 3 is no longer enforceable on their source code, - but we retain that license as is. + original Berkeley code. * Copyright (c) 1983, 1990, 1992, 1993, 1995 * The Regents of the University of California. All rights reserved. @@ -151,11 +149,7 @@ OpenSSH contains no GPL code. * 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. * |