Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

22 files changed, 44 insertions, 132 deletions

diff --git a/sys/netns/idp.h b/sys/netns/idp.h
index afb9721791a..1cdfe12a02e 100644
--- a/sys/netns/idp.h
+++ b/sys/netns/idp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: idp.h,v 1.2 1997/02/24 14:38:36 niklas Exp $	*/
+/*	$OpenBSD: idp.h,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: idp.h,v 1.5 1994/06/29 06:41:28 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/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index 0c7070ad276..75f4463ffee 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: idp_usrreq.c,v 1.5 2002/03/15 18:19:53 millert Exp $	*/
+/*	$OpenBSD: idp_usrreq.c,v 1.6 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: idp_usrreq.c,v 1.9 1996/02/13 22:13:43 christos 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/sys/netns/idp_var.h b/sys/netns/idp_var.h
index da9683053f6..e95c56163b1 100644
--- a/sys/netns/idp_var.h
+++ b/sys/netns/idp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: idp_var.h,v 1.3 2002/03/14 01:27:13 millert Exp $	*/
+/*	$OpenBSD: idp_var.h,v 1.4 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: idp_var.h,v 1.7 1996/02/13 22:13:47 christos 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/sys/netns/ns.c b/sys/netns/ns.c
index a72458f2f5e..3cc77466281 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns.c,v 1.3 2001/05/16 12:54:07 ho Exp $	*/
+/*	$OpenBSD: ns.c,v 1.4 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns.c,v 1.10 1996/02/13 22:13:49 christos 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/sys/netns/ns.h b/sys/netns/ns.h
index f3d8a0c0e0c..231ec295e9c 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns.h,v 1.4 2002/03/14 01:27:13 millert Exp $	*/
+/*	$OpenBSD: ns.h,v 1.5 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns.h,v 1.8 1996/02/13 22:13:51 christos 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/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c
index 4de1d6e3f72..c64cfdcf7d1 100644
--- a/sys/netns/ns_cksum.c
+++ b/sys/netns/ns_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_cksum.c,v 1.4 2001/09/20 17:02:32 mpech Exp $	*/
+/*	$OpenBSD: ns_cksum.c,v 1.5 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_cksum.c,v 1.3 1995/03/08 02:14:53 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/sys/netns/ns_error.c b/sys/netns/ns_error.c
index 9023a7e4e35..90aeb7ccaec 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_error.c,v 1.2 1996/03/04 08:20:24 niklas Exp $	*/
+/*	$OpenBSD: ns_error.c,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_error.c,v 1.6 1996/02/13 22:13:53 christos 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/sys/netns/ns_error.h b/sys/netns/ns_error.h
index 909a005da54..5b95ee9042c 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_error.h,v 1.4 2002/06/09 02:11:47 jsyn Exp $	*/
+/*	$OpenBSD: ns_error.h,v 1.5 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_error.h,v 1.6 1995/03/26 20:36:20 jtc 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/sys/netns/ns_if.h b/sys/netns/ns_if.h
index 61ddc9a4f90..7d375e960f2 100644
--- a/sys/netns/ns_if.h
+++ b/sys/netns/ns_if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_if.h,v 1.3 2003/05/14 02:02:56 itojun Exp $	*/
+/*	$OpenBSD: ns_if.h,v 1.4 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_if.h,v 1.8 1996/02/13 22:13:54 christos 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/sys/netns/ns_input.c b/sys/netns/ns_input.c
index f266f24190c..d63cc9a74f2 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -1,5 +1,5 @@
 
-/*	$OpenBSD: ns_input.c,v 1.3 1996/12/23 08:47:07 mickey Exp $	*/
+/*	$OpenBSD: ns_input.c,v 1.4 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_input.c,v 1.9 1996/02/13 22:13:56 christos Exp $	*/
 
 /*
@@ -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/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index dcbc7a8c192..969252cb7f0 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_ip.c,v 1.16 2003/05/03 21:16:30 deraadt Exp $	*/
+/*	$OpenBSD: ns_ip.c,v 1.17 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_ip.c,v 1.16 1996/05/09 22:29:40 scottr 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/sys/netns/ns_output.c b/sys/netns/ns_output.c
index 3bfea9f656c..fc86f4bc352 100644
--- a/sys/netns/ns_output.c
+++ b/sys/netns/ns_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_output.c,v 1.3 2002/03/15 18:19:53 millert Exp $	*/
+/*	$OpenBSD: ns_output.c,v 1.4 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_output.c,v 1.8 1996/02/13 22:14:01 christos 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/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index dc4cfa5aba6..56d6d84cdd9 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_pcb.c,v 1.4 2002/03/14 01:27:13 millert Exp $	*/
+/*	$OpenBSD: ns_pcb.c,v 1.5 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_pcb.c,v 1.10 1996/03/27 14:44:14 christos 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/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h
index 5253005447f..db8adb9a45b 100644
--- a/sys/netns/ns_pcb.h
+++ b/sys/netns/ns_pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_pcb.h,v 1.2 1996/03/04 08:20:30 niklas Exp $	*/
+/*	$OpenBSD: ns_pcb.h,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_pcb.h,v 1.7 1996/02/13 22:14:05 christos 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/sys/netns/ns_proto.c b/sys/netns/ns_proto.c
index 2d60231e405..be7c52f3f7f 100644
--- a/sys/netns/ns_proto.c
+++ b/sys/netns/ns_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_proto.c,v 1.3 2001/05/25 22:08:25 itojun Exp $	*/
+/*	$OpenBSD: ns_proto.c,v 1.4 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: ns_proto.c,v 1.6 1996/02/13 22:14:08 christos 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/sys/netns/sp.h b/sys/netns/sp.h
index 84d08659bd6..185f7e045be 100644
--- a/sys/netns/sp.h
+++ b/sys/netns/sp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sp.h,v 1.2 1997/02/24 14:38:38 niklas Exp $	*/
+/*	$OpenBSD: sp.h,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: sp.h,v 1.5 1994/06/29 06:41:50 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/sys/netns/spidp.h b/sys/netns/spidp.h
index c65159b6a7f..e625dbfa711 100644
--- a/sys/netns/spidp.h
+++ b/sys/netns/spidp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spidp.h,v 1.2 1997/02/24 14:38:38 niklas Exp $	*/
+/*	$OpenBSD: spidp.h,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: spidp.h,v 1.5 1994/06/29 06:41:52 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/sys/netns/spp_debug.c b/sys/netns/spp_debug.c
index 75db75e5820..06a1c3a7fc0 100644
--- a/sys/netns/spp_debug.c
+++ b/sys/netns/spp_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spp_debug.c,v 1.2 1996/03/04 08:20:32 niklas Exp $	*/
+/*	$OpenBSD: spp_debug.c,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: spp_debug.c,v 1.6 1996/02/13 22:14:11 christos 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/sys/netns/spp_debug.h b/sys/netns/spp_debug.h
index a7214caae8e..4b504c5df4e 100644
--- a/sys/netns/spp_debug.h
+++ b/sys/netns/spp_debug.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spp_debug.h,v 1.2 1997/02/24 14:38:39 niklas Exp $	*/
+/*	$OpenBSD: spp_debug.h,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: spp_debug.h,v 1.5 1994/06/29 06:41:54 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/sys/netns/spp_timer.h b/sys/netns/spp_timer.h
index c3dc01b07a9..0e6d9a17b5a 100644
--- a/sys/netns/spp_timer.h
+++ b/sys/netns/spp_timer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spp_timer.h,v 1.2 1997/02/24 14:38:39 niklas Exp $	*/
+/*	$OpenBSD: spp_timer.h,v 1.3 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: spp_timer.h,v 1.6 1995/03/26 20:36:22 jtc 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/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index 9c62b625148..49c256df2e1 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spp_usrreq.c,v 1.14 2002/08/08 13:51:25 aaron Exp $	*/
+/*	$OpenBSD: spp_usrreq.c,v 1.15 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: spp_usrreq.c,v 1.9 1996/02/13 22:14:13 christos 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/sys/netns/spp_var.h b/sys/netns/spp_var.h
index aa1ed49fbfa..752b808feb5 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spp_var.h,v 1.3 2002/03/14 01:27:13 millert Exp $	*/
+/*	$OpenBSD: spp_var.h,v 1.4 2003/06/02 23:28:19 millert Exp $	*/
 /*	$NetBSD: spp_var.h,v 1.6 1996/02/13 22:14:16 christos 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.
  *