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/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 54dd2a2fbc1..8ffceac49ff 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: egetopt.c,v 1.4 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: egetopt.c,v 1.5 2003/06/03 02:56:14 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991 Keith Muller.
@@ -16,11 +16,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.
  *
@@ -39,7 +35,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)egetopt.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: egetopt.c,v 1.4 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: egetopt.c,v 1.5 2003/06/03 02:56:14 millert Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index d42b6a5bf2a..9fbbcd67df6 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:51 millert Exp $*/
+/* *	$OpenBSD: extern.h,v 1.5 2003/06/03 02:56:14 millert Exp $*/
 /*-
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 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/pr/pr.1 b/usr.bin/pr/pr.1
index f441247ca8c..ca161e73578 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pr.1,v 1.14 2003/01/15 15:05:35 deraadt Exp $
+.\"	$OpenBSD: pr.1,v 1.15 2003/06/03 02:56:14 millert Exp $
 .\"
 .\" Copyright (c) 1991 Keith Muller.
 .\" Copyright (c) 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/pr/pr.c b/usr.bin/pr/pr.c
index 06bd73bc6cf..2fd22532e9d 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pr.c,v 1.15 2002/04/30 01:59:47 deraadt Exp $	*/
+/*	$OpenBSD: pr.c,v 1.16 2003/06/03 02:56:14 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991 Keith Muller.
@@ -16,11 +16,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.
  *
@@ -45,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)pr.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.15 2002/04/30 01:59:47 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.16 2003/06/03 02:56:14 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index cff4da247d7..0759f16e93d 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: pr.h,v 1.3 1997/04/23 08:08:29 grr Exp $*/
+/* *	$OpenBSD: pr.h,v 1.4 2003/06/03 02:56:14 millert Exp $*/
 /*-
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 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.
  *