From owner-svn-src-all@FreeBSD.ORG Mon Feb 24 08:22:01 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A527E1DE; Mon, 24 Feb 2014 08:22:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D4E6165D; Mon, 24 Feb 2014 08:22:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1O8M1DN004675; Mon, 24 Feb 2014 08:22:01 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1O8Ln0K004543; Mon, 24 Feb 2014 08:21:49 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201402240821.s1O8Ln0K004543@svn.freebsd.org> From: Christian Brueffer Date: Mon, 24 Feb 2014 08:21:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262435 - in stable/10/libexec: bootpd comsat fingerd ftpd getty mknetid rbootd revnetgroup rlogind rpc.rstatd rpc.rusersd rpc.rwalld rshd rtld-elf talkd tftpd X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 08:22:01 -0000 Author: brueffer Date: Mon Feb 24 08:21:49 2014 New Revision: 262435 URL: http://svnweb.freebsd.org/changeset/base/262435 Log: MFC: r262136 Remove the 3rd clause ("advertising clause") of the BSD license as permitted by the University of Berkeley on July 22, 1999. Reviewed by: imp Modified: stable/10/libexec/bootpd/rtmsg.c stable/10/libexec/comsat/comsat.8 stable/10/libexec/comsat/comsat.c stable/10/libexec/fingerd/fingerd.8 stable/10/libexec/fingerd/fingerd.c stable/10/libexec/fingerd/pathnames.h stable/10/libexec/ftpd/extern.h stable/10/libexec/ftpd/ftpcmd.y stable/10/libexec/ftpd/ftpd.8 stable/10/libexec/ftpd/ftpd.c stable/10/libexec/ftpd/logwtmp.c stable/10/libexec/ftpd/pathnames.h stable/10/libexec/ftpd/popen.c stable/10/libexec/getty/extern.h stable/10/libexec/getty/getty.8 stable/10/libexec/getty/gettytab.5 stable/10/libexec/getty/gettytab.h stable/10/libexec/getty/init.c stable/10/libexec/getty/main.c stable/10/libexec/getty/pathnames.h stable/10/libexec/getty/subr.c stable/10/libexec/getty/ttys.5 stable/10/libexec/mknetid/parse_group.c stable/10/libexec/rbootd/bpf.c stable/10/libexec/rbootd/conf.c stable/10/libexec/rbootd/defs.h stable/10/libexec/rbootd/parseconf.c stable/10/libexec/rbootd/pathnames.h stable/10/libexec/rbootd/rbootd.8 stable/10/libexec/rbootd/rbootd.c stable/10/libexec/rbootd/rmp.h stable/10/libexec/rbootd/rmp_var.h stable/10/libexec/rbootd/rmpproto.c stable/10/libexec/rbootd/utils.c stable/10/libexec/revnetgroup/parse_netgroup.c stable/10/libexec/rlogind/rlogind.8 stable/10/libexec/rlogind/rlogind.c stable/10/libexec/rpc.rstatd/rpc.rstatd.8 stable/10/libexec/rpc.rstatd/rstatd.c stable/10/libexec/rpc.rusersd/extern.h stable/10/libexec/rpc.rusersd/rpc.rusersd.8 stable/10/libexec/rpc.rusersd/rusers_proc.c stable/10/libexec/rpc.rusersd/rusersd.c stable/10/libexec/rpc.rwalld/rpc.rwalld.8 stable/10/libexec/rshd/rshd.8 stable/10/libexec/rshd/rshd.c stable/10/libexec/rtld-elf/malloc.c stable/10/libexec/talkd/announce.c stable/10/libexec/talkd/print.c stable/10/libexec/talkd/process.c stable/10/libexec/talkd/table.c stable/10/libexec/talkd/talkd.8 stable/10/libexec/talkd/talkd.c stable/10/libexec/tftpd/tftpd.8 stable/10/libexec/tftpd/tftpd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/bootpd/rtmsg.c ============================================================================== --- stable/10/libexec/bootpd/rtmsg.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/bootpd/rtmsg.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/comsat/comsat.8 ============================================================================== --- stable/10/libexec/comsat/comsat.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/comsat/comsat.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/comsat/comsat.c ============================================================================== --- stable/10/libexec/comsat/comsat.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/comsat/comsat.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/fingerd/fingerd.8 ============================================================================== --- stable/10/libexec/fingerd/fingerd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/fingerd/fingerd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/fingerd/fingerd.c ============================================================================== --- stable/10/libexec/fingerd/fingerd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/fingerd/fingerd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/fingerd/pathnames.h ============================================================================== --- stable/10/libexec/fingerd/pathnames.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/fingerd/pathnames.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/ftpd/extern.h ============================================================================== --- stable/10/libexec/ftpd/extern.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/ftpd/extern.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/ftpd/ftpcmd.y ============================================================================== --- stable/10/libexec/ftpd/ftpcmd.y Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/ftpd/ftpcmd.y Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/ftpd/ftpd.8 ============================================================================== --- stable/10/libexec/ftpd/ftpd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/ftpd/ftpd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/ftpd/ftpd.c ============================================================================== --- stable/10/libexec/ftpd/ftpd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/ftpd/ftpd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/ftpd/logwtmp.c ============================================================================== --- stable/10/libexec/ftpd/logwtmp.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/ftpd/logwtmp.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/ftpd/pathnames.h ============================================================================== --- stable/10/libexec/ftpd/pathnames.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/ftpd/pathnames.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/ftpd/popen.c ============================================================================== --- stable/10/libexec/ftpd/popen.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/ftpd/popen.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/extern.h ============================================================================== --- stable/10/libexec/getty/extern.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/extern.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/getty.8 ============================================================================== --- stable/10/libexec/getty/getty.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/getty.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/gettytab.5 ============================================================================== --- stable/10/libexec/getty/gettytab.5 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/gettytab.5 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/gettytab.h ============================================================================== --- stable/10/libexec/getty/gettytab.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/gettytab.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/init.c ============================================================================== --- stable/10/libexec/getty/init.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/init.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/main.c ============================================================================== --- stable/10/libexec/getty/main.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/main.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/pathnames.h ============================================================================== --- stable/10/libexec/getty/pathnames.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/pathnames.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/subr.c ============================================================================== --- stable/10/libexec/getty/subr.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/subr.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/getty/ttys.5 ============================================================================== --- stable/10/libexec/getty/ttys.5 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/getty/ttys.5 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/mknetid/parse_group.c ============================================================================== --- stable/10/libexec/mknetid/parse_group.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/mknetid/parse_group.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/bpf.c ============================================================================== --- stable/10/libexec/rbootd/bpf.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/bpf.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/conf.c ============================================================================== --- stable/10/libexec/rbootd/conf.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/conf.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/defs.h ============================================================================== --- stable/10/libexec/rbootd/defs.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/defs.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/parseconf.c ============================================================================== --- stable/10/libexec/rbootd/parseconf.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/parseconf.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/pathnames.h ============================================================================== --- stable/10/libexec/rbootd/pathnames.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/pathnames.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/rbootd.8 ============================================================================== --- stable/10/libexec/rbootd/rbootd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/rbootd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/rbootd.c ============================================================================== --- stable/10/libexec/rbootd/rbootd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/rbootd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/rmp.h ============================================================================== --- stable/10/libexec/rbootd/rmp.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/rmp.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/rmp_var.h ============================================================================== --- stable/10/libexec/rbootd/rmp_var.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/rmp_var.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/rmpproto.c ============================================================================== --- stable/10/libexec/rbootd/rmpproto.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/rmpproto.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rbootd/utils.c ============================================================================== --- stable/10/libexec/rbootd/utils.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rbootd/utils.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/revnetgroup/parse_netgroup.c ============================================================================== --- stable/10/libexec/revnetgroup/parse_netgroup.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/revnetgroup/parse_netgroup.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rlogind/rlogind.8 ============================================================================== --- stable/10/libexec/rlogind/rlogind.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rlogind/rlogind.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rlogind/rlogind.c ============================================================================== --- stable/10/libexec/rlogind/rlogind.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rlogind/rlogind.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rpc.rstatd/rpc.rstatd.8 ============================================================================== --- stable/10/libexec/rpc.rstatd/rpc.rstatd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rpc.rstatd/rpc.rstatd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rpc.rstatd/rstatd.c ============================================================================== --- stable/10/libexec/rpc.rstatd/rstatd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rpc.rstatd/rstatd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rpc.rusersd/extern.h ============================================================================== --- stable/10/libexec/rpc.rusersd/extern.h Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rpc.rusersd/extern.h Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rpc.rusersd/rpc.rusersd.8 ============================================================================== --- stable/10/libexec/rpc.rusersd/rpc.rusersd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rpc.rusersd/rpc.rusersd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rpc.rusersd/rusers_proc.c ============================================================================== --- stable/10/libexec/rpc.rusersd/rusers_proc.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rpc.rusersd/rusers_proc.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rpc.rusersd/rusersd.c ============================================================================== --- stable/10/libexec/rpc.rusersd/rusersd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rpc.rusersd/rusersd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rpc.rwalld/rpc.rwalld.8 ============================================================================== --- stable/10/libexec/rpc.rwalld/rpc.rwalld.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rpc.rwalld/rpc.rwalld.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rshd/rshd.8 ============================================================================== --- stable/10/libexec/rshd/rshd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rshd/rshd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rshd/rshd.c ============================================================================== --- stable/10/libexec/rshd/rshd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rshd/rshd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/rtld-elf/malloc.c ============================================================================== --- stable/10/libexec/rtld-elf/malloc.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/rtld-elf/malloc.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/talkd/announce.c ============================================================================== --- stable/10/libexec/talkd/announce.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/talkd/announce.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/talkd/print.c ============================================================================== --- stable/10/libexec/talkd/print.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/talkd/print.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/talkd/process.c ============================================================================== --- stable/10/libexec/talkd/process.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/talkd/process.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/talkd/table.c ============================================================================== --- stable/10/libexec/talkd/table.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/talkd/table.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/talkd/talkd.8 ============================================================================== --- stable/10/libexec/talkd/talkd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/talkd/talkd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/talkd/talkd.c ============================================================================== --- stable/10/libexec/talkd/talkd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/talkd/talkd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/tftpd/tftpd.8 ============================================================================== --- stable/10/libexec/tftpd/tftpd.8 Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/tftpd/tftpd.8 Mon Feb 24 08:21:49 2014 (r262435) @@ -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: stable/10/libexec/tftpd/tftpd.c ============================================================================== --- stable/10/libexec/tftpd/tftpd.c Mon Feb 24 08:18:11 2014 (r262434) +++ stable/10/libexec/tftpd/tftpd.c Mon Feb 24 08:21:49 2014 (r262435) @@ -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. *