Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

5 files changed, 10 insertions, 30 deletions

diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index db95e95e4cc..60c064637d5 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumprestore.h,v 1.4 2001/01/09 03:15:16 angelos Exp $	*/
+/*	$OpenBSD: dumprestore.h,v 1.5 2003/06/02 19:34:12 millert Exp $	*/
 /*	$NetBSD: dumprestore.h,v 1.6 1994/10/26 00:56:49 cgd Exp $	*/
 
 /*
@@ -18,11 +18,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/include/protocols/routed.h b/include/protocols/routed.h
index d5a9684f2a7..83331a4bee6 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: routed.h,v 1.2 1996/09/05 11:13:18 mickey Exp $	*/
+/*	$OpenBSD: routed.h,v 1.3 2003/06/02 19:34:12 millert Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1989, 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/include/protocols/rwhod.h b/include/protocols/rwhod.h
index 80b89fb46ca..c182e968222 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rwhod.h,v 1.3 1997/09/21 10:46:06 niklas Exp $	*/
+/*	$OpenBSD: rwhod.h,v 1.4 2003/06/02 19:34:12 millert Exp $	*/
 /*	$NetBSD: rwhod.h,v 1.3 1994/10/26 00:56:51 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/include/protocols/talkd.h b/include/protocols/talkd.h
index db34e646293..7dce0aef4ca 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: talkd.h,v 1.2 1997/09/21 10:46:07 niklas Exp $	*/
+/*	$OpenBSD: talkd.h,v 1.3 2003/06/02 19:34:12 millert Exp $	*/
 /*	$NetBSD: talkd.h,v 1.5 1995/03/04 07:59:30 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/include/protocols/timed.h b/include/protocols/timed.h
index a8930f5343b..0a3ecdb2d42 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timed.h,v 1.2 1996/04/21 23:38:17 deraadt Exp $	*/
+/*	$OpenBSD: timed.h,v 1.3 2003/06/02 19:34:12 millert Exp $	*/
 /*	$NetBSD: timed.h,v 1.5 1996/04/09 20:40:32 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.
  *