Remove clause 3 from Berkeley copyrights. Add a few $FreeBSD$'s.

5 files changed, 9 insertions, 25 deletions

diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index b4e6ec9..d6740a6 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 b55b622..bf16045 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 fbfe2ed..f63bf76 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 962e47b..3b2f0de 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 faa44e4..18747be 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.
  *