svn commit: r216372 - in head/usr.sbin: config gpioctl iostat lpr/common_source lpr/filters lpr/lpc lpr/lpd lpr/lpq lpr/lpr lpr/lprm lpr/lptest lpr/pac timed/timed timed/timedc traceroute6

Joel Dahl joel at FreeBSD.org
Sat Dec 11 09:38:13 UTC 2010


Author: joel (doc committer)
Date: Sat Dec 11 09:38:12 2010
New Revision: 216372
URL: http://svn.freebsd.org/changeset/base/216372

Log:
  Remove the advertising clause from UCB copyrighted files in usr.sbin.  This
  is in accordance with the information provided at
  ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Modified:
  head/usr.sbin/config/config.y
  head/usr.sbin/gpioctl/gpioctl.8
  head/usr.sbin/iostat/iostat.8
  head/usr.sbin/iostat/iostat.c
  head/usr.sbin/lpr/common_source/displayq.c
  head/usr.sbin/lpr/common_source/lp.h
  head/usr.sbin/lpr/common_source/lp.local.h
  head/usr.sbin/lpr/common_source/pathnames.h
  head/usr.sbin/lpr/common_source/rmjob.c
  head/usr.sbin/lpr/common_source/startdaemon.c
  head/usr.sbin/lpr/filters/lpf.c
  head/usr.sbin/lpr/lpc/cmds.c
  head/usr.sbin/lpr/lpc/cmdtab.c
  head/usr.sbin/lpr/lpc/extern.h
  head/usr.sbin/lpr/lpc/lpc.8
  head/usr.sbin/lpr/lpc/lpc.c
  head/usr.sbin/lpr/lpc/lpc.h
  head/usr.sbin/lpr/lpd/extern.h
  head/usr.sbin/lpr/lpd/lpd.8
  head/usr.sbin/lpr/lpd/lpd.c
  head/usr.sbin/lpr/lpd/lpdchar.c
  head/usr.sbin/lpr/lpd/modes.c
  head/usr.sbin/lpr/lpd/printjob.c
  head/usr.sbin/lpr/lpd/recvjob.c
  head/usr.sbin/lpr/lpq/lpq.1
  head/usr.sbin/lpr/lpq/lpq.c
  head/usr.sbin/lpr/lpr/lpr.1
  head/usr.sbin/lpr/lpr/printcap.5
  head/usr.sbin/lpr/lprm/lprm.1
  head/usr.sbin/lpr/lprm/lprm.c
  head/usr.sbin/lpr/lptest/lptest.1
  head/usr.sbin/lpr/lptest/lptest.c
  head/usr.sbin/lpr/pac/pac.8
  head/usr.sbin/lpr/pac/pac.c
  head/usr.sbin/timed/timed/acksend.c
  head/usr.sbin/timed/timed/byteorder.c
  head/usr.sbin/timed/timed/candidate.c
  head/usr.sbin/timed/timed/cksum.c
  head/usr.sbin/timed/timed/correct.c
  head/usr.sbin/timed/timed/extern.h
  head/usr.sbin/timed/timed/globals.h
  head/usr.sbin/timed/timed/master.c
  head/usr.sbin/timed/timed/measure.c
  head/usr.sbin/timed/timed/networkdelta.c
  head/usr.sbin/timed/timed/pathnames.h
  head/usr.sbin/timed/timed/readmsg.c
  head/usr.sbin/timed/timed/slave.c
  head/usr.sbin/timed/timed/timed.8
  head/usr.sbin/timed/timed/timed.c
  head/usr.sbin/timed/timedc/cmds.c
  head/usr.sbin/timed/timedc/cmdtab.c
  head/usr.sbin/timed/timedc/extern.h
  head/usr.sbin/timed/timedc/timedc.8
  head/usr.sbin/timed/timedc/timedc.c
  head/usr.sbin/timed/timedc/timedc.h
  head/usr.sbin/traceroute6/traceroute6.c

Modified: head/usr.sbin/config/config.y
==============================================================================
--- head/usr.sbin/config/config.y	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/config/config.y	Sat Dec 11 09:38:12 2010	(r216372)
@@ -48,10 +48,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.

Modified: head/usr.sbin/gpioctl/gpioctl.8
==============================================================================
--- head/usr.sbin/gpioctl/gpioctl.8	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/gpioctl/gpioctl.8	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/iostat/iostat.8
==============================================================================
--- head/usr.sbin/iostat/iostat.8	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/iostat/iostat.8	Sat Dec 11 09:38:12 2010	(r216372)
@@ -38,10 +38,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.

Modified: head/usr.sbin/iostat/iostat.c
==============================================================================
--- head/usr.sbin/iostat/iostat.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/iostat/iostat.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -43,10 +43,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.

Modified: head/usr.sbin/lpr/common_source/displayq.c
==============================================================================
--- head/usr.sbin/lpr/common_source/displayq.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/common_source/displayq.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/common_source/lp.h
==============================================================================
--- head/usr.sbin/lpr/common_source/lp.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/common_source/lp.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/common_source/lp.local.h
==============================================================================
--- head/usr.sbin/lpr/common_source/lp.local.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/common_source/lp.local.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/common_source/pathnames.h
==============================================================================
--- head/usr.sbin/lpr/common_source/pathnames.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/common_source/pathnames.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.
@@ -30,6 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $FreeBSD$
+ *
  *      @(#)pathnames.h	8.1 (Berkeley) 6/6/93
  */
 

Modified: head/usr.sbin/lpr/common_source/rmjob.c
==============================================================================
--- head/usr.sbin/lpr/common_source/rmjob.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/common_source/rmjob.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/common_source/startdaemon.c
==============================================================================
--- head/usr.sbin/lpr/common_source/startdaemon.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/common_source/startdaemon.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/filters/lpf.c
==============================================================================
--- head/usr.sbin/lpr/filters/lpf.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/filters/lpf.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/lpc/cmds.c
==============================================================================
--- head/usr.sbin/lpr/lpc/cmds.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpc/cmds.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lpc/cmdtab.c
==============================================================================
--- head/usr.sbin/lpr/lpc/cmdtab.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpc/cmdtab.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/lpc/extern.h
==============================================================================
--- head/usr.sbin/lpr/lpc/extern.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpc/extern.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lpc/lpc.8
==============================================================================
--- head/usr.sbin/lpr/lpc/lpc.8	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpc/lpc.8	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/lpc/lpc.c
==============================================================================
--- head/usr.sbin/lpr/lpc/lpc.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpc/lpc.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lpc/lpc.h
==============================================================================
--- head/usr.sbin/lpr/lpc/lpc.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpc/lpc.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/lpd/extern.h
==============================================================================
--- head/usr.sbin/lpr/lpd/extern.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpd/extern.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/lpd/lpd.8
==============================================================================
--- head/usr.sbin/lpr/lpd/lpd.8	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpd/lpd.8	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/lpd/lpd.c
==============================================================================
--- head/usr.sbin/lpr/lpd/lpd.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpd/lpd.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lpd/lpdchar.c
==============================================================================
--- head/usr.sbin/lpr/lpd/lpdchar.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpd/lpdchar.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/lpd/modes.c
==============================================================================
--- head/usr.sbin/lpr/lpd/modes.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpd/modes.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/lpr/lpd/printjob.c
==============================================================================
--- head/usr.sbin/lpr/lpd/printjob.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpd/printjob.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lpd/recvjob.c
==============================================================================
--- head/usr.sbin/lpr/lpd/recvjob.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpd/recvjob.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lpq/lpq.1
==============================================================================
--- head/usr.sbin/lpr/lpq/lpq.1	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpq/lpq.1	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/lpq/lpq.c
==============================================================================
--- head/usr.sbin/lpr/lpq/lpq.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpq/lpq.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lpr/lpr.1
==============================================================================
--- head/usr.sbin/lpr/lpr/lpr.1	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpr/lpr.1	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/lpr/printcap.5
==============================================================================
--- head/usr.sbin/lpr/lpr/printcap.5	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lpr/printcap.5	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/lprm/lprm.1
==============================================================================
--- head/usr.sbin/lpr/lprm/lprm.1	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lprm/lprm.1	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/lprm/lprm.c
==============================================================================
--- head/usr.sbin/lpr/lprm/lprm.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lprm/lprm.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/lptest/lptest.1
==============================================================================
--- head/usr.sbin/lpr/lptest/lptest.1	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lptest/lptest.1	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/lptest/lptest.c
==============================================================================
--- head/usr.sbin/lpr/lptest/lptest.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/lptest/lptest.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/lpr/pac/pac.8
==============================================================================
--- head/usr.sbin/lpr/pac/pac.8	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/pac/pac.8	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/lpr/pac/pac.c
==============================================================================
--- head/usr.sbin/lpr/pac/pac.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/lpr/pac/pac.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -11,10 +11,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.

Modified: head/usr.sbin/timed/timed/acksend.c
==============================================================================
--- head/usr.sbin/timed/timed/acksend.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/acksend.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/byteorder.c
==============================================================================
--- head/usr.sbin/timed/timed/byteorder.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/byteorder.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/candidate.c
==============================================================================
--- head/usr.sbin/timed/timed/candidate.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/candidate.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/cksum.c
==============================================================================
--- head/usr.sbin/timed/timed/cksum.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/cksum.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/correct.c
==============================================================================
--- head/usr.sbin/timed/timed/correct.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/correct.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/extern.h
==============================================================================
--- head/usr.sbin/timed/timed/extern.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/extern.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -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.

Modified: head/usr.sbin/timed/timed/globals.h
==============================================================================
--- head/usr.sbin/timed/timed/globals.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/globals.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/master.c
==============================================================================
--- head/usr.sbin/timed/timed/master.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/master.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/measure.c
==============================================================================
--- head/usr.sbin/timed/timed/measure.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/measure.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/networkdelta.c
==============================================================================
--- head/usr.sbin/timed/timed/networkdelta.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/networkdelta.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/pathnames.h
==============================================================================
--- head/usr.sbin/timed/timed/pathnames.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/pathnames.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/readmsg.c
==============================================================================
--- head/usr.sbin/timed/timed/readmsg.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/readmsg.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/slave.c
==============================================================================
--- head/usr.sbin/timed/timed/slave.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/slave.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timed/timed.8
==============================================================================
--- head/usr.sbin/timed/timed/timed.8	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/timed.8	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/timed/timed/timed.c
==============================================================================
--- head/usr.sbin/timed/timed/timed.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timed/timed.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timedc/cmds.c
==============================================================================
--- head/usr.sbin/timed/timedc/cmds.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timedc/cmds.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timedc/cmdtab.c
==============================================================================
--- head/usr.sbin/timed/timedc/cmdtab.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timedc/cmdtab.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timedc/extern.h
==============================================================================
--- head/usr.sbin/timed/timedc/extern.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timedc/extern.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -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.

Modified: head/usr.sbin/timed/timedc/timedc.8
==============================================================================
--- head/usr.sbin/timed/timedc/timedc.8	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timedc/timedc.8	Sat Dec 11 09:38:12 2010	(r216372)
@@ -9,10 +9,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.

Modified: head/usr.sbin/timed/timedc/timedc.c
==============================================================================
--- head/usr.sbin/timed/timedc/timedc.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timedc/timedc.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/timed/timedc/timedc.h
==============================================================================
--- head/usr.sbin/timed/timedc/timedc.h	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/timed/timedc/timedc.h	Sat Dec 11 09:38:12 2010	(r216372)
@@ -10,10 +10,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.

Modified: head/usr.sbin/traceroute6/traceroute6.c
==============================================================================
--- head/usr.sbin/traceroute6/traceroute6.c	Sat Dec 11 08:44:10 2010	(r216371)
+++ head/usr.sbin/traceroute6/traceroute6.c	Sat Dec 11 09:38:12 2010	(r216372)
@@ -44,10 +44,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.


More information about the svn-src-all mailing list