summaryrefslogtreecommitdiffstats
path: root/bin/pkill
diff options
context:
space:
mode:
authorjoel <joel@FreeBSD.org>2010-03-02 07:20:46 +0000
committerjoel <joel@FreeBSD.org>2010-03-02 07:20:46 +0000
commit28ff8df2d52062503e9d8ce6d623e0c88b029330 (patch)
tree76e8f13ca3f0836ecaece8781f7cefaf1c7b6a51 /bin/pkill
parentf34ce3dd384c7e26c5474a869851a24b36a10df2 (diff)
downloadFreeBSD-src-28ff8df2d52062503e9d8ce6d623e0c88b029330.zip
FreeBSD-src-28ff8df2d52062503e9d8ce6d623e0c88b029330.tar.gz
The NetBSD Foundation has granted permission to remove clause 3 and 4 from
their software. Approved by: pjd Obtained from: NetBSD
Diffstat (limited to 'bin/pkill')
-rw-r--r--bin/pkill/pkill.17
-rw-r--r--bin/pkill/pkill.c7
2 files changed, 0 insertions, 14 deletions
diff --git a/bin/pkill/pkill.1 b/bin/pkill/pkill.1
index 5eec10f..0c666e5 100644
--- a/bin/pkill/pkill.1
+++ b/bin/pkill/pkill.1
@@ -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
diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index a2d5f47..7876b87 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -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
OpenPOWER on IntegriCloud