summaryrefslogtreecommitdiff
path: root/usr.bin/join
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/join
parent864187d8a6f9d3b3fc66c5324b403e950befee52 (diff)
downloadsrc-test-da52b4caaf187775f6b56a72c6b16e94ad728f7b.tar.gz
src-test-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/join')
-rw-r--r--usr.bin/join/join.14
-rw-r--r--usr.bin/join/join.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index d9efccfd5dc61..3b91390a1e634 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -12,10 +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 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/join/join.c b/usr.bin/join/join.c
index 097ecbe743f9b..12e98031c41bc 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -14,10 +14,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.