Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

8 files changed, 16 insertions, 48 deletions

diff --git a/share/tmac/mdoc/README b/share/tmac/mdoc/README
index 04807c5b2b7..f36ad131a8e 100644
--- a/share/tmac/mdoc/README
+++ b/share/tmac/mdoc/README
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: README,v 1.2 1996/08/24 07:47:06 etheisen Exp $
+.\"	$OpenBSD: README,v 1.3 2003/06/02 23:30:16 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/tmac/mdoc/doc b/share/tmac/mdoc/doc
index 7bd079bc0e0..92fcd56db47 100644
--- a/share/tmac/mdoc/doc
+++ b/share/tmac/mdoc/doc
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc,v 1.5 2001/01/23 06:29:33 marc Exp $
+.\"	$OpenBSD: doc,v 1.6 2003/06/02 23:30:16 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/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index 55ec290bb3f..8cec3811630 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.30 2003/02/12 23:07:28 deraadt Exp $
+.\"	$OpenBSD: doc-common,v 1.31 2003/06/02 23:30:16 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/tmac/mdoc/doc-ditroff b/share/tmac/mdoc/doc-ditroff
index 294e2841b95..d13a0bb2ff6 100644
--- a/share/tmac/mdoc/doc-ditroff
+++ b/share/tmac/mdoc/doc-ditroff
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-ditroff,v 1.2 1996/08/24 07:47:08 etheisen Exp $
+.\"	$OpenBSD: doc-ditroff,v 1.3 2003/06/02 23:30:16 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/tmac/mdoc/doc-nroff b/share/tmac/mdoc/doc-nroff
index 8db3cb623fe..cb5370f812f 100644
--- a/share/tmac/mdoc/doc-nroff
+++ b/share/tmac/mdoc/doc-nroff
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-nroff,v 1.3 2003/03/01 21:13:38 jason Exp $
+.\"	$OpenBSD: doc-nroff,v 1.4 2003/06/02 23:30:16 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/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms
index af2836ec5ed..8c0ad4ce23e 100644
--- a/share/tmac/mdoc/doc-syms
+++ b/share/tmac/mdoc/doc-syms
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-syms,v 1.45 2003/05/02 16:34:04 jason Exp $
+.\"	$OpenBSD: doc-syms,v 1.46 2003/06/02 23:30:16 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/tmac/strip.sed b/share/tmac/strip.sed
index e296eb3e00f..4429c2c8b35 100644
--- a/share/tmac/strip.sed
+++ b/share/tmac/strip.sed
@@ -1,6 +1,6 @@
 #! /bin/sed -f
 #
-#	$OpenBSD: strip.sed,v 1.1 1996/08/24 07:47:05 etheisen Exp $
+#	$OpenBSD: strip.sed,v 1.2 2003/06/02 23:30:16 millert Exp $
 #
 # Copyright (c) 1988, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -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/share/tmac/tmac.andoc b/share/tmac/tmac.andoc
index 5b1d2da3371..15babd1ac5a 100644
--- a/share/tmac/tmac.andoc
+++ b/share/tmac/tmac.andoc
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tmac.andoc,v 1.3 1996/09/03 23:14:38 etheisen Exp $
+.\"	$OpenBSD: tmac.andoc,v 1.4 2003/06/02 23:30:16 millert Exp $
 .\"
 .\"
 .\" Copyright (c) 1990 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.
 .\"