Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

11 files changed, 22 insertions, 66 deletions

diff --git a/usr.bin/mail/USD.doc/mail0.nr b/usr.bin/mail/USD.doc/mail0.nr
index 73431aad098..9e3fff56ba7 100644
--- a/usr.bin/mail/USD.doc/mail0.nr
+++ b/usr.bin/mail/USD.doc/mail0.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail0.nr,v 1.2 1996/06/11 12:54:18 deraadt Exp $
+.\"	$OpenBSD: mail0.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail1.nr b/usr.bin/mail/USD.doc/mail1.nr
index 4e0176fcf56..71f6cb5895e 100644
--- a/usr.bin/mail/USD.doc/mail1.nr
+++ b/usr.bin/mail/USD.doc/mail1.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail1.nr,v 1.2 1996/06/11 12:54:18 deraadt Exp $
+.\"	$OpenBSD: mail1.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail2.nr b/usr.bin/mail/USD.doc/mail2.nr
index 5057db7128c..6962f8e2972 100644
--- a/usr.bin/mail/USD.doc/mail2.nr
+++ b/usr.bin/mail/USD.doc/mail2.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail2.nr,v 1.3 1997/07/13 23:35:49 millert Exp $
+.\"	$OpenBSD: mail2.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail3.nr b/usr.bin/mail/USD.doc/mail3.nr
index d6477b657b8..df934202be2 100644
--- a/usr.bin/mail/USD.doc/mail3.nr
+++ b/usr.bin/mail/USD.doc/mail3.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail3.nr,v 1.2 1996/06/11 12:54:20 deraadt Exp $
+.\"	$OpenBSD: mail3.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail4.nr b/usr.bin/mail/USD.doc/mail4.nr
index f66aade88fc..6c8a901b58a 100644
--- a/usr.bin/mail/USD.doc/mail4.nr
+++ b/usr.bin/mail/USD.doc/mail4.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail4.nr,v 1.3 1997/07/13 23:35:49 millert Exp $
+.\"	$OpenBSD: mail4.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index 2a51d682bb1..145a3119645 100644
--- a/usr.bin/mail/USD.doc/mail5.nr
+++ b/usr.bin/mail/USD.doc/mail5.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail5.nr,v 1.3 1997/07/13 23:35:50 millert Exp $
+.\"	$OpenBSD: mail5.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail6.nr b/usr.bin/mail/USD.doc/mail6.nr
index 063aa454f34..cbbc47ebec5 100644
--- a/usr.bin/mail/USD.doc/mail6.nr
+++ b/usr.bin/mail/USD.doc/mail6.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail6.nr,v 1.3 1997/07/13 23:35:50 millert Exp $
+.\"	$OpenBSD: mail6.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail7.nr b/usr.bin/mail/USD.doc/mail7.nr
index c7da12026af..eeb858ee1a8 100644
--- a/usr.bin/mail/USD.doc/mail7.nr
+++ b/usr.bin/mail/USD.doc/mail7.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail7.nr,v 1.2 1996/06/11 12:54:23 deraadt Exp $
+.\"	$OpenBSD: mail7.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail8.nr b/usr.bin/mail/USD.doc/mail8.nr
index 291b4bd58a1..76cdd339c28 100644
--- a/usr.bin/mail/USD.doc/mail8.nr
+++ b/usr.bin/mail/USD.doc/mail8.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail8.nr,v 1.3 1997/07/13 23:35:51 millert Exp $
+.\"	$OpenBSD: mail8.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/mail9.nr b/usr.bin/mail/USD.doc/mail9.nr
index efa569537bd..ed780716447 100644
--- a/usr.bin/mail/USD.doc/mail9.nr
+++ b/usr.bin/mail/USD.doc/mail9.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail9.nr,v 1.3 1997/07/13 23:35:51 millert Exp $
+.\"	$OpenBSD: mail9.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/mail/USD.doc/maila.nr b/usr.bin/mail/USD.doc/maila.nr
index 3a66facc7db..51e284dce2f 100644
--- a/usr.bin/mail/USD.doc/maila.nr
+++ b/usr.bin/mail/USD.doc/maila.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: maila.nr,v 1.2 1996/06/11 12:54:25 deraadt Exp $
+.\"	$OpenBSD: maila.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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.
 .\"