Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

5 files changed, 12 insertions, 32 deletions

diff --git a/games/quiz/pathnames.h b/games/quiz/pathnames.h
index 5731ac0eb8d..b537d3ba45d 100644
--- a/games/quiz/pathnames.h
+++ b/games/quiz/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.2 1998/08/19 07:40:54 pjanzen Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.3 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.4 1995/04/22 10:16:55 cgd 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/games/quiz/quiz.6 b/games/quiz/quiz.6
index 13ebe6c1925..ebb5ffde978 100644
--- a/games/quiz/quiz.6
+++ b/games/quiz/quiz.6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quiz.6,v 1.4 1998/12/15 19:18:48 pjanzen Exp $
+.\"	$OpenBSD: quiz.6,v 1.5 2003/06/03 03:01:40 millert Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -14,11 +14,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/games/quiz/quiz.c b/games/quiz/quiz.c
index ec60350dbfb..28522a67339 100644
--- a/games/quiz/quiz.c
+++ b/games/quiz/quiz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quiz.c,v 1.13 2003/04/06 18:50:38 deraadt Exp $	*/
+/*	$OpenBSD: quiz.c,v 1.14 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: quiz.c,v 1.9 1995/04/22 10:16:58 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,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.
  *
@@ -48,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)quiz.c	8.3 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$OpenBSD: quiz.c,v 1.13 2003/04/06 18:50:38 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: quiz.c,v 1.14 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/quiz/quiz.h b/games/quiz/quiz.h
index 1c9f38a2b23..9055aa1fdca 100644
--- a/games/quiz/quiz.h
+++ b/games/quiz/quiz.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quiz.h,v 1.4 2002/02/16 21:27:11 millert Exp $	*/
+/*	$OpenBSD: quiz.h,v 1.5 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: quiz.h,v 1.4 1995/04/22 10:16:59 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,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/games/quiz/rxp.c b/games/quiz/rxp.c
index 8662e8285be..68c4884e589 100644
--- a/games/quiz/rxp.c
+++ b/games/quiz/rxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rxp.c,v 1.5 2002/02/16 21:27:11 millert Exp $	*/
+/*	$OpenBSD: rxp.c,v 1.6 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: rxp.c,v 1.5 1995/04/22 10:17:00 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)rxp.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: rxp.c,v 1.5 2002/02/16 21:27:11 millert Exp $";
+static char rcsid[] = "$OpenBSD: rxp.c,v 1.6 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */