Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

11 files changed, 30 insertions, 74 deletions

diff --git a/usr.bin/tn3270/tools/mkastods/mkastods.c b/usr.bin/tn3270/tools/mkastods/mkastods.c
index 998838bbab2..53bca9e0432 100644
--- a/usr.bin/tn3270/tools/mkastods/mkastods.c
+++ b/usr.bin/tn3270/tools/mkastods/mkastods.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkastods.c,v 1.2 1996/06/26 05:41:36 deraadt Exp $	*/
+/*	$OpenBSD: mkastods.c,v 1.3 2003/06/03 02:56:19 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)mkastods.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkastods.c,v 1.2 1996/06/26 05:41:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkastods.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index f457c3dbe81..98f203d849b 100644
--- a/usr.bin/tn3270/tools/mkastosc/mkastosc.c
+++ b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkastosc.c,v 1.2 1996/06/26 05:41:37 deraadt Exp $	*/
+/*	$OpenBSD: mkastosc.c,v 1.3 2003/06/03 02:56:19 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)mkastosc.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkastosc.c,v 1.2 1996/06/26 05:41:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkastosc.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.c b/usr.bin/tn3270/tools/mkdctype/ectype.c
index 86aa5abcaec..0dc02d6cda5 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.c
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ectype.c,v 1.2 1996/06/26 05:41:38 deraadt Exp $	*/
+/*	$OpenBSD: ectype.c,v 1.3 2003/06/03 02:56:19 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)ectype.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: ectype.c,v 1.2 1996/06/26 05:41:38 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ectype.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
 #endif /* not lint */
 
 #include "ectype.h"
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.h b/usr.bin/tn3270/tools/mkdctype/ectype.h
index f3a2292029b..cd5d9f3e2ac 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.h
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.h
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: ectype.h,v 1.2 1996/06/26 05:41:39 deraadt Exp $*/
+/* *	$OpenBSD: ectype.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
 /*-
  * Copyright (c) 1988 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.
  *
diff --git a/usr.bin/tn3270/tools/mkdctype/mkdctype.c b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
index 0054e917b38..ff798765524 100644
--- a/usr.bin/tn3270/tools/mkdctype/mkdctype.c
+++ b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkdctype.c,v 1.2 1996/06/26 05:41:39 deraadt Exp $	*/
+/*	$OpenBSD: mkdctype.c,v 1.3 2003/06/03 02:56:19 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)mkdctype.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkdctype.c,v 1.2 1996/06/26 05:41:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkdctype.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
 #endif /* not lint */
 
 #include "../api/ebc_disp.h"
diff --git a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
index d049c1f576d..2a3009679c6 100644
--- a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
+++ b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkdstoas.c,v 1.2 1996/06/26 05:41:40 deraadt Exp $	*/
+/*	$OpenBSD: mkdstoas.c,v 1.3 2003/06/03 02:56:20 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)mkdstoas.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkdstoas.c,v 1.2 1996/06/26 05:41:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkdstoas.c,v 1.3 2003/06/03 02:56:20 millert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.c b/usr.bin/tn3270/tools/mkhits/dohits.c
index 5afa59815d6..5e6ba71805e 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dohits.c,v 1.7 2003/04/25 18:56:14 avsm Exp $	*/
+/*	$OpenBSD: dohits.c,v 1.8 2003/06/03 02:56:20 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)dohits.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: dohits.c,v 1.7 2003/04/25 18:56:14 avsm Exp $";
+static char rcsid[] = "$OpenBSD: dohits.c,v 1.8 2003/06/03 02:56:20 millert Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.h b/usr.bin/tn3270/tools/mkhits/dohits.h
index 3ef0f1973df..48e53780c7d 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.h
+++ b/usr.bin/tn3270/tools/mkhits/dohits.h
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: dohits.h,v 1.2 1996/06/26 05:41:42 deraadt Exp $*/
+/* *	$OpenBSD: dohits.h,v 1.3 2003/06/03 02:56:20 millert Exp $*/
 /*-
  * Copyright (c) 1988 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.
  *
diff --git a/usr.bin/tn3270/tools/mkhits/mkhits.c b/usr.bin/tn3270/tools/mkhits/mkhits.c
index c5bff29d793..69b22be6679 100644
--- a/usr.bin/tn3270/tools/mkhits/mkhits.c
+++ b/usr.bin/tn3270/tools/mkhits/mkhits.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkhits.c,v 1.2 1996/06/26 05:41:42 deraadt Exp $	*/
+/*	$OpenBSD: mkhits.c,v 1.3 2003/06/03 02:56:20 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)mkhits.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkhits.c,v 1.2 1996/06/26 05:41:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkhits.c,v 1.3 2003/06/03 02:56:20 millert Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tn3270/tools/mkmake.y b/usr.bin/tn3270/tools/mkmake.y
index d584d3bc73c..5002ba93ba5 100644
--- a/usr.bin/tn3270/tools/mkmake.y
+++ b/usr.bin/tn3270/tools/mkmake.y
@@ -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: @(#)mkmake.y	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkmake.y,v 1.3 2003/04/06 22:02:05 tedu Exp $";
+static char rcsid[] = "$Id: mkmake.y,v 1.4 2003/06/03 02:56:19 millert Exp $";
 #endif /* not lint */
 
 typedef struct string {
diff --git a/usr.bin/tn3270/tools/prt3270.c b/usr.bin/tn3270/tools/prt3270.c
index 37d6e4c196d..b030b2d0759 100644
--- a/usr.bin/tn3270/tools/prt3270.c
+++ b/usr.bin/tn3270/tools/prt3270.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prt3270.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $	*/
+/*	$OpenBSD: prt3270.c,v 1.5 2003/06/03 02:56:19 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988 The 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: @(#)prt3270.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: prt3270.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: prt3270.c,v 1.5 2003/06/03 02:56:19 millert Exp $";
 #endif /* not lint */
 
 #if defined(unix)