Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

9 files changed, 18 insertions, 54 deletions

diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7
index c6d933ab802..45dfaf58f1b 100644
--- a/share/man/man7/ascii.7
+++ b/share/man/man7/ascii.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ascii.7,v 1.4 2002/01/24 21:27:43 mickey Exp $
+.\"	$OpenBSD: ascii.7,v 1.5 2003/06/02 23:30:14 millert Exp $
 .\"	$NetBSD: ascii.7,v 1.3 1994/11/30 19:07:06 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 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/man7/environ.7 b/share/man/man7/environ.7
index b0393bcedaf..c8432a8649b 100644
--- a/share/man/man7/environ.7
+++ b/share/man/man7/environ.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: environ.7,v 1.11 2001/12/28 08:56:07 provos Exp $
+.\"	$OpenBSD: environ.7,v 1.12 2003/06/02 23:30:14 millert Exp $
 .\"	$NetBSD: environ.7,v 1.4 1995/07/03 19:45:07 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 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/man7/hier.7 b/share/man/man7/hier.7
index e7b5211674a..02a5f9bb893 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.38 2003/05/24 15:23:45 jmc Exp $
+.\"	$OpenBSD: hier.7,v 1.39 2003/06/02 23:30:14 millert Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 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/man7/hostname.7 b/share/man/man7/hostname.7
index 47e539f1df2..22cd234022b 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.6 2001/10/05 14:45:54 mpech Exp $
+.\"	$OpenBSD: hostname.7,v 1.7 2003/06/02 23:30:14 millert Exp $
 .\"	$NetBSD: hostname.7,v 1.4 1994/11/30 19:07:14 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 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/man7/intro.7 b/share/man/man7/intro.7
index 99382515acc..61a097e48c1 100644
--- a/share/man/man7/intro.7
+++ b/share/man/man7/intro.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.7,v 1.8 2003/04/13 11:06:21 jmc Exp $
+.\"	$OpenBSD: intro.7,v 1.9 2003/06/02 23:30:15 millert Exp $
 .\"	$NetBSD: intro.7,v 1.3 1994/11/30 19:07:15 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 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/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index 1bbd4ad8879..a097d0b8167 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mailaddr.7,v 1.6 2001/10/04 16:56:52 mpech Exp $
+.\"	$OpenBSD: mailaddr.7,v 1.7 2003/06/02 23:30:15 millert Exp $
 .\"	$NetBSD: mailaddr.7,v 1.3 1994/11/30 19:07:17 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1990, 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/man7/mdoc.7 b/share/man/man7/mdoc.7
index 4917511ea2b..67410b17372 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.26 2003/05/29 08:46:22 jmc Exp $
+.\"	$OpenBSD: mdoc.7,v 1.27 2003/06/02 23:30:15 millert Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	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/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 06f2eb5d18e..f39702bdb64 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.samples.7,v 1.41 2003/05/29 08:46:22 jmc Exp $
+.\"	$OpenBSD: mdoc.samples.7,v 1.42 2003/06/02 23:30:15 millert Exp $
 .\"	$NetBSD: mdoc.samples.7,v 1.5 1996/04/03 20:17:34 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 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/man7/operator.7 b/share/man/man7/operator.7
index dd0bd4f582d..b092eef19c3 100644
--- a/share/man/man7/operator.7
+++ b/share/man/man7/operator.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: operator.7,v 1.3 2000/03/19 19:25:36 aaron Exp $
+.\"	$OpenBSD: operator.7,v 1.4 2003/06/02 23:30:15 millert Exp $
 .\"	$NetBSD: operator.7,v 1.3 1994/11/30 19:07:26 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 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.
 .\"