summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libexec/tcpd/safe_finger/safe_finger.89
-rw-r--r--regress/sys/kern/mmap/mmaptest.c5
-rw-r--r--share/man/man4/eephy.45
-rw-r--r--share/man/man8/boot_config.85
-rw-r--r--share/man/man8/compat_bsdos.89
-rw-r--r--sys/arch/mvme68k/stand/netboot/boot.c7
-rw-r--r--sys/arch/mvme68k/stand/netboot/config.h7
-rw-r--r--sys/arch/mvme88k/dev/memdevs.c7
-rw-r--r--sys/arch/mvme88k/dev/vme.c7
-rw-r--r--sys/arch/mvme88k/dev/vme.h7
-rw-r--r--sys/arch/mvme88k/dev/vmel.c7
-rw-r--r--sys/arch/mvme88k/dev/vmes.c7
-rw-r--r--sys/arch/mvme88k/include/prom.h7
-rw-r--r--sys/arch/mvme88k/stand/netboot/boot.c7
-rw-r--r--sys/arch/mvme88k/stand/netboot/config.h7
-rw-r--r--sys/arch/sparc/dev/cgfour.c6
16 files changed, 17 insertions, 92 deletions
diff --git a/libexec/tcpd/safe_finger/safe_finger.8 b/libexec/tcpd/safe_finger/safe_finger.8
index 0c6c3ef8e31..9c13f4c1b6d 100644
--- a/libexec/tcpd/safe_finger/safe_finger.8
+++ b/libexec/tcpd/safe_finger/safe_finger.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: safe_finger.8,v 1.8 2001/08/02 18:37:34 mpech Exp $
+.\" $OpenBSD: safe_finger.8,v 1.9 2003/06/04 04:11:01 deraadt Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -10,13 +10,6 @@
.\" 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 Jason Downs for the
-.\" OpenBSD system.
-.\" 4. Neither the name(s) of the author(s) nor the name OpenBSD
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/regress/sys/kern/mmap/mmaptest.c b/regress/sys/kern/mmap/mmaptest.c
index 99ad04c9c87..3ee8944ee9d 100644
--- a/regress/sys/kern/mmap/mmaptest.c
+++ b/regress/sys/kern/mmap/mmaptest.c
@@ -1,4 +1,4 @@
-/* $Id: mmaptest.c,v 1.1 2001/06/19 08:41:59 niklas Exp $ */
+/* $Id: mmaptest.c,v 1.2 2003/06/04 04:11:36 deraadt Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist. All rights reserverd.
@@ -11,9 +11,6 @@
* 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 Theo de Raadt.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
diff --git a/share/man/man4/eephy.4 b/share/man/man4/eephy.4
index 68e11d3395d..510e0432955 100644
--- a/share/man/man4/eephy.4
+++ b/share/man/man4/eephy.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: eephy.4,v 1.7 2002/09/26 07:55:39 miod Exp $
+.\" $OpenBSD: eephy.4,v 1.8 2003/06/04 04:11:37 deraadt Exp $
.\"
.\"Copyright (c) 2001 by Parag Patel. All rights reserved.
.\"
@@ -10,9 +10,6 @@
.\" 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 Jason L. Wright
.\" 4. The name of the author may not be used to endorse or promote products
.\" derived from this software without specific prior written permission.
.\"
diff --git a/share/man/man8/boot_config.8 b/share/man/man8/boot_config.8
index 80c11d91576..c3d2260927b 100644
--- a/share/man/man8/boot_config.8
+++ b/share/man/man8/boot_config.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot_config.8,v 1.17 2001/10/05 14:45:54 mpech Exp $
+.\" $OpenBSD: boot_config.8,v 1.18 2003/06/04 04:11:37 deraadt Exp $
.\"
.\" Copyright (c) 1996 Mats O Jansson
.\" All rights reserved.
@@ -11,9 +11,6 @@
.\" 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 Theo de Raadt.
.\" 4. Neither the name of the author 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/man8/compat_bsdos.8 b/share/man/man8/compat_bsdos.8
index 30299e03120..2ebaf15ecb6 100644
--- a/share/man/man8/compat_bsdos.8
+++ b/share/man/man8/compat_bsdos.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: compat_bsdos.8,v 1.7 2003/05/10 21:40:54 jmc Exp $
+.\" $OpenBSD: compat_bsdos.8,v 1.8 2003/06/04 04:11:37 deraadt Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -10,13 +10,6 @@
.\" 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 Jason Downs for the
-.\" OpenBSD system.
-.\" 4. Neither the name(s) of the author(s) nor the name OpenBSD
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/sys/arch/mvme68k/stand/netboot/boot.c b/sys/arch/mvme68k/stand/netboot/boot.c
index 1bbfd3ec60a..64606904a83 100644
--- a/sys/arch/mvme68k/stand/netboot/boot.c
+++ b/sys/arch/mvme68k/stand/netboot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.8 2003/06/02 23:27:51 millert Exp $ */
+/* $OpenBSD: boot.c,v 1.9 2003/06/04 04:11:37 deraadt Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the Author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/sys/arch/mvme68k/stand/netboot/config.h b/sys/arch/mvme68k/stand/netboot/config.h
index c0911691e39..227306e7442 100644
--- a/sys/arch/mvme68k/stand/netboot/config.h
+++ b/sys/arch/mvme68k/stand/netboot/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.1 1996/05/16 02:52:05 chuck Exp $ */
+/* $OpenBSD: config.h,v 1.2 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the Author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/sys/arch/mvme88k/dev/memdevs.c b/sys/arch/mvme88k/dev/memdevs.c
index 9eebe15b9ec..6d0f3212ce9 100644
--- a/sys/arch/mvme88k/dev/memdevs.c
+++ b/sys/arch/mvme88k/dev/memdevs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memdevs.c,v 1.3 2001/03/08 00:03:13 miod Exp $ */
+/* $OpenBSD: memdevs.c,v 1.4 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c
index b6f10a63631..952ad59f815 100644
--- a/sys/arch/mvme88k/dev/vme.c
+++ b/sys/arch/mvme88k/dev/vme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vme.c,v 1.19 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: vme.c,v 1.20 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/mvme88k/dev/vme.h b/sys/arch/mvme88k/dev/vme.h
index ecdaf97ddb2..49909ac5e33 100644
--- a/sys/arch/mvme88k/dev/vme.h
+++ b/sys/arch/mvme88k/dev/vme.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vme.h,v 1.8 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: vme.h,v 1.9 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/mvme88k/dev/vmel.c b/sys/arch/mvme88k/dev/vmel.c
index d80c17def69..502ff2579cf 100644
--- a/sys/arch/mvme88k/dev/vmel.c
+++ b/sys/arch/mvme88k/dev/vmel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmel.c,v 1.10 2002/04/28 15:17:09 miod Exp $ */
+/* $OpenBSD: vmel.c,v 1.11 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c
index 1b7bcb0c1a5..8d349c5128a 100644
--- a/sys/arch/mvme88k/dev/vmes.c
+++ b/sys/arch/mvme88k/dev/vmes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmes.c,v 1.10 2002/04/28 15:17:09 miod Exp $ */
+/* $OpenBSD: vmes.c,v 1.11 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h
index f3d1a84a20d..5fc34b43042 100644
--- a/sys/arch/mvme88k/include/prom.h
+++ b/sys/arch/mvme88k/include/prom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: prom.h,v 1.9 2002/03/05 22:11:40 miod Exp $ */
+/* $OpenBSD: prom.h,v 1.10 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1998 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -13,10 +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 Theo de Raadt
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/sys/arch/mvme88k/stand/netboot/boot.c b/sys/arch/mvme88k/stand/netboot/boot.c
index f7ccfc9502a..8b694a3a19c 100644
--- a/sys/arch/mvme88k/stand/netboot/boot.c
+++ b/sys/arch/mvme88k/stand/netboot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.5 2003/06/02 23:27:52 millert Exp $ */
+/* $OpenBSD: boot.c,v 1.6 2003/06/04 04:11:37 deraadt Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the Author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/sys/arch/mvme88k/stand/netboot/config.h b/sys/arch/mvme88k/stand/netboot/config.h
index 895f749d0f9..1ff6a4153a6 100644
--- a/sys/arch/mvme88k/stand/netboot/config.h
+++ b/sys/arch/mvme88k/stand/netboot/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.2 1999/05/29 04:41:48 smurph Exp $ */
+/* $OpenBSD: config.h,v 1.3 2003/06/04 04:11:37 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -12,11 +12,6 @@
* 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 Theo de Raadt
- * 4. The name of the Author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index f171591813a..4206c50d06e 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgfour.c,v 1.19 2003/06/02 23:27:53 millert Exp $ */
+/* $OpenBSD: cgfour.c,v 1.20 2003/06/04 04:11:37 deraadt Exp $ */
/* $NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $ */
/*
@@ -8,10 +8,6 @@
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Theo de Raadt.
- *
* This software was developed by the Computer Systems Engineering group
* at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
* contributed to Berkeley.