aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/paste
diff options
context:
space:
mode:
authorJoel Dahl <joel@FreeBSD.org>2010-12-11 08:32:16 +0000
committerJoel Dahl <joel@FreeBSD.org>2010-12-11 08:32:16 +0000
commitda52b4caaf187775f6b56a72c6b16e94ad728f7b (patch)
tree5570a8a027e3011357d1c937cdaa4197cc734d59 /usr.bin/paste
parent864187d8a6f9d3b3fc66c5324b403e950befee52 (diff)
downloadsrc-da52b4caaf187775f6b56a72c6b16e94ad728f7b.tar.gz
src-da52b4caaf187775f6b56a72c6b16e94ad728f7b.zip
Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change Also add $FreeBSD$ to a few files to keep svn happy. Discussed with: imp, rwatson
Notes
Notes: svn path=/head/; revision=216370
Diffstat (limited to 'usr.bin/paste')
-rw-r--r--usr.bin/paste/paste.14
-rw-r--r--usr.bin/paste/paste.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 6b8ed0de12bd..a8d38a026bed 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -13,10 +13,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 University of
-.\" California, Berkeley and its contributors.
.\" 4. 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/paste/paste.c b/usr.bin/paste/paste.c
index 6e3e5539d0c0..e907d2c16868 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -13,10 +13,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 University of
- * California, Berkeley and its contributors.
* 4. 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.