svn commit: r203965 - in head/include: arpa protocols
Warner Losh
imp at FreeBSD.org
Tue Feb 16 19:46:47 UTC 2010
Author: imp
Date: Tue Feb 16 19:46:46 2010
New Revision: 203965
URL: http://svn.freebsd.org/changeset/base/203965
Log:
Remove clause 3 from Berkeley copyrights. Add a few $FreeBSD$'s.
Modified:
head/include/arpa/ftp.h
head/include/arpa/inet.h
head/include/arpa/nameser.h
head/include/arpa/nameser_compat.h
head/include/arpa/telnet.h
head/include/arpa/tftp.h
head/include/protocols/dumprestore.h
head/include/protocols/routed.h
head/include/protocols/rwhod.h
head/include/protocols/talkd.h
head/include/protocols/timed.h
Modified: head/include/arpa/ftp.h
==============================================================================
--- head/include/arpa/ftp.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/arpa/ftp.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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_
Modified: head/include/arpa/inet.h
==============================================================================
--- head/include/arpa/inet.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/arpa/inet.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
Modified: head/include/arpa/nameser.h
==============================================================================
--- head/include/arpa/nameser.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/arpa/nameser.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
Modified: head/include/arpa/nameser_compat.h
==============================================================================
--- head/include/arpa/nameser_compat.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/arpa/nameser_compat.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
Modified: head/include/arpa/telnet.h
==============================================================================
--- head/include/arpa/telnet.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/arpa/telnet.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
Modified: head/include/arpa/tftp.h
==============================================================================
--- head/include/arpa/tftp.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/arpa/tftp.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
Modified: head/include/protocols/dumprestore.h
==============================================================================
--- head/include/protocols/dumprestore.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/protocols/dumprestore.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -15,11 +15,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.
*
Modified: head/include/protocols/routed.h
==============================================================================
--- head/include/protocols/routed.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/protocols/routed.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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 acknowledgment:
- * 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.
*
Modified: head/include/protocols/rwhod.h
==============================================================================
--- head/include/protocols/rwhod.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/protocols/rwhod.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
* @(#)rwhod.h 8.1 (Berkeley) 6/2/93
+ *
+ * $FreeBSD$
*/
#ifndef _PROTOCOLS_RWHOD_H_
Modified: head/include/protocols/talkd.h
==============================================================================
--- head/include/protocols/talkd.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/protocols/talkd.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
* @(#)talkd.h 8.1 (Berkeley) 6/2/93
+ *
+ * $FreeBSD$
*/
#ifndef _PROTOCOLS_TALKD_H_
Modified: head/include/protocols/timed.h
==============================================================================
--- head/include/protocols/timed.h Tue Feb 16 19:39:50 2010 (r203964)
+++ head/include/protocols/timed.h Tue Feb 16 19:46:46 2010 (r203965)
@@ -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.
*
More information about the svn-src-head
mailing list