Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

16 files changed, 32 insertions, 96 deletions

diff --git a/share/doc/smm/18.net/0.t b/share/doc/smm/18.net/0.t
index 7e1f26a48cb..cb36a129580 100644
--- a/share/doc/smm/18.net/0.t
+++ b/share/doc/smm/18.net/0.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 0.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 0.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/1.t b/share/doc/smm/18.net/1.t
index 3dc017189a6..7af903fae07 100644
--- a/share/doc/smm/18.net/1.t
+++ b/share/doc/smm/18.net/1.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 1.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 1.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/2.t b/share/doc/smm/18.net/2.t
index 3cdce2a4493..4240dc10c5f 100644
--- a/share/doc/smm/18.net/2.t
+++ b/share/doc/smm/18.net/2.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 2.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 2.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/3.t b/share/doc/smm/18.net/3.t
index 09852840289..4278acbd055 100644
--- a/share/doc/smm/18.net/3.t
+++ b/share/doc/smm/18.net/3.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 3.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 3.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/4.t b/share/doc/smm/18.net/4.t
index 94d6fe4da69..5037106a47f 100644
--- a/share/doc/smm/18.net/4.t
+++ b/share/doc/smm/18.net/4.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 4.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 4.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/5.t b/share/doc/smm/18.net/5.t
index 339b8f031d6..006375527a1 100644
--- a/share/doc/smm/18.net/5.t
+++ b/share/doc/smm/18.net/5.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 5.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 5.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/6.t b/share/doc/smm/18.net/6.t
index 361076fb331..e8a4b99636e 100644
--- a/share/doc/smm/18.net/6.t
+++ b/share/doc/smm/18.net/6.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 6.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 6.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/7.t b/share/doc/smm/18.net/7.t
index f529082f565..7b431c2da09 100644
--- a/share/doc/smm/18.net/7.t
+++ b/share/doc/smm/18.net/7.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 7.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 7.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/8.t b/share/doc/smm/18.net/8.t
index 5974560a876..e837ab214f9 100644
--- a/share/doc/smm/18.net/8.t
+++ b/share/doc/smm/18.net/8.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 8.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 8.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/9.t b/share/doc/smm/18.net/9.t
index 3de396a4444..3b28f017aa2 100644
--- a/share/doc/smm/18.net/9.t
+++ b/share/doc/smm/18.net/9.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 9.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: 9.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/a.t b/share/doc/smm/18.net/a.t
index 84deb743707..3ff56276610 100644
--- a/share/doc/smm/18.net/a.t
+++ b/share/doc/smm/18.net/a.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: a.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: a.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/b.t b/share/doc/smm/18.net/b.t
index 8a35c1cfc2a..a4fa1fe5493 100644
--- a/share/doc/smm/18.net/b.t
+++ b/share/doc/smm/18.net/b.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: b.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: b.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/c.t b/share/doc/smm/18.net/c.t
index 6d4efb53596..fead405cc6a 100644
--- a/share/doc/smm/18.net/c.t
+++ b/share/doc/smm/18.net/c.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: c.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: c.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/d.t b/share/doc/smm/18.net/d.t
index 3e163187616..d7044b7009a 100644
--- a/share/doc/smm/18.net/d.t
+++ b/share/doc/smm/18.net/d.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: d.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: d.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/e.t b/share/doc/smm/18.net/e.t
index df7297e5791..9b6117abf64 100644
--- a/share/doc/smm/18.net/e.t
+++ b/share/doc/smm/18.net/e.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: e.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: e.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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/smm/18.net/f.t b/share/doc/smm/18.net/f.t
index 6433b35f16c..2b202aff843 100644
--- a/share/doc/smm/18.net/f.t
+++ b/share/doc/smm/18.net/f.t
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: f.t,v 1.2 2001/02/03 08:15:09 niklas Exp $
+.\"	$OpenBSD: f.t,v 1.3 2003/06/02 23:30:11 millert Exp $
 .\"
 .\" Copyright (c) 1983, 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.
 .\"