Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

5 files changed, 11 insertions, 31 deletions

diff --git a/bin/mt/mt.1 b/bin/mt/mt.1
index 42b1bb8fc63..c558ce8c1c7 100644
--- a/bin/mt/mt.1
+++ b/bin/mt/mt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mt.1,v 1.18 2003/03/14 15:00:56 jmc Exp $
+.\"	$OpenBSD: mt.1,v 1.19 2003/06/02 23:32:08 millert Exp $
 .\"	$NetBSD: mt.1,v 1.8 1996/05/21 10:23:55 mrg Exp $
 .\"
 .\" Copyright (c) 1981, 1990, 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/bin/mt/mt.c b/bin/mt/mt.c
index 179d6fbd622..61b59937089 100644
--- a/bin/mt/mt.c
+++ b/bin/mt/mt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mt.c,v 1.22 2003/03/14 15:00:56 jmc Exp $	*/
+/*	$OpenBSD: mt.c,v 1.23 2003/06/02 23:32:08 millert Exp $	*/
 /*	$NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $	*/
 
 /*
@@ -13,11 +13,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.
  *
@@ -44,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: mt.c,v 1.22 2003/03/14 15:00:56 jmc Exp $";
+static char rcsid[] = "$OpenBSD: mt.c,v 1.23 2003/06/02 23:32:08 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/mt/mt.h b/bin/mt/mt.h
index 2c6f0771bee..da24d3d4923 100644
--- a/bin/mt/mt.h
+++ b/bin/mt/mt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mt.h,v 1.2 2002/02/16 21:27:07 millert Exp $	*/
+/*	$OpenBSD: mt.h,v 1.3 2003/06/02 23:32:08 millert Exp $	*/
 /*	$NetBSD: mt.h,v 1.1 1996/03/05 20:39:36 scottr Exp $	*/
 
 /*-
@@ -13,11 +13,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/mt/mtrmt.c b/bin/mt/mtrmt.c
index 5dab9ea2884..c99336f4711 100644
--- a/bin/mt/mtrmt.c
+++ b/bin/mt/mtrmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtrmt.c,v 1.12 2002/05/27 20:28:31 deraadt Exp $	*/
+/*	$OpenBSD: mtrmt.c,v 1.13 2003/06/02 23:32:08 millert Exp $	*/
 /*	$NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $	*/
 
 /*-
@@ -13,11 +13,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/mt/pathnames.h b/bin/mt/pathnames.h
index 9673d321e53..733ed70b211 100644
--- a/bin/mt/pathnames.h
+++ b/bin/mt/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.1 1996/03/08 23:34:22 niklas Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.2 2003/06/02 23:32:08 millert Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.1 1996/03/05 20:39:40 scottr Exp $	*/
 
 /*
@@ -13,11 +13,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.
  *