svn commit: r263037 - in head/sys: amd64/amd64 i386/i386 mips/mips

[Warner Losh]

Author: imp
Date: Tue Mar 11 17:20:50 2014
New Revision: 263037
URL: http://svnweb.freebsd.org/changeset/base/263037

Log:
  Remove clause 3 (the advertising clause), per the regent's letter.

Modified:
  head/sys/amd64/amd64/sys_machdep.c
  head/sys/i386/i386/sys_machdep.c
  head/sys/mips/mips/sys_machdep.c

Modified: head/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- head/sys/amd64/amd64/sys_machdep.c	Tue Mar 11 17:08:45 2014	(r263036)
+++ head/sys/amd64/amd64/sys_machdep.c	Tue Mar 11 17:20:50 2014	(r263037)
@@ -11,7 +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.
- * 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/sys/i386/i386/sys_machdep.c
==============================================================================
--- head/sys/i386/i386/sys_machdep.c	Tue Mar 11 17:08:45 2014	(r263036)
+++ head/sys/i386/i386/sys_machdep.c	Tue Mar 11 17:20:50 2014	(r263037)
@@ -10,7 +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.
- * 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/sys/mips/mips/sys_machdep.c
==============================================================================
--- head/sys/mips/mips/sys_machdep.c	Tue Mar 11 17:08:45 2014	(r263036)
+++ head/sys/mips/mips/sys_machdep.c	Tue Mar 11 17:20:50 2014	(r263037)
@@ -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.
  *