svn commit: r203932 - in head/games: bcd caesar morse number pom ppt primes random

[Warner Losh]

Author: imp
Date: Mon Feb 15 18:46:02 2010
New Revision: 203932
URL: http://svn.freebsd.org/changeset/base/203932

Log:
  Remove the third clause for the Berkeley parts of games, per the
  letter in /COPYRIGHT.

Modified:
  head/games/bcd/bcd.c
  head/games/caesar/caesar.c
  head/games/morse/morse.c
  head/games/number/number.c
  head/games/pom/pom.c
  head/games/ppt/ppt.c
  head/games/primes/pattern.c
  head/games/primes/pr_tbl.c
  head/games/primes/primes.c
  head/games/primes/primes.h
  head/games/random/random.c

Modified: head/games/bcd/bcd.c
==============================================================================
--- head/games/bcd/bcd.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/bcd/bcd.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/caesar/caesar.c
==============================================================================
--- head/games/caesar/caesar.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/caesar/caesar.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/morse/morse.c
==============================================================================
--- head/games/morse/morse.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/morse/morse.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/number/number.c
==============================================================================
--- head/games/number/number.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/number/number.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/pom/pom.c
==============================================================================
--- head/games/pom/pom.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/pom/pom.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -12,11 +12,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/games/ppt/ppt.c
==============================================================================
--- head/games/ppt/ppt.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/ppt/ppt.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/primes/pattern.c
==============================================================================
--- head/games/primes/pattern.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/primes/pattern.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/primes/pr_tbl.c
==============================================================================
--- head/games/primes/pr_tbl.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/primes/pr_tbl.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/primes/primes.c
==============================================================================
--- head/games/primes/primes.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/primes/primes.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/primes/primes.h
==============================================================================
--- head/games/primes/primes.h	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/primes/primes.h	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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/games/random/random.c
==============================================================================
--- head/games/random/random.c	Mon Feb 15 18:14:51 2010	(r203931)
+++ head/games/random/random.c	Mon Feb 15 18:46:02 2010	(r203932)
@@ -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.
  *