Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

6 files changed, 12 insertions, 36 deletions

diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3
index de72ad0a7e6..3c51b2c764a 100644
--- a/share/man/man3/assert.3
+++ b/share/man/man3/assert.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: assert.3,v 1.5 2000/10/26 00:37:03 aaron Exp $
+.\"	$OpenBSD: assert.3,v 1.6 2003/06/02 23:30:12 millert Exp $
 .\"	$NetBSD: assert.3,v 1.5 1994/11/30 15:24:30 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 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/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index 2cf9135b7d5..0461e95dff6 100644
--- a/share/man/man3/bitstring.3
+++ b/share/man/man3/bitstring.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bitstring.3,v 1.10 2003/05/20 09:13:38 jmc Exp $
+.\"	$OpenBSD: bitstring.3,v 1.11 2003/06/02 23:30:12 millert Exp $
 .\"	$NetBSD: bitstring.3,v 1.4 1994/11/30 15:24:31 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -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/share/man/man3/end.3 b/share/man/man3/end.3
index c76f4be67b5..941f87112e6 100644
--- a/share/man/man3/end.3
+++ b/share/man/man3/end.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: end.3,v 1.7 2000/10/26 00:37:03 aaron Exp $
+.\"	$OpenBSD: end.3,v 1.8 2003/06/02 23:30:12 millert Exp $
 .\"	$NetBSD: end.3,v 1.5 1996/03/01 00:17:49 jtc Exp $
 .\"
 .\" Copyright (c) 1986
@@ -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/share/man/man3/intro.3 b/share/man/man3/intro.3
index 992ea883b7d..c3505e54111 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.3,v 1.15 2003/05/21 11:49:04 jmc Exp $
+.\"	$OpenBSD: intro.3,v 1.16 2003/06/02 23:30:12 millert Exp $
 .\"	$NetBSD: intro.3,v 1.5 1995/05/10 22:46:24 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 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/share/man/man3/queue.3 b/share/man/man3/queue.3
index c6b3a741649..5670b3e3ca6 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: queue.3,v 1.30 2003/05/20 09:13:38 jmc Exp $
+.\"	$OpenBSD: queue.3,v 1.31 2003/06/02 23:30:12 millert Exp $
 .\"	$NetBSD: queue.3,v 1.4 1995/07/03 00:25:36 mycroft Exp $
 .\"
 .\" Copyright (c) 1993 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.
 .\"
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index f6ffb955e89..e921d7ec435 100644
--- a/share/man/man3/stdarg.3
+++ b/share/man/man3/stdarg.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdarg.3,v 1.11 2002/11/17 22:19:43 millert Exp $
+.\"	$OpenBSD: stdarg.3,v 1.12 2003/06/02 23:30:12 millert Exp $
 .\"	$NetBSD: stdarg.3,v 1.15 2002/08/18 08:57:07 yamt Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -16,11 +16,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.
 .\"