Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

7 files changed, 20 insertions, 48 deletions

diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 357d3e3b938..154d795f338 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: announce.c,v 1.16 2002/11/25 07:40:09 itojun Exp $	*/
+/*	$OpenBSD: announce.c,v 1.17 2003/06/02 19:38:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -35,7 +31,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)announce.c	5.9 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: announce.c,v 1.16 2002/11/25 07:40:09 itojun Exp $";
+static char rcsid[] = "$Id: announce.c,v 1.17 2003/06/02 19:38:24 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 0d5ce1b0e80..47fab76aaf4 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.5 2002/11/25 07:40:09 itojun Exp $	*/
+/*	$OpenBSD: print.c,v 1.6 2003/06/02 19:38:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -35,7 +31,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)print.c	5.8 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: print.c,v 1.5 2002/11/25 07:40:09 itojun Exp $";
+static char rcsid[] = "$Id: print.c,v 1.6 2003/06/02 19:38:24 millert Exp $";
 #endif /* not lint */
 
 /* debug print routines */
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index 5e4f465cdf4..e1515428dd4 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.c,v 1.14 2002/11/25 07:40:09 itojun Exp $	*/
+/*	$OpenBSD: process.c,v 1.15 2003/06/02 19:38:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -35,7 +31,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)process.c	5.10 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: process.c,v 1.14 2002/11/25 07:40:09 itojun Exp $";
+static char rcsid[] = "$Id: process.c,v 1.15 2003/06/02 19:38:24 millert Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 14925978567..1e06eaa4576 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $	*/
+/*	$OpenBSD: table.c,v 1.9 2003/06/02 19:38:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -35,7 +31,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)table.c	5.7 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $";
+static char rcsid[] = "$Id: table.c,v 1.9 2003/06/02 19:38:24 millert Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/talkd.8 b/libexec/talkd/talkd.8
index ee4ba72478e..53b2e40158c 100644
--- a/libexec/talkd/talkd.8
+++ b/libexec/talkd/talkd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: talkd.8,v 1.4 2002/05/22 19:07:43 deraadt Exp $
+.\"	$OpenBSD: talkd.8,v 1.5 2003/06/02 19:38:24 millert Exp $
 .\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -11,11 +11,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.
 .\"
@@ -32,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)talkd.8	6.5 (Berkeley) 3/16/91
-.\"	$Id: talkd.8,v 1.4 2002/05/22 19:07:43 deraadt Exp $
+.\"	$Id: talkd.8,v 1.5 2003/06/02 19:38:24 millert Exp $
 .\"
 .Dd March 16, 1991
 .Dt TALKD 8
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index 16dae7ac3f4..fab7483adfc 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: talkd.c,v 1.17 2002/11/25 07:40:09 itojun Exp $	*/
+/*	$OpenBSD: talkd.c,v 1.18 2003/06/02 19:38:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -41,7 +37,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)talkd.c	5.8 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: talkd.c,v 1.17 2002/11/25 07:40:09 itojun Exp $";
+static char rcsid[] = "$Id: talkd.c,v 1.18 2003/06/02 19:38:24 millert Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/talkd.h b/libexec/talkd/talkd.h
index fca8c054bdd..b84fa828bb9 100644
--- a/libexec/talkd/talkd.h
+++ b/libexec/talkd/talkd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: talkd.h,v 1.7 2002/11/25 07:40:09 itojun Exp $	*/
+/*	$OpenBSD: talkd.h,v 1.8 2003/06/02 19:38:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *