14 files changed, 21 insertions, 75 deletions
diff --git a/gnu/egcs/gcc/config/i386/gmon-sol2.c b/gnu/egcs/gcc/config/i386/gmon-sol2.c
index 35ac1c9abb7..ab002b17fce 100644
--- a/gnu/egcs/gcc/config/i386/gmon-sol2.c
+++ b/gnu/egcs/gcc/config/i386/gmon-sol2.c
@@ -10,11 +10,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/gnu/egcs/gcc/config/sparc/gmon-sol2.c b/gnu/egcs/gcc/config/sparc/gmon-sol2.c
index a6abcabcc51..e27653223d5 100644
--- a/gnu/egcs/gcc/config/sparc/gmon-sol2.c
+++ b/gnu/egcs/gcc/config/sparc/gmon-sol2.c
@@ -10,11 +10,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/gnu/egcs/gcc/gmon.c b/gnu/egcs/gcc/gmon.c
index 2bb7366197a..407d2c76b7f 100644
--- a/gnu/egcs/gcc/gmon.c
+++ b/gnu/egcs/gcc/gmon.c
@@ -10,11 +10,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/gnu/usr.bin/cvs/vms/pathnames.h b/gnu/usr.bin/cvs/vms/pathnames.h
index a4d2aada45f..32545aa2376 100644
--- a/gnu/usr.bin/cvs/vms/pathnames.h
+++ b/gnu/usr.bin/cvs/vms/pathnames.h
@@ -10,11 +10,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.
  *
@@ -31,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	5.2 (Berkeley) 4/9/90
- *	$Id: pathnames.h,v 1.1 1996/10/18 03:37:10 tholo Exp $
+ *	$Id: pathnames.h,v 1.2 2003/06/02 19:55:59 millert Exp $
  */
 
 #define	_PATH_RLOGIN	"/usr/bin/rlogin"
diff --git a/gnu/usr.bin/groff/tmac/doc-common b/gnu/usr.bin/groff/tmac/doc-common
index 1be195979fa..d8d42ebdba5 100644
--- a/gnu/usr.bin/groff/tmac/doc-common
+++ b/gnu/usr.bin/groff/tmac/doc-common
@@ -9,11 +9,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/gnu/usr.bin/groff/tmac/doc-ditroff b/gnu/usr.bin/groff/tmac/doc-ditroff
index 039db7dd06e..3936efcb7f5 100644
--- a/gnu/usr.bin/groff/tmac/doc-ditroff
+++ b/gnu/usr.bin/groff/tmac/doc-ditroff
@@ -9,11 +9,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/gnu/usr.bin/groff/tmac/doc-nroff b/gnu/usr.bin/groff/tmac/doc-nroff
index c036f218125..43a91338ad5 100644
--- a/gnu/usr.bin/groff/tmac/doc-nroff
+++ b/gnu/usr.bin/groff/tmac/doc-nroff
@@ -9,11 +9,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/gnu/usr.bin/groff/tmac/doc-syms b/gnu/usr.bin/groff/tmac/doc-syms
index a9504e9bd8f..20b97516499 100644
--- a/gnu/usr.bin/groff/tmac/doc-syms
+++ b/gnu/usr.bin/groff/tmac/doc-syms
@@ -9,11 +9,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.
 .\"
@@ -217,11 +213,13 @@
 .       \}
 .       if "\\*(A\\n(aP"-iso8802-3" \{\
 .		ie \\n(sT==1 \{\
-.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
+.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
+.\" .			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
 .\" .			as b1 (``\\*(tNANSI C\\*(aa'')
 .		\}
 .		el \{\
-.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
+.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
+.\" .			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
 .\" .			as b1 (``\\*(tNANSI C\\*(aa'')
 .		\}
 .       \}
diff --git a/gnu/usr.bin/groff/tmac/groff_mdoc.7_in b/gnu/usr.bin/groff/tmac/groff_mdoc.7_in
index 2112eba4eba..004311aca63 100644
--- a/gnu/usr.bin/groff/tmac/groff_mdoc.7_in
+++ b/gnu/usr.bin/groff/tmac/groff_mdoc.7_in
@@ -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/gnu/usr.bin/groff/tmac/groff_mdoc.samples.7_in b/gnu/usr.bin/groff/tmac/groff_mdoc.samples.7_in
index cdbbc21c4f6..26711d70cd7 100644
--- a/gnu/usr.bin/groff/tmac/groff_mdoc.samples.7_in
+++ b/gnu/usr.bin/groff/tmac/groff_mdoc.samples.7_in
@@ -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/gnu/usr.bin/groff/tmac/tmac.doc b/gnu/usr.bin/groff/tmac/tmac.doc
index 98f24b43af7..85537667c78 100644
--- a/gnu/usr.bin/groff/tmac/tmac.doc
+++ b/gnu/usr.bin/groff/tmac/tmac.doc
@@ -9,11 +9,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/gnu/usr.bin/groff/tmac/tmac.doc.old b/gnu/usr.bin/groff/tmac/tmac.doc.old
index 51a0ec0053a..e381af71e21 100644
--- a/gnu/usr.bin/groff/tmac/tmac.doc.old
+++ b/gnu/usr.bin/groff/tmac/tmac.doc.old
@@ -10,11 +10,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/gnu/usr.bin/ld/rtld/malloc.c b/gnu/usr.bin/ld/rtld/malloc.c
index 93f7ff58aef..3ad09c1f245 100644
--- a/gnu/usr.bin/ld/rtld/malloc.c
+++ b/gnu/usr.bin/ld/rtld/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.8 2002/12/11 23:24:39 millert Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.9 2003/06/02 19:55:59 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 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)malloc.c	5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$OpenBSD: malloc.c,v 1.8 2002/12/11 23:24:39 millert Exp $";
+static char *rcsid = "$OpenBSD: malloc.c,v 1.9 2003/06/02 19:55:59 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/gnu/usr.bin/perl/ext/Cwd/Cwd.xs b/gnu/usr.bin/perl/ext/Cwd/Cwd.xs
index 3f7b93b2317..585ec78354e 100644
--- a/gnu/usr.bin/perl/ext/Cwd/Cwd.xs
+++ b/gnu/usr.bin/perl/ext/Cwd/Cwd.xs
@@ -25,11 +25,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.
  *