diff options
| -rw-r--r-- | libexec/ftpd/logutmp.c | 8 | ||||
| -rw-r--r-- | sbin/dump/dump.8 | 8 | ||||
| -rw-r--r-- | share/man/man0/COPYRIGHT | 8 | ||||
| -rw-r--r-- | usr.bin/man/config.h | 8 | ||||
| -rw-r--r-- | usr.sbin/ppp/ppp/slcompress.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ppp/ppp/slcompress.h | 8 | ||||
| -rw-r--r-- | usr.sbin/syslogd/syslogd.8 | 8 | ||||
| -rw-r--r-- | usr.sbin/ypserv/common/ypdb.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ypserv/common/ypdb.h | 8 |
9 files changed, 18 insertions, 54 deletions
diff --git a/libexec/ftpd/logutmp.c b/libexec/ftpd/logutmp.c index 840d4a99e8f..f83ba589b9c 100644 --- a/libexec/ftpd/logutmp.c +++ b/libexec/ftpd/logutmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logutmp.c,v 1.4 2001/12/07 18:45:32 mpech Exp $ */ +/* $OpenBSD: logutmp.c,v 1.5 2003/06/04 16:08:08 deraadt Exp $ */ /* * Portions Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. @@ -12,11 +12,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/sbin/dump/dump.8 b/sbin/dump/dump.8 index 298c8e361ad..05b179cce3d 100644 --- a/sbin/dump/dump.8 +++ b/sbin/dump/dump.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dump.8,v 1.32 2003/06/03 13:16:08 jmc Exp $ +.\" $OpenBSD: dump.8,v 1.33 2003/06/04 16:08:07 deraadt Exp $ .\" $NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -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. .\" diff --git a/share/man/man0/COPYRIGHT b/share/man/man0/COPYRIGHT index ef26ae70390..a91467b607b 100644 --- a/share/man/man0/COPYRIGHT +++ b/share/man/man0/COPYRIGHT @@ -1,4 +1,4 @@ -# $OpenBSD: COPYRIGHT,v 1.2 2001/01/29 02:11:07 niklas Exp $ +# $OpenBSD: COPYRIGHT,v 1.3 2003/06/04 16:08:07 deraadt Exp $ # @(#)COPYRIGHT 5.1 (Berkeley) 7/1/91 @@ -17,11 +17,7 @@ are met: 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/config.h b/usr.bin/man/config.h index 30cd97677bf..85eb9dd107e 100644 --- a/usr.bin/man/config.h +++ b/usr.bin/man/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.3 2002/02/16 21:27:48 millert Exp $ */ +/* $OpenBSD: config.h,v 1.4 2003/06/04 16:08:08 deraadt Exp $ */ /* $NetBSD: config.h,v 1.2 1995/09/28 06:05:28 tls Exp $ */ /*- @@ -14,11 +14,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.sbin/ppp/ppp/slcompress.c b/usr.sbin/ppp/ppp/slcompress.c index 5340e53ffc8..20b508444ee 100644 --- a/usr.sbin/ppp/ppp/slcompress.c +++ b/usr.sbin/ppp/ppp/slcompress.c @@ -10,11 +10,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. * @@ -40,7 +36,7 @@ * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989: * - Initial distribution. * - * $OpenBSD: slcompress.c,v 1.16 2003/06/02 04:29:23 millert Exp $ + * $OpenBSD: slcompress.c,v 1.17 2003/06/04 16:08:08 deraadt Exp $ */ #include <sys/param.h> diff --git a/usr.sbin/ppp/ppp/slcompress.h b/usr.sbin/ppp/ppp/slcompress.h index 929e7d2be45..054ad39c6eb 100644 --- a/usr.sbin/ppp/ppp/slcompress.h +++ b/usr.sbin/ppp/ppp/slcompress.h @@ -12,11 +12,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. * @@ -35,7 +31,7 @@ * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989: * - Initial distribution. * - * $OpenBSD: slcompress.h,v 1.6 2003/06/02 04:29:23 millert Exp $ + * $OpenBSD: slcompress.h,v 1.7 2003/06/04 16:08:08 deraadt Exp $ */ #define MIN_VJ_STATES 3 diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8 index 69125a824c7..b89890d8c2e 100644 --- a/usr.sbin/syslogd/syslogd.8 +++ b/usr.sbin/syslogd/syslogd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: syslogd.8,v 1.16 2003/05/08 05:05:27 millert Exp $ +.\" $OpenBSD: syslogd.8,v 1.17 2003/06/04 16:08:08 deraadt Exp $ .\" .\" Copyright (c) 1983, 1986, 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 acknowledgment: -.\" 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.sbin/ypserv/common/ypdb.c b/usr.sbin/ypserv/common/ypdb.c index 0d9fadde304..f2e62f32176 100644 --- a/usr.sbin/ypserv/common/ypdb.c +++ b/usr.sbin/ypserv/common/ypdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypdb.c,v 1.9 2002/07/19 20:59:40 deraadt Exp $ */ +/* $OpenBSD: ypdb.c,v 1.10 2003/06/04 16:08:08 deraadt Exp $ */ /* * Copyright (c) 1990, 1993 @@ -19,11 +19,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.sbin/ypserv/common/ypdb.h b/usr.sbin/ypserv/common/ypdb.h index 548ae97f241..ece6ed3f90e 100644 --- a/usr.sbin/ypserv/common/ypdb.h +++ b/usr.sbin/ypserv/common/ypdb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ypdb.h,v 1.7 2002/07/19 02:38:40 deraadt Exp $ */ +/* $OpenBSD: ypdb.h,v 1.8 2003/06/04 16:08:08 deraadt Exp $ */ /* * Copyright (c) 1990, 1993 @@ -19,11 +19,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. * |