summaryrefslogtreecommitdiff
path: root/bin/cat
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:32:10 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:32:10 +0000
commit5269326c4f96790590406db72b6ac8127e33f825 (patch)
tree8cc1a8df99e3a8a809fa12c0cc48e211d39501f2 /bin/cat
parent0c09109be00d40ba5aa659ae25f7ba0bbad35bab (diff)
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'bin/cat')
-rw-r--r--bin/cat/cat.18
-rw-r--r--bin/cat/cat.c10
2 files changed, 5 insertions, 13 deletions
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index 6baed683845..ac282346928 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cat.1,v 1.23 2003/06/01 23:50:02 millert Exp $
+.\" $OpenBSD: cat.1,v 1.24 2003/06/02 23:32:06 millert Exp $
.\" $NetBSD: cat.1,v 1.12 1995/09/27 05:38:55 cgd Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -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/cat/cat.c b/bin/cat/cat.c
index 3f38cc2b5d0..1191d6fca47 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cat.c,v 1.14 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: cat.c,v 1.15 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc 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[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
#else
-static char rcsid[] = "$OpenBSD: cat.c,v 1.14 2002/07/04 04:26:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cat.c,v 1.15 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */