Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

6 files changed, 16 insertions, 40 deletions

diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 8649d4fda7f..0cdf2744851 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: cmp.1,v 1.9 2000/11/09 17:52:06 aaron Exp $
+.\"     $OpenBSD: cmp.1,v 1.10 2003/06/03 02:56:06 millert Exp $
 .\"     $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
 .\"
 .\" Copyright (c) 1987, 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/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 1c6904cd9e8..a325a4b0bff 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: cmp.c,v 1.9 2002/02/16 21:27:45 millert Exp $      */
+/*      $OpenBSD: cmp.c,v 1.10 2003/06/03 02:56:06 millert Exp $      */
 /*      $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls 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[] = "@(#)cmp.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: cmp.c,v 1.9 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmp.c,v 1.10 2003/06/03 02:56:06 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index 481821f12e3..ff55589f105 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:45 millert Exp $      */
+/*      $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:06 millert Exp $      */
 /*      $NetBSD: extern.h,v 1.2 1995/09/08 03:22:57 tls 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/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 9b06d853514..a3677f75048 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: misc.c,v 1.3 2001/07/12 05:16:58 deraadt Exp $      */
+/*      $OpenBSD: misc.c,v 1.4 2003/06/03 02:56:06 millert Exp $      */
 /*      $NetBSD: misc.c,v 1.2 1995/09/08 03:22:58 tls 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.3 2001/07/12 05:16:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 258634ae723..f5fe302456f 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: regular.c,v 1.6 2001/07/12 05:16:58 deraadt Exp $      */
+/*      $OpenBSD: regular.c,v 1.7 2003/06/03 02:56:06 millert Exp $      */
 /*      $NetBSD: regular.c,v 1.2 1995/09/08 03:22:59 tls 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)regular.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: regular.c,v 1.6 2001/07/12 05:16:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: regular.c,v 1.7 2003/06/03 02:56:06 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 3c389bd1c27..6753312855f 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: special.c,v 1.4 2001/07/12 05:16:58 deraadt Exp $      */
+/*      $OpenBSD: special.c,v 1.5 2003/06/03 02:56:06 millert Exp $      */
 /*      $NetBSD: special.c,v 1.2 1995/09/08 03:23:00 tls 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: special.c,v 1.4 2001/07/12 05:16:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: special.c,v 1.5 2003/06/03 02:56:06 millert Exp $";
 #endif
 #endif /* not lint */