aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/arpa/ftp.h8
-rw-r--r--include/arpa/inet.h6
-rw-r--r--include/arpa/nameser.h6
-rw-r--r--include/arpa/nameser_compat.h6
-rw-r--r--include/arpa/telnet.h6
-rw-r--r--include/arpa/tftp.h6
-rw-r--r--include/protocols/dumprestore.h6
-rw-r--r--include/protocols/routed.h6
-rw-r--r--include/protocols/rwhod.h8
-rw-r--r--include/protocols/talkd.h8
-rw-r--r--include/protocols/timed.h6
11 files changed, 17 insertions, 55 deletions
diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h
index 9a3648854017..081c037ecb30 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 084810692b79..c0695ebbd28d 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 ce2f2e062a4c..1f5ce4539f24 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 64d05f828721..161fed355c36 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 26f75fb31303..758e9b83451e 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 eef9d4dc513f..5c2a4c7eeadc 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.
*
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index b4e6ec9a08ac..d6740a6193af 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -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.
*
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index b55b62250788..bf1604549c66 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.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 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.
*
diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h
index fbfe2ed7cb04..f63bf76b4893 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.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.
*
* @(#)rwhod.h 8.1 (Berkeley) 6/2/93
+ *
+ * $FreeBSD$
*/
#ifndef _PROTOCOLS_RWHOD_H_
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 962e47be7e0d..3b2f0de6654e 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.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.
*
* @(#)talkd.h 8.1 (Berkeley) 6/2/93
+ *
+ * $FreeBSD$
*/
#ifndef _PROTOCOLS_TALKD_H_
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index faa44e4e49fd..18747be7a111 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.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.
*