From 05a1bb0a4a9fe7fe540da70e734e8421b3f7ac07 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 16 Feb 2010 19:46:46 +0000 Subject: Remove clause 3 from Berkeley copyrights. Add a few $FreeBSD$'s. --- include/arpa/ftp.h | 8 +++----- include/arpa/inet.h | 6 +----- include/arpa/nameser.h | 6 +----- include/arpa/nameser_compat.h | 6 +----- include/arpa/telnet.h | 6 +----- include/arpa/tftp.h | 6 +----- 6 files changed, 8 insertions(+), 30 deletions(-) (limited to 'include/arpa') diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h index 9a36488..081c037 100644 --- a/include/arpa/ftp.h +++ b/include/arpa/ftp.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. 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. * @@ -31,6 +27,8 @@ * SUCH DAMAGE. * * @(#)ftp.h 8.1 (Berkeley) 6/2/93 + * + * $FreeBSD$ */ #ifndef _ARPA_FTP_H_ diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 0848106..c0695eb 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. 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/include/arpa/nameser.h b/include/arpa/nameser.h index ce2f2e0..1f5ce45 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. 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/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h index 64d05f8..161fed3 100644 --- a/include/arpa/nameser_compat.h +++ b/include/arpa/nameser_compat.h @@ -9,11 +9,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. 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/include/arpa/telnet.h b/include/arpa/telnet.h index 26f75fb..758e9b8 100644 --- a/include/arpa/telnet.h +++ b/include/arpa/telnet.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. 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/include/arpa/tftp.h b/include/arpa/tftp.h index eef9d4d..5c2a4c7 100644 --- a/include/arpa/tftp.h +++ b/include/arpa/tftp.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. 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. * -- cgit v1.1