Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2014 22:27:33 +0000 (UTC)
From:      Christian Brueffer <brueffer@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r262136 - in head/libexec: bootpd comsat fingerd ftpd getty mknetid rbootd revnetgroup rlogind rpc.rstatd rpc.rusersd rpc.rwalld rshd rtld-elf talkd tftpd
Message-ID:  <201402172227.s1HMRXDX081960@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brueffer
Date: Mon Feb 17 22:27:32 2014
New Revision: 262136
URL: http://svnweb.freebsd.org/changeset/base/262136

Log:
  Remove the 3rd clause ("advertising clause") of the BSD license as
  permitted by the University of Berkeley on July 22, 1999.
  
  Reviewed by:	imp
  MFC after:	1 week

Modified:
  head/libexec/bootpd/rtmsg.c
  head/libexec/comsat/comsat.8
  head/libexec/comsat/comsat.c
  head/libexec/fingerd/fingerd.8
  head/libexec/fingerd/fingerd.c
  head/libexec/fingerd/pathnames.h
  head/libexec/ftpd/extern.h
  head/libexec/ftpd/ftpcmd.y
  head/libexec/ftpd/ftpd.8
  head/libexec/ftpd/ftpd.c
  head/libexec/ftpd/logwtmp.c
  head/libexec/ftpd/pathnames.h
  head/libexec/ftpd/popen.c
  head/libexec/getty/extern.h
  head/libexec/getty/getty.8
  head/libexec/getty/gettytab.5
  head/libexec/getty/gettytab.h
  head/libexec/getty/init.c
  head/libexec/getty/main.c
  head/libexec/getty/pathnames.h
  head/libexec/getty/subr.c
  head/libexec/getty/ttys.5
  head/libexec/mknetid/parse_group.c
  head/libexec/rbootd/bpf.c
  head/libexec/rbootd/conf.c
  head/libexec/rbootd/defs.h
  head/libexec/rbootd/parseconf.c
  head/libexec/rbootd/pathnames.h
  head/libexec/rbootd/rbootd.8
  head/libexec/rbootd/rbootd.c
  head/libexec/rbootd/rmp.h
  head/libexec/rbootd/rmp_var.h
  head/libexec/rbootd/rmpproto.c
  head/libexec/rbootd/utils.c
  head/libexec/revnetgroup/parse_netgroup.c
  head/libexec/rlogind/rlogind.8
  head/libexec/rlogind/rlogind.c
  head/libexec/rpc.rstatd/rpc.rstatd.8
  head/libexec/rpc.rstatd/rstatd.c
  head/libexec/rpc.rusersd/extern.h
  head/libexec/rpc.rusersd/rpc.rusersd.8
  head/libexec/rpc.rusersd/rusers_proc.c
  head/libexec/rpc.rusersd/rusersd.c
  head/libexec/rpc.rwalld/rpc.rwalld.8
  head/libexec/rshd/rshd.8
  head/libexec/rshd/rshd.c
  head/libexec/rtld-elf/malloc.c
  head/libexec/talkd/announce.c
  head/libexec/talkd/print.c
  head/libexec/talkd/process.c
  head/libexec/talkd/table.c
  head/libexec/talkd/talkd.8
  head/libexec/talkd/talkd.c
  head/libexec/tftpd/tftpd.8
  head/libexec/tftpd/tftpd.c

Modified: head/libexec/bootpd/rtmsg.c
==============================================================================
--- head/libexec/bootpd/rtmsg.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/bootpd/rtmsg.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -16,11 +16,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/libexec/comsat/comsat.8
==============================================================================
--- head/libexec/comsat/comsat.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/comsat/comsat.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/comsat/comsat.c
==============================================================================
--- head/libexec/comsat/comsat.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/comsat/comsat.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/fingerd/fingerd.8
==============================================================================
--- head/libexec/fingerd/fingerd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/fingerd/fingerd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/fingerd/fingerd.c
==============================================================================
--- head/libexec/fingerd/fingerd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/fingerd/fingerd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/fingerd/pathnames.h
==============================================================================
--- head/libexec/fingerd/pathnames.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/fingerd/pathnames.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/ftpd/extern.h
==============================================================================
--- head/libexec/ftpd/extern.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/ftpd/extern.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/ftpd/ftpcmd.y
==============================================================================
--- head/libexec/ftpd/ftpcmd.y	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/ftpd/ftpcmd.y	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/ftpd/ftpd.8
==============================================================================
--- head/libexec/ftpd/ftpd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/ftpd/ftpd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/ftpd/ftpd.c
==============================================================================
--- head/libexec/ftpd/ftpd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/ftpd/ftpd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/ftpd/logwtmp.c
==============================================================================
--- head/libexec/ftpd/logwtmp.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/ftpd/logwtmp.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/ftpd/pathnames.h
==============================================================================
--- head/libexec/ftpd/pathnames.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/ftpd/pathnames.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/ftpd/popen.c
==============================================================================
--- head/libexec/ftpd/popen.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/ftpd/popen.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -13,11 +13,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/libexec/getty/extern.h
==============================================================================
--- head/libexec/getty/extern.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/extern.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/getty.8
==============================================================================
--- head/libexec/getty/getty.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/getty.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/gettytab.5
==============================================================================
--- head/libexec/getty/gettytab.5	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/gettytab.5	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/gettytab.h
==============================================================================
--- head/libexec/getty/gettytab.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/gettytab.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/init.c
==============================================================================
--- head/libexec/getty/init.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/init.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/main.c
==============================================================================
--- head/libexec/getty/main.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/main.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/pathnames.h
==============================================================================
--- head/libexec/getty/pathnames.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/pathnames.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/subr.c
==============================================================================
--- head/libexec/getty/subr.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/subr.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/getty/ttys.5
==============================================================================
--- head/libexec/getty/ttys.5	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/getty/ttys.5	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/mknetid/parse_group.c
==============================================================================
--- head/libexec/mknetid/parse_group.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/mknetid/parse_group.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/rbootd/bpf.c
==============================================================================
--- head/libexec/rbootd/bpf.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/bpf.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/conf.c
==============================================================================
--- head/libexec/rbootd/conf.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/conf.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/defs.h
==============================================================================
--- head/libexec/rbootd/defs.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/defs.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/parseconf.c
==============================================================================
--- head/libexec/rbootd/parseconf.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/parseconf.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/pathnames.h
==============================================================================
--- head/libexec/rbootd/pathnames.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/pathnames.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/rbootd.8
==============================================================================
--- head/libexec/rbootd/rbootd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/rbootd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -17,11 +17,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/libexec/rbootd/rbootd.c
==============================================================================
--- head/libexec/rbootd/rbootd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/rbootd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/rmp.h
==============================================================================
--- head/libexec/rbootd/rmp.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/rmp.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/rmp_var.h
==============================================================================
--- head/libexec/rbootd/rmp_var.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/rmp_var.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/rmpproto.c
==============================================================================
--- head/libexec/rbootd/rmpproto.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/rmpproto.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/rbootd/utils.c
==============================================================================
--- head/libexec/rbootd/utils.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rbootd/utils.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -18,11 +18,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/libexec/revnetgroup/parse_netgroup.c
==============================================================================
--- head/libexec/revnetgroup/parse_netgroup.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/revnetgroup/parse_netgroup.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -13,11 +13,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/libexec/rlogind/rlogind.8
==============================================================================
--- head/libexec/rlogind/rlogind.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rlogind/rlogind.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/rlogind/rlogind.c
==============================================================================
--- head/libexec/rlogind/rlogind.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rlogind/rlogind.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -17,11 +17,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/libexec/rpc.rstatd/rpc.rstatd.8
==============================================================================
--- head/libexec/rpc.rstatd/rpc.rstatd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rpc.rstatd/rpc.rstatd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -11,11 +11,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/libexec/rpc.rstatd/rstatd.c
==============================================================================
--- head/libexec/rpc.rstatd/rstatd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rpc.rstatd/rstatd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/rpc.rusersd/extern.h
==============================================================================
--- head/libexec/rpc.rusersd/extern.h	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rpc.rusersd/extern.h	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/rpc.rusersd/rpc.rusersd.8
==============================================================================
--- head/libexec/rpc.rusersd/rpc.rusersd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rpc.rusersd/rpc.rusersd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -11,11 +11,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/libexec/rpc.rusersd/rusers_proc.c
==============================================================================
--- head/libexec/rpc.rusersd/rusers_proc.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rpc.rusersd/rusers_proc.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/rpc.rusersd/rusersd.c
==============================================================================
--- head/libexec/rpc.rusersd/rusersd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rpc.rusersd/rusersd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/rpc.rwalld/rpc.rwalld.8
==============================================================================
--- head/libexec/rpc.rwalld/rpc.rwalld.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rpc.rwalld/rpc.rwalld.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -11,11 +11,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/libexec/rshd/rshd.8
==============================================================================
--- head/libexec/rshd/rshd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rshd/rshd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/rshd/rshd.c
==============================================================================
--- head/libexec/rshd/rshd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rshd/rshd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -17,11 +17,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/libexec/rtld-elf/malloc.c
==============================================================================
--- head/libexec/rtld-elf/malloc.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/rtld-elf/malloc.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/talkd/announce.c
==============================================================================
--- head/libexec/talkd/announce.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/talkd/announce.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/talkd/print.c
==============================================================================
--- head/libexec/talkd/print.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/talkd/print.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/talkd/process.c
==============================================================================
--- head/libexec/talkd/process.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/talkd/process.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/talkd/table.c
==============================================================================
--- head/libexec/talkd/table.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/talkd/table.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/talkd/talkd.8
==============================================================================
--- head/libexec/talkd/talkd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/talkd/talkd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/talkd/talkd.c
==============================================================================
--- head/libexec/talkd/talkd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/talkd/talkd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/tftpd/tftpd.8
==============================================================================
--- head/libexec/tftpd/tftpd.8	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/tftpd/tftpd.8	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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/libexec/tftpd/tftpd.c
==============================================================================
--- head/libexec/tftpd/tftpd.c	Mon Feb 17 22:26:21 2014	(r262135)
+++ head/libexec/tftpd/tftpd.c	Mon Feb 17 22:27:32 2014	(r262136)
@@ -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.
  *



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402172227.s1HMRXDX081960>