summaryrefslogtreecommitdiff
path: root/usr.bin/deroff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-03 02:56:25 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-03 02:56:25 +0000
commitb532ca5cf72acd586a7c31dce5e4babf5991a2f7 (patch)
tree3562eeed20363794e06821f1da3817b9cde8052e /usr.bin/deroff
parentf48a5d6cd1eb9487e5e67c75dc5f6764b04cd99c (diff)
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'usr.bin/deroff')
-rw-r--r--usr.bin/deroff/deroff.18
-rw-r--r--usr.bin/deroff/deroff.c10
2 files changed, 5 insertions, 13 deletions
diff --git a/usr.bin/deroff/deroff.1 b/usr.bin/deroff/deroff.1
index 8aa46300b56..24cf62e6efe 100644
--- a/usr.bin/deroff/deroff.1
+++ b/usr.bin/deroff/deroff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: deroff.1,v 1.3 2002/02/28 22:01:14 millert Exp $
+.\" $OpenBSD: deroff.1,v 1.4 2003/06/03 02:56:07 millert Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" 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/deroff/deroff.c b/usr.bin/deroff/deroff.c
index 0bf26d2fb21..8dceff32a9e 100644
--- a/usr.bin/deroff/deroff.c
+++ b/usr.bin/deroff/deroff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: deroff.c,v 1.4 2002/02/28 22:12:15 danh Exp $ */
+/* $OpenBSD: deroff.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/*-
* Copyright (c) 1988, 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.
*
@@ -76,7 +72,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)deroff.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: deroff.c,v 1.4 2002/02/28 22:12:15 danh Exp $";
+static const char rcsid[] = "$OpenBSD: deroff.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */