Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

5 files changed, 9 insertions, 29 deletions

diff --git a/share/doc/usd/00.contents b/share/doc/usd/00.contents
index a92df1be2c5..fc2d097c698 100644
--- a/share/doc/usd/00.contents
+++ b/share/doc/usd/00.contents
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 00.contents,v 1.2 2001/02/03 08:15:10 niklas Exp $
+.\"	$OpenBSD: 00.contents,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1986, 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/doc/usd/18.msdiffs/ms.diffs b/share/doc/usd/18.msdiffs/ms.diffs
index 9911bf1ce39..a87fe160de1 100644
--- a/share/doc/usd/18.msdiffs/ms.diffs
+++ b/share/doc/usd/18.msdiffs/ms.diffs
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ms.diffs,v 1.2 2001/02/03 08:15:10 niklas Exp $
+.\"	$OpenBSD: ms.diffs,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/doc/usd/19.memacros/intro.me b/share/doc/usd/19.memacros/intro.me
index 2d8046a6216..8832ab881f9 100644
--- a/share/doc/usd/19.memacros/intro.me
+++ b/share/doc/usd/19.memacros/intro.me
@@ -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/share/doc/usd/20.meref/ref.me b/share/doc/usd/20.meref/ref.me
index a6d615918a5..1b078fa9d35 100644
--- a/share/doc/usd/20.meref/ref.me
+++ b/share/doc/usd/20.meref/ref.me
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ref.me,v 1.2 2001/02/03 08:15:11 niklas Exp $
+.\"	$OpenBSD: ref.me,v 1.3 2003/06/02 23:30:12 millert Exp $
 .\"
 .\" Copyright (c) 1986, 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/doc/usd/Title b/share/doc/usd/Title
index d39a30c53d2..b78e9d570d1 100644
--- a/share/doc/usd/Title
+++ b/share/doc/usd/Title
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: Title,v 1.2 2001/02/03 08:15:10 niklas Exp $
+.\"	$OpenBSD: Title,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1986, 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.
 .\"