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/papers/px/fig1.1.n b/share/doc/papers/px/fig1.1.n
index 0be69361219..63d32ea59d4 100644
--- a/share/doc/papers/px/fig1.1.n
+++ b/share/doc/papers/px/fig1.1.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fig1.1.n,v 1.2 2001/02/03 08:14:59 niklas Exp $
+.\"	$OpenBSD: fig1.1.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/fig1.2.n b/share/doc/papers/px/fig1.2.n
index 6b98002039c..3e49cd90428 100644
--- a/share/doc/papers/px/fig1.2.n
+++ b/share/doc/papers/px/fig1.2.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fig1.2.n,v 1.2 2001/02/03 08:14:59 niklas Exp $
+.\"	$OpenBSD: fig1.2.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/fig1.3.n b/share/doc/papers/px/fig1.3.n
index ad8230969cd..dcb51fd023a 100644
--- a/share/doc/papers/px/fig1.3.n
+++ b/share/doc/papers/px/fig1.3.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fig1.3.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: fig1.3.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/fig2.4.n b/share/doc/papers/px/fig2.4.n
index 383a6626387..54dde982fc5 100644
--- a/share/doc/papers/px/fig2.4.n
+++ b/share/doc/papers/px/fig2.4.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fig2.4.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: fig2.4.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/fig3.2.n b/share/doc/papers/px/fig3.2.n
index 5e9e8dcc582..f64817205bd 100644
--- a/share/doc/papers/px/fig3.2.n
+++ b/share/doc/papers/px/fig3.2.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fig3.2.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: fig3.2.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/fig3.3.n b/share/doc/papers/px/fig3.3.n
index ac8dcfdfd8e..722b206b453 100644
--- a/share/doc/papers/px/fig3.3.n
+++ b/share/doc/papers/px/fig3.3.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fig3.3.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: fig3.3.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/pxin0.n b/share/doc/papers/px/pxin0.n
index b61ac7fead8..0d5b693748d 100644
--- a/share/doc/papers/px/pxin0.n
+++ b/share/doc/papers/px/pxin0.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pxin0.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: pxin0.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/pxin1.n b/share/doc/papers/px/pxin1.n
index f02e8b2f93c..f4c29b5f2fc 100644
--- a/share/doc/papers/px/pxin1.n
+++ b/share/doc/papers/px/pxin1.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pxin1.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: pxin1.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/pxin2.n b/share/doc/papers/px/pxin2.n
index 86cf1c0f5c4..c036c71c797 100644
--- a/share/doc/papers/px/pxin2.n
+++ b/share/doc/papers/px/pxin2.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pxin2.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: pxin2.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/pxin3.n b/share/doc/papers/px/pxin3.n
index d75aab8c530..24be98673a0 100644
--- a/share/doc/papers/px/pxin3.n
+++ b/share/doc/papers/px/pxin3.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pxin3.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: pxin3.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/pxin4.n b/share/doc/papers/px/pxin4.n
index 68a48d356f9..c2827c4f718 100644
--- a/share/doc/papers/px/pxin4.n
+++ b/share/doc/papers/px/pxin4.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pxin4.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: pxin4.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/table2.1.n b/share/doc/papers/px/table2.1.n
index fc2dc378864..7396ed88e1c 100644
--- a/share/doc/papers/px/table2.1.n
+++ b/share/doc/papers/px/table2.1.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: table2.1.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: table2.1.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/table2.2.n b/share/doc/papers/px/table2.2.n
index be0696d2ffe..2fd55d02010 100644
--- a/share/doc/papers/px/table2.2.n
+++ b/share/doc/papers/px/table2.2.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: table2.2.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: table2.2.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/table2.3.n b/share/doc/papers/px/table2.3.n
index f71add1c7b5..37da10da649 100644
--- a/share/doc/papers/px/table2.3.n
+++ b/share/doc/papers/px/table2.3.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: table2.3.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: table2.3.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/table3.1.n b/share/doc/papers/px/table3.1.n
index b33e29ebf1d..af7a98e6ace 100644
--- a/share/doc/papers/px/table3.1.n
+++ b/share/doc/papers/px/table3.1.n
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: table3.1.n,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: table3.1.n,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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/papers/px/tmac.p b/share/doc/papers/px/tmac.p
index 6a0d2c9bc8e..678a8773c07 100644
--- a/share/doc/papers/px/tmac.p
+++ b/share/doc/papers/px/tmac.p
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tmac.p,v 1.2 2001/02/03 08:15:00 niklas Exp $
+.\"	$OpenBSD: tmac.p,v 1.3 2003/06/02 23:30:10 millert Exp $
 .\"
 .\" Copyright (c) 1979 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.
 .\"