summaryrefslogtreecommitdiff
path: root/usr.sbin/iostat
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:36:56 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:36:56 +0000
commit149854f5f21442a68ead0095592956a96962dcf2 (patch)
treef43fff130e674efd8a82cf223d1143f11fd83184 /usr.sbin/iostat
parent5269326c4f96790590406db72b6ac8127e33f825 (diff)
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'usr.sbin/iostat')
-rw-r--r--usr.sbin/iostat/iostat.88
-rw-r--r--usr.sbin/iostat/iostat.c8
2 files changed, 4 insertions, 12 deletions
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 77428dddea3..20055bf9d58 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iostat.8,v 1.19 2003/02/03 17:46:56 jmc Exp $
+.\" $OpenBSD: iostat.8,v 1.20 2003/06/02 23:36:53 millert Exp $
.\" $NetBSD: iostat.8,v 1.10 1996/10/25 18:21:57 scottr Exp $
.\"
.\" Copyright (c) 1985, 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/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 1d1edd7b2e4..5b11ce4db11 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iostat.c,v 1.16 2002/12/16 01:57:05 tdeval Exp $ */
+/* $OpenBSD: iostat.c,v 1.17 2003/06/02 23:36:53 millert Exp $ */
/* $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $ */
/*
@@ -45,11 +45,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.
*