summaryrefslogtreecommitdiff
path: root/sbin/atactl
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2008-06-26 05:42:22 +0000
committerRay Lai <ray@cvs.openbsd.org>2008-06-26 05:42:22 +0000
commit221ca3331fa5beace78c225151a345ba70d56b3f (patch)
tree050dc1233056bb4f3845bc4f00a7c5bd22c30ae7 /sbin/atactl
parent65e3473d3db16b6d497e1645484c444d12ad1ff7 (diff)
First pass at removing clauses 3 and 4 from NetBSD licenses.
Not sure what's more surprising: how long it took for NetBSD to catch up to the rest of the BSDs (including UCB), or the amount of code that NetBSD has claimed for itself without attributing to the actual authors. OK deraadt@
Diffstat (limited to 'sbin/atactl')
-rw-r--r--sbin/atactl/atactl.811
-rw-r--r--sbin/atactl/atactl.c9
2 files changed, 3 insertions, 17 deletions
diff --git a/sbin/atactl/atactl.8 b/sbin/atactl/atactl.8
index f09847dfe7b..40701468af0 100644
--- a/sbin/atactl/atactl.8
+++ b/sbin/atactl/atactl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: atactl.8,v 1.38 2008/06/03 19:51:02 jmc Exp $
+.\" $OpenBSD: atactl.8,v 1.39 2008/06/26 05:42:06 ray Exp $
.\" $NetBSD: atactl.8,v 1.5 1999/02/24 18:49:14 jwise Exp $
.\"
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -15,13 +15,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 the NetBSD
-.\" Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\" contributors may be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -35,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 3 2008 $
+.Dd $Mdocdate: June 26 2008 $
.Dt ATACTL 8
.Os
.Sh NAME
diff --git a/sbin/atactl/atactl.c b/sbin/atactl/atactl.c
index 6f82264ac63..45f6099823e 100644
--- a/sbin/atactl/atactl.c
+++ b/sbin/atactl/atactl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atactl.c,v 1.38 2007/09/02 15:19:23 deraadt Exp $ */
+/* $OpenBSD: atactl.c,v 1.39 2008/06/26 05:42:06 ray Exp $ */
/* $NetBSD: atactl.c,v 1.4 1999/02/24 18:49:14 jwise Exp $ */
/*-
@@ -16,13 +16,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED