summaryrefslogtreecommitdiff
path: root/usr.bin/man
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-03 02:56:25 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-03 02:56:25 +0000
commitb532ca5cf72acd586a7c31dce5e4babf5991a2f7 (patch)
tree3562eeed20363794e06821f1da3817b9cde8052e /usr.bin/man
parentf48a5d6cd1eb9487e5e67c75dc5f6764b04cd99c (diff)
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'usr.bin/man')
-rw-r--r--usr.bin/man/config.c10
-rw-r--r--usr.bin/man/man.18
-rw-r--r--usr.bin/man/man.c10
-rw-r--r--usr.bin/man/man.conf.58
-rw-r--r--usr.bin/man/pathnames.h8
5 files changed, 12 insertions, 32 deletions
diff --git a/usr.bin/man/config.c b/usr.bin/man/config.c
index 1508e7ffaa1..a9d018e0339 100644
--- a/usr.bin/man/config.c
+++ b/usr.bin/man/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.3 2002/09/17 19:37:39 deraadt Exp $ */
+/* $OpenBSD: config.c,v 1.4 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: config.c,v 1.7 1995/09/28 06:05:21 tls Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)config.c 8.8 (Berkeley) 1/31/95";
#else
-static char rcsid[] = "$OpenBSD: config.c,v 1.3 2002/09/17 19:37:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: config.c,v 1.4 2003/06/03 02:56:12 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index 8ed927fbed4..9d69f265702 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: man.1,v 1.17 2002/01/24 20:33:45 mickey Exp $
+.\" $OpenBSD: man.1,v 1.18 2003/06/03 02:56:12 millert Exp $
.\"
.\" Copyright (c) 1989, 1990, 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/man/man.c b/usr.bin/man/man.c
index 21177aa6e46..329cc50f00e 100644
--- a/usr.bin/man/man.c
+++ b/usr.bin/man/man.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man.c,v 1.24 2003/03/13 09:09:32 deraadt Exp $ */
+/* $OpenBSD: man.c,v 1.25 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-static char rcsid[] = "$OpenBSD: man.c,v 1.24 2003/03/13 09:09:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: man.c,v 1.25 2003/06/03 02:56:12 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index 43667ba9c12..8014040a11a 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: man.conf.5,v 1.8 2003/01/21 19:59:09 jmc Exp $
+.\" $OpenBSD: man.conf.5,v 1.9 2003/06/03 02:56:12 millert Exp $
.\"
.\" Copyright (c) 1989, 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/usr.bin/man/pathnames.h b/usr.bin/man/pathnames.h
index 0881da63adf..4a00ef5ebdb 100644
--- a/usr.bin/man/pathnames.h
+++ b/usr.bin/man/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.4 1997/06/06 10:05:09 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.5 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/09/28 06:05:40 tls Exp $ */
/*
@@ -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.
*